From: Thomas Goirand <thomas@goirand.fr>
Date: Mon, 7 Oct 2013 18:48:30 +0000 (+0000)
Subject: Merge branch 'debian/havana' of ssh://git.debian.org/git/openstack/ceilometer into... 
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=18c33c1d1e7fcbb66f4e5f9f4a076864d41ff953;hp=5659effb2b07978c09daa7f87e08ba5044b1e04f;p=openstack-build%2Fceilometer-build.git

Merge branch 'debian/havana' of ssh://git.debian.org/git/openstack/ceilometer into debian/havana

Conflicts:
	debian/control

Rewritten-From: da0d6bd3500f6d9591aab367aeb0173b0eafe763
---

diff --git a/trusty/debian/control b/trusty/debian/control
index 124f376..d421ef2 100644
--- a/trusty/debian/control
+++ b/trusty/debian/control
@@ -11,36 +11,37 @@ Build-Depends: debhelper (>= 9),
                python-all (>= 2.6.6-3~),
                python-d2to1 (>= 0.2.10),
                python-pbr (>= 0.5.21)
-Build-Depends-Indep: alembic,
+Build-Depends-Indep: alembic (>= 0.4.2),
                      mongodb,
                      msgpack-python,
                      pep8,
-                     python-anyjson (>= 0.2.4),
-                     python-argparse,
+                     python-anyjson (>= 0.3.3),
                      python-babel,
-                     python-ceilometerclient (>= 1.0.2),
+                     python-ceilometerclient (>= 1.0.6),
                      python-coverage,
                      python-docutils (>= 0.9.1),
-                     python-eventlet,
+                     python-eventlet (>= 0.13.0),
                      python-extras,
-                     python-fixtures (>= 0.3.12),
+                     python-fixtures (>= 0.3.14),
                      python-flask (>= 0.10),
-                     python-glanceclient (>= 1:0.6),
+                     python-glance (>= 2013.2~),
+                     python-glanceclient (>= 1:0.10.0),
                      python-happybase,
+                     python-httplib2,
                      python-iso8601,
-                     python-keystoneclient (>= 1:0.2.3),
+                     python-keystoneclient (>= 1:0.3.2),
                      python-kombu (>> 2.4.7),
                      python-lockfile,
                      python-lxml,
                      python-ming,
-                     python-mock,
+                     python-mock (>= 1.0),
                      python-mox,
                      python-netaddr (>= 0.7.6),
                      python-netifaces,
                      python-nose,
                      python-nova (>= 2013.2~),
-                     python-novaclient (>= 2:2.6.10),
-                     python-oslo.config,
+                     python-novaclient (>= 2:2.13.0),
+                     python-oslo.config (>= 1.2.1),
                      python-oslo.sphinx,
                      python-pecan (>= 0.2.1),
                      python-pymongo (>= 2.4),
@@ -53,13 +54,13 @@ Build-Depends-Indep: alembic,
                      python-stevedore (>= 0.9),
                      python-subunit,
                      python-swift (>= 1.8.0),
-                     python-swiftclient,
+                     python-swiftclient (>= 1:1.6.0),
                      python-testrepository (>= 0.0.13),
-                     python-testscenarios,
+                     python-testscenarios (>= 0.4),
                      python-testtools (>= 0.9.29),
                      python-unittest2,
-                     python-webob (>= 1.2),
-                     python-wsme,
+                     python-webob (>= 1.2.3),
+                     python-wsme (>= 0.5b5),
                      python-yaml,
                      testrepository (>= 0.0.13)
 Standards-Version: 3.9.4
@@ -71,25 +72,25 @@ Package: python-ceilometer
 Section: python
 Architecture: all
 Pre-Depends: dpkg (>= 1.15.6~)
-Depends: alembic,
+Depends: alembic (>= 0.4.2),
          libjs-jquery,
          msgpack-python,
-         python-anyjson (>= 0.2.4),
-         python-argparse,
+         python-anyjson (>= 0.3.3),
+         python-ceilometerclient (>= 1.0.6),
          python-d2to1 (>= 0.2.10),
-         python-eventlet,
+         python-eventlet (>= 0.13.0),
          python-extras,
          python-flask (>= 0.10),
-         python-glanceclient (>= 1:0.6),
+         python-glanceclient (>= 1:0.10.0),
          python-greenlet (>= 0.4),
          python-iso8601,
-         python-keystoneclient (>= 1:0.2.3),
+         python-keystoneclient (>= 1:0.3.2),
          python-kombu (>> 2.4.7),
          python-lockfile,
          python-lxml,
          python-netaddr (>= 0.7.6),
-         python-novaclient (>= 2:2.6.10),
-         python-oslo.config,
+         python-novaclient (>= 2:2.13.0),
+         python-oslo.config (>= 1.2.1),
          python-pbr (>= 0.5.21),
          python-pecan (>= 0.2.1),
          python-pymongo (>= 2.4),
@@ -97,8 +98,9 @@ Depends: alembic,
          python-simplegeneric (>= 0.8),
          python-sqlalchemy (>= 0.7.3),
          python-stevedore (>= 0.9),
-         python-swiftclient,
-         python-webob (>= 1.2),
+         python-swiftclient (>= 1:1.6.0),
+         python-webob (>= 1.2.3),
+         python-wsme (>= 0.5b5),
          python-yaml,
          ${misc:Depends},
          ${python:Depends}