Reviewed (build-)depends for Icehouse b2.

Rewritten-From: 147044f493cd5ad7ddee034f46afa6a935c5c5e0

diff --git a/trusty/debian/control b/trusty/debian/control
index b8d5ef4422f352d9f61710bfb19ed78ae6171e4b..f06039abdc44a60a2e2cede6994cef973d83f50d 100644 (file)
--- a/trusty/debian/control
+++ b/trusty/debian/control
@@ -9,29 +9,28 @@ Build-Depends: debhelper (>= 9),
                openstack-pkg-tools (>= 8~),
                po-debconf,
                python-all (>= 2.6.6-3~),
-               python-d2to1,
                python-pbr (>= 0.5.21)
 Build-Depends-Indep: pep8 (>= 1.3.3),
-                     python-argparse,
-                     python-babel,
+                     python-babel (>= 1.3),
                      python-boto (>= 2.4),
-                     python-ceilometerclient (>= 1.0.5),
-                     python-cinderclient (>= 1:1.0.5),
-                     python-coverage,
+                     python-ceilometerclient (>= 1.0.6),
+                     python-cinderclient (>= 1:1.0.6),
+                     python-coverage (>= 3.6),
                      python-crypto,
                      python-eventlet (>= 0.13.0),
                      python-extras,
                      python-glanceclient (>= 1:0.9.0),
                      python-greenlet (>= 0.3.2),
-                     python-hacking,
+                     python-hacking (>= 0.8.0),
                      python-heatclient (>= 0.2.3),
                      python-httplib2,
-                     python-iso8601,
-                     python-keystoneclient (>= 1:0.3.2),
+                     python-iso8601 (>= 0.1.8),
+                     python-keystoneclient (>= 1:0.4.1),
                      python-kombu (>= 2.4.8),
+                     python-lockfile,
                      python-lxml (>= 2.3),
                      python-memcache,
-                     python-migrate (>= 0.7.2-3),
+                     python-migrate (>= 0.8.2),
                      python-mock (>= 1.0),
                      python-mox,
                      python-netaddr,
@@ -46,6 +45,7 @@ Build-Depends-Indep: pep8 (>= 1.3.3),
                      python-pastedeploy,
                      python-pycryptopp,
                      python-qpid,
+                     python-requests (>= 1.1),
                      python-routes,
                      python-sendfile,
                      python-setuptools,
@@ -54,7 +54,9 @@ Build-Depends-Indep: pep8 (>= 1.3.3),
                      python-sqlalchemy (>= 0.7.8),
                      python-subunit,
                      python-swiftclient (>= 1.5),
+                     python-testscenarios (>= 0.4),
                      python-testtools (>= 0.9.32),
+                     python-troveclient (>= 1.0.3),
                      python-webob (>= 1.2.3),
                      python-yaml,
                      testrepository (>= 0.0.17)
@@ -67,10 +69,10 @@ Package: python-heat
 Section: python
 Architecture: all
 Pre-Depends: dpkg (>= 1.15.6~)
-Depends: python-babel,
+Depends: python-babel (>= 1.3),
          python-boto (>= 2.4),
-         python-ceilometerclient (>= 1.0.5),
-         python-cinderclient (>= 1:1.0.5),
+         python-ceilometerclient (>= 1.0.6),
+         python-cinderclient (>= 1:1.0.6),
          python-crypto,
          python-eventlet (>= 0.13.0),
          python-extras,
@@ -79,11 +81,11 @@ Depends: python-babel,
          python-heatclient (>= 0.2.3),
          python-httplib2,
          python-iso8601 (>= 0.1.8),
-         python-keystoneclient (>= 1:0.3.2),
+         python-keystoneclient (>= 1:0.4.1),
          python-kombu (>= 2.4.8),
          python-lxml (>= 2.3),
          python-memcache,
-         python-migrate (>= 0.7.2-3),
+         python-migrate (>= 0.8.2),
          python-mysqldb,
          python-netaddr,
          python-neutronclient,
@@ -95,12 +97,14 @@ Depends: python-babel,
          python-pbr (>= 0.5.21),
          python-pycryptopp,
          python-qpid,
+         python-requests (>= 1.1),
          python-routes,
          python-sendfile,
          python-setuptools,
          python-six (>= 1.4.1),
          python-sqlalchemy (>= 0.7.8),
          python-swiftclient (>= 1.5),
+         python-troveclient (>= 1.0.3),
          python-webob (>= 1.2.3),
          python-yaml,
          ${misc:Depends},

diff --git a/trusty/debian/heat-common.install b/trusty/debian/heat-common.install
index 66d9150e658ac03bbca5e9a5290e3f372b9bde41..aced199bb664b7ed8010f89a6b551e90960b858b 100644 (file)
--- a/trusty/debian/heat-common.install
+++ b/trusty/debian/heat-common.install
@@ -1,4 +1,4 @@
 /usr/bin/heat-manage
-etc/heat/policy.json
-etc/heat/environment.d/default.yaml
 etc/heat/api-paste.ini
+etc/heat/environment.d/default.yaml
+etc/heat/policy.json