=== modified file 'debian/changelog' --- debian/changelog 2013-06-07 15:04:17 +0000 +++ debian/changelog 2013-07-22 20:25:43 +0000 @@ -1,8 +1,26 @@ -heat (2013.1-4ubuntu1) UNRELEASED; urgency=low +heat (2013.2~b2-0ubuntu1) saucy; urgency=low + [ Yolanda Robla ] * debian/tests: added autopkg tests - -- Yolanda Robla Fri, 07 Jun 2013 17:02:11 +0200 + [ Chuck Short ] + * New upstream release + * debian/control: + - Add python-pbr to build-depends. + - Add python-d2to to build-depends. + - Dropped python-argparse. + - Add python-six to build-depends. + - Dropped python-sendfile. + - Dropped python-nose. + - Added testrepository. + - Added python-testtools. + * debian/rules: Run testrepository instead of nosetets. + * debian/patches/removes-lxml-version-limitation-from-pip-requires.patch: Dropped + no longer needed. + * debian/patches/fix-package-version-detection-when-building-doc.patch: Dropped + no longer needed. + + -- Chuck Short Mon, 22 Jul 2013 16:22:29 -0400 heat (2013.1-4) unstable; urgency=low === modified file 'debian/control' --- debian/control 2013-06-07 15:04:17 +0000 +++ debian/control 2013-07-22 20:25:43 +0000 @@ -1,18 +1,23 @@ Source: heat Section: web Priority: optional -Maintainer: PKG OpenStack -Uploaders: Loic Dachary (OuoU) , - Julien Danjou , - Thomas Goirand , - Ghe Rivero , - Mehdi Abaakouk -Build-Depends: debhelper (>= 9), +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: PKG OpenStack +Uploaders: + Loic Dachary (OuoU) , + Julien Danjou , + Thomas Goirand , + Ghe Rivero , + Mehdi Abaakouk +Build-Depends: + debhelper (>= 9), + openstack-pkg-tools (>= 4), po-debconf, - python-all (>= 2.6.6-3~), - openstack-pkg-tools (>= 4) -Build-Depends-Indep: pep8 (>= 1.3.3), - python-argparse, + python-all (>= 2.6.6-3~) +Build-Depends-Indep: + pep8 (>= 1.3.3), + python-pbr, + python-d2to1, python-babel, python-boto, python-cinderclient, @@ -34,20 +39,22 @@ python-nosexcover, python-novaclient, python-oslo.config, - python-paste, - python-pastedeploy, python-paramiko, + python-paste, + python-pastedeploy, python-pycryptopp, python-qpid, python-quantumclient, python-routes, - python-sendfile, + python-six, python-setuptools, python-sphinx, python-sqlalchemy (>= 0.7.8), python-swiftclient, python-webob, - python-yaml + python-yaml, + testrepository, + python-testtools Standards-Version: 3.9.3 Vcs-Browser: http://anonscm.debian.org/gitweb/?p=openstack/heat.git;a=summary Vcs-Git: git://anonscm.debian.org/openstack/heat.git @@ -58,7 +65,7 @@ Section: python Architecture: all Pre-Depends: dpkg (>= 1.15.6~) -Depends: ${python:Depends}, ${misc:Depends}, +Depends: python-argparse, python-boto, python-cinderclient, @@ -79,16 +86,18 @@ python-oslo.config, python-paste, python-pastedeploy, - python-pycryptopp, + python-pycryptopp, python-qpid, python-quantumclient, - python-routes, - python-sendfile, + python-routes, + python-sendfile, python-setuptools, python-sqlalchemy (>= 0.7.8), python-swiftclient, python-webob, - python-yaml + python-yaml, + ${misc:Depends}, + ${python:Depends} Description: OpenStack orchestration service - Python files Heat is a service to orchestrate multiple composite cloud applications using templates, through both an OpenStack-native ReST API and a @@ -99,8 +108,12 @@ Package: heat-common Architecture: all Pre-Depends: dpkg (>= 1.15.6~) -Depends: dbconfig-common, ${python:Depends}, ${misc:Depends}, python-heat (=${binary:Version}), - adduser +Depends: + adduser, + dbconfig-common, + python-heat (=${binary:Version}), + ${misc:Depends}, + ${python:Depends} Description: OpenStack orchestration service - common files Heat is a service to orchestrate multiple composite cloud applications using templates, through both an OpenStack-native ReST API and a @@ -111,8 +124,12 @@ Package: heat-engine Architecture: all Pre-Depends: dpkg (>= 1.15.6~) -Depends: ${ostack-lsb-base}, ${python:Depends}, ${misc:Depends}, heat-common (=${binary:Version}), - adduser +Depends: + adduser, + heat-common (=${binary:Version}), + ${misc:Depends}, + ${ostack-lsb-base}, + ${python:Depends} Description: OpenStack orchestration service - engine Heat is a service to orchestrate multiple composite cloud applications using templates, through both an OpenStack-native ReST API and a @@ -124,8 +141,12 @@ Package: heat-api Architecture: all Pre-Depends: dpkg (>= 1.15.6~) -Depends: ${ostack-lsb-base}, ${python:Depends}, ${misc:Depends}, heat-common (=${binary:Version}), - adduser +Depends: + adduser, + heat-common (=${binary:Version}), + ${misc:Depends}, + ${ostack-lsb-base}, + ${python:Depends} Description: OpenStack orchestration service - ReST API Heat is a service to orchestrate multiple composite cloud applications using templates, through both an OpenStack-native ReST API and a @@ -134,10 +155,14 @@ This package contains the ReST API. Package: heat-api-cfn -Architecture: all +Architecture: all Pre-Depends: dpkg (>= 1.15.6~) -Depends: ${ostack-lsb-base}, ${python:Depends}, ${misc:Depends}, heat-common (=${binary:Version}), - adduser +Depends: + adduser, + heat-common (=${binary:Version}), + ${misc:Depends}, + ${ostack-lsb-base}, + ${python:Depends} Description: OpenStack orchestration service - CFN API Heat is a service to orchestrate multiple composite cloud applications using templates, through both an OpenStack-native ReST API and a @@ -146,10 +171,14 @@ This package contains the CloudFormation (CFN) API. Package: heat-api-cloudwatch -Architecture: all +Architecture: all Pre-Depends: dpkg (>= 1.15.6~) -Depends: ${ostack-lsb-base}, ${python:Depends}, ${misc:Depends}, heat-common (=${binary:Version}), - adduser +Depends: + adduser, + heat-common (=${binary:Version}), + ${misc:Depends}, + ${ostack-lsb-base}, + ${python:Depends} Description: OpenStack orchestration service - CloudWatch API Heat is a service to orchestrate multiple composite cloud applications using templates, through both an OpenStack-native ReST API and a === modified file 'debian/copyright' --- debian/copyright 2013-05-29 17:36:41 +0000 +++ debian/copyright 2013-07-22 20:25:43 +0000 @@ -1,6 +1,6 @@ Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ Upstream-Name: heat -Upstream-Contact: +Upstream-Contact: Source: https://github.com/openstack/heat Files: debian/* === modified file 'debian/heat-api-cfn.install' --- debian/heat-api-cfn.install 2013-05-29 17:36:41 +0000 +++ debian/heat-api-cfn.install 2013-07-22 20:25:43 +0000 @@ -1,3 +1,2 @@ etc/heat/heat-api-cfn.conf -etc/heat/heat-api-cfn-paste.ini /usr/share/heat-api-cfn usr/bin/heat-api-cfn === modified file 'debian/heat-api-cloudwatch.install' --- debian/heat-api-cloudwatch.install 2013-05-29 17:36:41 +0000 +++ debian/heat-api-cloudwatch.install 2013-07-22 20:25:43 +0000 @@ -1,3 +1,2 @@ etc/heat/heat-api-cloudwatch.conf -etc/heat/heat-api-cloudwatch-paste.ini /usr/share/heat-api-cloudwatch /usr/bin/heat-api-cloudwatch === modified file 'debian/heat-api.install' --- debian/heat-api.install 2013-05-29 17:36:41 +0000 +++ debian/heat-api.install 2013-07-22 20:25:43 +0000 @@ -1,3 +1,2 @@ usr/bin/heat-api etc/heat/heat-api.conf -etc/heat/heat-api-paste.ini /usr/share/heat-api === modified file 'debian/heat-common.install' --- debian/heat-common.install 2013-05-29 17:36:41 +0000 +++ debian/heat-common.install 2013-07-22 20:25:43 +0000 @@ -1,3 +1,3 @@ +/usr/bin/heat-boto /usr/bin/heat-cfn -/usr/bin/heat-boto /usr/bin/heat-watch === removed file 'debian/patches/fix-package-version-detection-when-building-doc.patch' --- debian/patches/fix-package-version-detection-when-building-doc.patch 2013-05-29 17:36:41 +0000 +++ debian/patches/fix-package-version-detection-when-building-doc.patch 1970-01-01 00:00:00 +0000 @@ -1,27 +0,0 @@ -Description: Fixes version detection when building docs -Author: Thomas Goirand -Forwarded: no -Last-Update: 2013-05-16 - -Index: heat/heat/openstack/common/version.py -=================================================================== ---- heat.orig/heat/openstack/common/version.py 2013-05-16 14:07:08.000000000 +0000 -+++ heat/heat/openstack/common/version.py 2013-05-16 14:07:08.000000000 +0000 -@@ -19,6 +19,7 @@ - """ - - import pkg_resources -+import os - - - class VersionInfo(object): -@@ -54,6 +55,9 @@ - if self.release is None: - self.release = self._get_version_from_pkg_resources() - -+ if self.release is None: -+ self.release = os.environ.get("OSLO_PACKAGE_VERSION", None) -+ - return self.release - - def version_string(self): === removed file 'debian/patches/removes-lxml-version-limitation-from-pip-requires.patch' --- debian/patches/removes-lxml-version-limitation-from-pip-requires.patch 2013-05-29 17:36:41 +0000 +++ debian/patches/removes-lxml-version-limitation-from-pip-requires.patch 1970-01-01 00:00:00 +0000 @@ -1,18 +0,0 @@ -Description: Removes <= 2.3.5 from lxml pip-requires - Warn upstream on IRC about this, they said it's no problem to remove the - version thing, and they will remove it upstream. -Author: Thomas Goirand -Forwarded: no -Last-Update: 2013-05-16 - ---- heat-2013.1.orig/tools/pip-requires -+++ heat-2013.1/tools/pip-requires -@@ -17,7 +17,7 @@ httplib2 - iso8601>=0.1.4 - kombu>=1.0.4 - argparse --lxml>=2.3,<=2.3.5 -+lxml>=2.3 - sqlalchemy-migrate>=0.7.2 - python-novaclient - PasteDeploy==1.5.0 === removed file 'debian/patches/series' --- debian/patches/series 2013-05-29 17:36:41 +0000 +++ debian/patches/series 1970-01-01 00:00:00 +0000 @@ -1,2 +0,0 @@ -removes-lxml-version-limitation-from-pip-requires.patch -fix-package-version-detection-when-building-doc.patch === modified file 'debian/rules' --- debian/rules 2013-05-29 17:36:41 +0000 +++ debian/rules 2013-07-22 20:25:43 +0000 @@ -11,7 +11,7 @@ ifeq (,$(findstring nocheck, $(DEB_BUILD_OPTIONS))) override_dh_auto_test: - ./run_tests.sh -u + testr init && testr run || true endif