Fixed (build-)depends for Jessie

Rewritten-From: 98c6c3eac8f2df50c38fe5e793aaeec79e6a60e6

diff --git a/trusty/debian/control b/trusty/debian/control
index d464cc20a9138210e5ccd58868c4a77534b48a66..0823690ae16e25eb36f720313def0b9c58938e5f 100644 (file)
--- a/trusty/debian/control
+++ b/trusty/debian/control
@@ -11,29 +11,29 @@ Build-Depends: debhelper (>= 9),
                openstack-pkg-tools,
                po-debconf,
                python-all (>= 2.6.6-3~),
-               python-pbr (>= 0.6),
+               python-pbr,
                python-setuptools,
-               python-sphinx
+               python-sphinx,
 Build-Depends-Indep: gettext,
-                     python-babel (>= 1.3),
+                     python-babel,
                      python-ceilometerclient (>= 1.0.13),
                      python-cinderclient (>= 1:1.1.0),
-                     python-cloudfiles,
-                     python-compressor (>= 1.4),
-                     python-coverage (>= 3.6),
-                     python-django (>= 1.4.2),
+                     python-compressor,
+                     python-coverage,
+                     python-django,
                      python-django-nose,
-                     python-django-pyscss (>= 1.0.3),
+                     python-django-pyscss,
                      python-eventlet (>= 0.16.1),
                      python-glanceclient (>= 1:0.15.0),
-                     python-hacking (>= 0.8.0),
+                     python-hacking,
                      python-heatclient (>= 0.3.0),
-                     python-httplib2 (>= 0.7.5),
-                     python-iso8601 (>= 0.1.9),
+                     python-httplib2,
+                     python-iso8601,
                      python-keystoneclient (>= 1:1.1.0),
-                     python-kombu (>= 2.5.12),
+                     python-kombu,
+                     python-mock,
                      python-mox,
-                     python-netaddr (>= 0.7.12),
+                     python-netaddr,
                      python-neutronclient (>= 2.3.11),
                      python-nose,
                      python-nose-exclude,
@@ -43,17 +43,17 @@ Build-Depends-Indep: gettext,
                      python-openstack-auth (>= 1.1.7),
                      python-openstack.nose-plugin,
                      python-oslo.concurrency (>= 1.8.0),
-                     python-oslo.config (>= 1.9.3),
+                     python-oslo.config (>= 1:1.9.3),
                      python-oslo.i18n (>= 1.5.0),
                      python-oslo.serialization (>= 1.4.0),
                      python-oslo.utils (>= 1.4.0),
-                     python-oslosphinx (>= 2.2.0.0),
+                     python-oslosphinx (>= 2.5.0),
                      python-pint,
-                     python-pyscss (>= 1.2.1),
+                     python-pyscss,
                      python-saharaclient (>= 0.8.0),
                      python-six (>= 1.9.0),
-                     python-swiftclient (>= 1:2.2.0),
-                     python-testtools (>= 0.9.34),
+                     python-swiftclient,
+                     python-testtools,
                      python-troveclient (>= 1.0.7),
                      python-tz,
                      python-xstatic,
@@ -79,7 +79,7 @@ Build-Depends-Indep: gettext,
                      python-xstatic-spin,
                      python-xstatic-term.js,
                      python-xvfbwrapper,
-                     python-yaml
+                     python-yaml,
 Build-Conflicts: python-unittest2
 Standards-Version: 3.9.5
 Homepage: http://horizon.openstack.org
@@ -90,37 +90,34 @@ Package: python-django-horizon
 Section: python
 Architecture: all
 Pre-Depends: dpkg (>= 1.15.6~)
-Depends: python-babel (>= 1.3),
+Depends: python-babel,
          python-ceilometerclient (>= 1.0.13),
          python-cinderclient (>= 1:1.1.0),
-         python-cloudfiles,
-         python-compressor (>= 1.4),
-         python-d2to1 (>= 0.2.10),
-         python-django (>= 1.4.2),
-         python-django-nose,
-         python-django-pyscss (>= 1.0.3),
+         python-compressor,
+         python-django,
+         python-django-pyscss,
          python-eventlet (>= 0.16.1),
          python-glanceclient (>= 1:0.15.0),
          python-heatclient (>= 0.3.0),
-         python-httplib2 (>= 0.7.5),
-         python-iso8601 (>= 0.1.9),
+         python-httplib2,
+         python-iso8601,
          python-keystoneclient (>= 1:1.1.0),
-         python-kombu (>= 2.5.12),
+         python-kombu,
          python-memcache,
-         python-netaddr (>= 0.7.12),
+         python-netaddr,
          python-neutronclient (>= 2.3.11),
          python-novaclient (>= 2:2.22.0),
          python-openstack-auth (>= 1.1.7),
          python-oslo.concurrency (>= 1.8.0),
-         python-oslo.config (>= 1.9.3),
+         python-oslo.config (>= 1:1.9.3),
          python-oslo.i18n (>= 1.5.0),
          python-oslo.serialization (>= 1.4.0),
          python-oslo.utils (>= 1.4.0),
          python-pint,
-         python-pyscss (>= 1.2.1),
+         python-pyscss,
          python-saharaclient (>= 0.8.0),
          python-six (>= 1.9.0),
-         python-swiftclient (>= 1:2.2.0),
+         python-swiftclient,
          python-troveclient (>= 1.0.7),
          python-tz,
          python-xstatic,
@@ -147,7 +144,7 @@ Depends: python-babel (>= 1.3),
          python-xstatic-term.js,
          python-yaml,
          ${misc:Depends},
-         ${python:Depends}
+         ${python:Depends},
 Recommends: memcached
 Description: Django module providing web interaction with OpenStack
  The OpenStack Dashboard is a web application to control an OpenStack