Fixed (build-)depends for this release.

Rewritten-From: 829ece20dafb461c9c376b4dbcbb656abe8c1f03

diff --git a/trusty/debian/changelog b/trusty/debian/changelog
index a314d1c77f2a4a66f082852d56e792b190fe922d..1b209c69ce3305e425c04cfce50b4ea0b820b2a8 100644 (file)
--- a/trusty/debian/changelog
+++ b/trusty/debian/changelog
@@ -1,6 +1,7 @@
-heat (5.0.0~b2-1) experimental; urgency=medium
+heat (1:5.0.0~b2-1) experimental; urgency=medium
 
   * New upstream release.
+  * Fixed (build-)depends for this release.
 
  -- Thomas Goirand <zigo@debian.org>  Sun, 02 Aug 2015 11:22:32 +0200
 

diff --git a/trusty/debian/control b/trusty/debian/control
index 501a1b79bb8efc30e0ceb5ea115e0c5090993831..f16edc7852383bd8d88a12001549a7708e44408c 100644 (file)
--- a/trusty/debian/control
+++ b/trusty/debian/control
@@ -2,52 +2,59 @@ Source: heat
 Section: web
 Priority: optional
 Maintainer: PKG OpenStack <openstack-devel@lists.alioth.debian.org>
-Uploaders: Julien Danjou <acid@debian.org>,
-           Thomas Goirand <zigo@debian.org>,
-           Mehdi Abaakouk <sileht@sileht.net>
+Uploaders: Thomas Goirand <zigo@debian.org>,
 Build-Depends: debhelper (>= 9),
-               dh-systemd,
                dh-python,
+               dh-systemd,
                openstack-pkg-tools (>= 23~),
                po-debconf,
                python-all,
-               python-pbr,
+               python-pbr (>= 1.3),
                python-setuptools,
                python-sphinx,
 Build-Depends-Indep: python-babel,
+                     python-barbicanclient (>= 3.0.1),
                      python-ceilometerclient (>= 1.0.13),
-                     python-cinderclient (>= 1:1.1.0),
+                     python-cinderclient (>= 1:1.3.1),
                      python-coverage,
                      python-crypto,
-                     python-eventlet (>= 0.16.1),
-                     python-glanceclient (>= 1:0.15.0),
+                     python-cryptography (>= 0.9.1),
+                     python-designateclient (>= 1.0.0),
+                     python-eventlet (>= 0.17.4),
+                     python-glanceclient (>= 1:0.18.0),
                      python-greenlet,
                      python-hacking,
                      python-heatclient (>= 0.3.0),
                      python-httplib2,
                      python-iso8601,
-                     python-keystoneclient (>= 1:1.1.0),
-                     python-keystonemiddleware (>= 1.5.0),
+                     python-keystoneclient (>= 1:1.6.0),
+                     python-keystonemiddleware (>= 2.0.0),
                      python-kombu,
                      python-lxml,
-                     python-migrate (>= 0.9.5),
+                     python-manilaclient (>= 1.0.4),
+                     python-migrate (>= 0.9.6),
+                     python-mistralclient (>= 1.0.0),
                      python-mock,
                      python-mox,
                      python-mysqldb,
                      python-netaddr,
                      python-neutronclient (>= 2.3.11),
                      python-novaclient (>= 2:2.22.0),
-                     python-oslo.concurrency (>= 1.8.0),
-                     python-oslo.config (>= 1:1.9.3),
+                     python-oslo.cache (>= 0.3.0),
+                     python-oslo.concurrency (>= 2.3.0),
+                     python-oslo.config (>= 1:1.11.0),
                      python-oslo.context (>= 0.2.0),
-                     python-oslo.db (>= 1.7.0),
+                     python-oslo.db (>= 1.12.0),
                      python-oslo.i18n (>= 1.5.0),
-                     python-oslo.log (>= 1.0.0),
-                     python-oslo.messaging (>= 1.8.0),
-                     python-oslo.middleware (>= 1.0.0),
+                     python-oslo.log (>= 1.6.0),
+                     python-oslo.messaging (>= 1.16.0),
+                     python-oslo.middleware (>= 2.4.0),
+                     python-oslo.policy (>= 0.5.0),
+                     python-oslo.reports,
                      python-oslo.serialization (>= 1.4.0),
-                     python-oslo.utils (>= 1.4.0),
-                     python-oslo.versionedobjects (>= 0.1.1),
+                     python-oslo.service,
+                     python-oslo.utils (>= 1.9.0),
+                     python-oslo.versionedobjects (>= 0.3.0),
                      python-oslosphinx (>= 2.5.0),
                      python-oslotest (>= 1.5.1),
                      python-osprofiler,
@@ -55,19 +62,19 @@ Build-Depends-Indep: python-babel,
                      python-pastedeploy,
                      python-posix-ipc,
                      python-psycopg2,
-                     python-qpid,
-                     python-requests,
+                     python-requests (>= 2.5.2),
                      python-routes,
-                     python-saharaclient (>= 0.8.0),
+                     python-saharaclient (>= 0.9.0),
                      python-six (>= 1.9.0),
                      python-sqlalchemy,
-                     python-stevedore (>= 1.3.0),
+                     python-stevedore (>= 1.5.0),
                      python-swiftclient,
                      python-testscenarios,
                      python-testtools,
-                     python-troveclient (>= 1.0.7),
+                     python-troveclient (>= 1.0.9),
                      python-webob,
                      python-yaml,
+                     python-zaqarclient (>= 0.1.1),
                      subunit,
                      testrepository,
 Standards-Version: 3.9.6
@@ -78,53 +85,61 @@ Homepage: http://wiki.openstack.org/Heat
 Package: python-heat
 Section: python
 Architecture: all
-Pre-Depends: dpkg (>= 1.15.6~)
 Depends: python-babel (>= 1.3),
+         python-barbicanclient (>= 3.0.1),
          python-ceilometerclient (>= 1.0.13),
-         python-cinderclient (>= 1:1.1.0),
+         python-cinderclient (>= 1:1.3.1),
          python-crypto,
-         python-eventlet (>= 0.16.1),
-         python-glanceclient (>= 1:0.15.0),
+         python-cryptography (>= 0.9.1),
+         python-designateclient (>= 1.0.0),
+         python-eventlet (>= 0.17.4),
+         python-glanceclient (>= 1:0.18.0),
          python-greenlet,
          python-heatclient (>= 0.3.0),
          python-httplib2,
          python-iso8601,
-         python-keystoneclient (>= 1:1.1.0),
-         python-keystonemiddleware (>= 1.5.0),
+         python-keystoneclient (>= 1:1.6.0),
+         python-keystonemiddleware (>= 2.0.0),
          python-kombu,
          python-lxml,
+         python-manilaclient (>= 1.0.4),
          python-memcache,
-         python-migrate (>= 0.9.5),
+         python-migrate (>= 0.9.6),
+         python-mistralclient (>= 1.0.0),
          python-mysqldb,
          python-netaddr,
          python-neutronclient (>= 2.3.11),
          python-novaclient (>= 2:2.22.0),
-         python-oslo.concurrency (>= 1.8.0),
-         python-oslo.config (>= 1:1.9.3),
+         python-oslo.cache (>= 0.3.0),
+         python-oslo.concurrency (>= 2.3.0),
+         python-oslo.config (>= 1:1.11.0),
          python-oslo.context (>= 0.2.0),
-         python-oslo.db (>= 1.7.0),
+         python-oslo.db (>= 1.12.0),
          python-oslo.i18n (>= 1.5.0),
-         python-oslo.log (>= 1.0.0),
-         python-oslo.messaging (>= 1.8.0),
-         python-oslo.middleware (>= 1.0.0),
+         python-oslo.log (>= 1.6.0),
+         python-oslo.messaging (>= 1.16.0),
+         python-oslo.middleware (>= 2.4.0),
+         python-oslo.policy (>= 0.5.0),
+         python-oslo.reports,
          python-oslo.serialization (>= 1.4.0),
-         python-oslo.utils (>= 1.4.0),
-         python-oslo.versionedobjects (>= 0.1.1),
+         python-oslo.service,
+         python-oslo.utils (>= 1.9.0),
+         python-oslo.versionedobjects (>= 0.3.0),
          python-osprofiler,
          python-pastedeploy,
-         python-pbr,
+         python-pbr (>= 1.3),
          python-posix-ipc,
-         python-qpid,
-         python-requests,
+         python-requests (>= 2.5.2),
          python-routes,
-         python-saharaclient (>= 0.8.0),
+         python-saharaclient (>= 0.9.0),
          python-six (>= 1.9.0),
          python-sqlalchemy,
-         python-stevedore (>= 1.3.0),
+         python-stevedore (>= 1.5.0),
          python-swiftclient,
-         python-troveclient (>= 1.0.7),
+         python-troveclient (>= 1.0.9),
          python-webob,
          python-yaml,
+         python-zaqarclient (>= 0.1.1),
          ${misc:Depends},
          ${python:Depends},
 Description: OpenStack orchestration service - Python files
@@ -136,12 +151,11 @@ Description: OpenStack orchestration service - Python files
 
 Package: heat-common
 Architecture: all
-Pre-Depends: dpkg (>= 1.15.6~)
 Depends: adduser,
          dbconfig-common,
          python-heat (=${binary:Version}),
          ${misc:Depends},
-         ${python: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
@@ -151,12 +165,11 @@ Description: OpenStack orchestration service - common files
 
 Package: heat-engine
 Architecture: all
-Pre-Depends: dpkg (>= 1.15.6~)
 Depends: adduser,
          heat-common (=${binary:Version}),
          ${misc:Depends},
          ${ostack-lsb-base},
-         ${python:Depends}
+         ${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
@@ -167,12 +180,11 @@ Description: OpenStack orchestration service - engine
 
 Package: heat-api
 Architecture: all
-Pre-Depends: dpkg (>= 1.15.6~)
 Depends: adduser,
          heat-common (=${binary:Version}),
          ${misc:Depends},
          ${ostack-lsb-base},
-         ${python:Depends}
+         ${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
@@ -182,12 +194,11 @@ Description: OpenStack orchestration service - ReST API
 
 Package: heat-api-cfn
 Architecture: all
-Pre-Depends: dpkg (>= 1.15.6~)
 Depends: adduser,
          heat-common (=${binary:Version}),
          ${misc:Depends},
          ${ostack-lsb-base},
-         ${python:Depends}
+         ${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
@@ -197,12 +208,11 @@ Description: OpenStack orchestration service - CFN API
 
 Package: heat-api-cloudwatch
 Architecture: all
-Pre-Depends: dpkg (>= 1.15.6~)
 Depends: adduser,
          heat-common (=${binary:Version}),
          ${misc:Depends},
          ${ostack-lsb-base},
-         ${python:Depends}
+         ${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
@@ -213,8 +223,8 @@ Description: OpenStack orchestration service - CloudWatch API
 Package: heat-doc
 Architecture: all
 Section: doc
-Pre-Depends: dpkg (>= 1.15.6~)
-Depends: ${misc:Depends}, ${sphinxdoc:Depends}
+Depends: ${misc:Depends},
+         ${sphinxdoc:Depends},
 Description: OpenStack orchestration service - Documentation
  Heat is a service to orchestrate multiple composite cloud applications using
  templates, through both an OpenStack-native ReST API and a

diff --git a/trusty/debian/heat-common.install b/trusty/debian/heat-common.install
index 4a62cf2b96d6a9901cdacc7373453b57a94602df..6e7560b602ddd0a9f258303bb9e5d522e461118b 100644 (file)
--- a/trusty/debian/heat-common.install
+++ b/trusty/debian/heat-common.install
@@ -1,7 +1,7 @@
 /usr/bin/heat-db-setup
 /usr/bin/heat-keystone-setup
-/usr/bin/heat-manage
 /usr/bin/heat-keystone-setup-domain
+/usr/bin/heat-manage
 etc/heat/api-paste.ini
 etc/heat/environment.d/default.yaml
 etc/heat/policy.json