Merge lp:~zulcss/cinder/housecleaning into lp:~ubuntu-server-dev/cinder/havana

[Chuck Short]

Fall house cleaning

[Adam Gandelman (gandelman-a)]

Looks good but please remove huge tabs in d/control in favor of single-space indenting.

review: Needs Fixing

[Adam Gandelman (gandelman-a)]

Also,

python-stevedore (>= 0.10.0),

needs to be

python-stevedore (>= 0.10),

0.10 is our current version, which is < 0.10.0

review: Needs Fixing

[lp:~zulcss/cinder/housecleaning]

139. By Chuck Short on 2013-09-20

Fixed up bassed on suggestions

140. By Chuck Short on 2013-09-20

Fixed up bassed on suggestions

[James Page (james-page)]

review: Approve

[lp:~zulcss/cinder/housecleaning]

141. By Chuck Short on 2013-09-20

Add epoch of oslo.config

=== modified file 'debian/changelog'
--- debian/changelog	2013-09-10 16:41:01 +0000
+++ debian/changelog	2013-09-20 13:35:21 +0000
@@ -3,6 +3,16 @@
   * New upstream release.
   * debian/patches/skip-sqlachemy-failures.patch: Dropped 
   * debian/patches/fix-sqlalchemy-requirements.patch: Refreshed.
+  * debian/control: 
+    - Dropped python-nose and python-setuptool-git.
+    - Added python-netaddr as a build-dependency. (LP: #1227153)
+    - Added python-six as a build-dependency.
+    - Added versioned dependencies to python-pbr, python-amqplib,
+      python-glanceclient, python-novaclient, and python-swiftclient,
+      python-lxml, python-webob, python-oslo.config, python-sqlalchemy,
+      python-fixtures, python-testtools, and python-fixtures
+    - Bumped versioned dependencies for python-eventlet, python-hp3parclient,
+      and python-keystoneclient, 
 
  -- Chuck Short <[e-mail]>  Tue, 10 Sep 2013 11:45:33 -0400
 

=== modified file 'debian/control'
--- debian/control	2013-08-28 16:46:10 +0000
+++ debian/control	2013-09-20 13:35:21 +0000
@@ -4,43 +4,43 @@
 Maintainer: Chuck Short <[e-mail]>
 Build-Depends: debhelper (>= 8.0.0), python-all (>= 2.6)
 Build-Depends-Indep:
- python-amqplib,
+ python-amqplib (>= 0.6.1),
  python-anyjson (>= 0.3.3),
  python-babel,
  python-coverage,
  python-d2to1,
- python-eventlet (>= 0.12.0),
- python-fixtures,
- python-glanceclient,
+ python-eventlet (>= 0.13.0),
+ python-fixtures (>= 0.3.14),
+ python-glanceclient (>= 1:0.9.0),
  python-greenlet (>= 0.3.2),
- python-hp3parclient (>= 1.0.0),
+ python-hp3parclient (>= 2.0.0),
  python-iso8601,
- python-keystoneclient (>= 1:0.2.3),
+ python-keystoneclient (>= 1:0.3.0),
  python-kombu (>= 2.5.12),
  python-lockfile,
- python-lxml,
+ python-lxml (>= 2.3),
  python-migrate,
  python-mock,
  python-mox,
  python-mysqldb,
- python-nose,
- python-novaclient,
- python-oslo.config,
+ python-netaddr,
+ python-novaclient (>= 1:2.12.0),
+ python-oslo.config (>= 1:1.1.0),
  python-paramiko (>= 1.8),
  python-paste,
  python-pastedeploy,
- python-pbr,
+ python-pbr (>= 0.5.21),
  python-routes,
- python-swiftclient,
  python-setuptools,
- python-setuptools-git,
+ python-six,
  python-sphinx,
- python-sqlalchemy,
- python-stevedore (>= 0.9),
+ python-sqlalchemy (>= 0.8.2),
+ python-stevedore (>= 0.10),
  python-suds,
- python-testtools,
- python-webob,
- testrepository
+ python-swiftclient (>= 1:1.5),
+ python-testtools (>= 0.9.32),
+ python-webob (>= 1.2.3),
+ testrepository (>= 0.0.17)
 Standards-Version: 3.9.4
 Homepage: http://launchpad.net/cinder
 Vcs-Browser: http://bazaar.launchpad.net/~ubuntu-server-dev/cinder/havana/files
@@ -51,30 +51,34 @@
 Section: python
 Architecture: all
 Depends:
- python-amqplib,
+ python-amqplib (>= 0.6.1),
  python-anyjson (>= 0.3.3),
- python-eventlet (>= 0.12.0),
- python-glanceclient,
- python-keystoneclient (>= 1:0.2.3),
- python-oslo.config,
+ python-babel,
+ python-eventlet (>= 0.13.0),
+ python-glanceclient (>= 1:0.9.0),
  python-greenlet (>= 0.3.2),
  python-iso8601,
+ python-keystoneclient (>= 1:0.3.0),
  python-kombu (>= 2.5.12),
  python-lockfile,
- python-lxml,
+ python-lxml (>= 2.3),
  python-migrate,
+ python-netaddr,
+ python-novaclient (>= 1:2.12.0),
+ python-oslo.config (>= 1:1.1.0),
  python-paramiko (>= 1.8),
  python-paste,
  python-pastedeploy,
  python-routes,
- python-stevedore (>= 0.9),
- python-swiftclient,
- python-sqlalchemy,
+ python-six,
+ python-sqlalchemy (>= 0.8.2),
+ python-stevedore (>= 0.10),
  python-suds,
- python-webob,
+ python-swiftclient (>= 1:1.5),
+ python-webob (>= 1.2.3),
  ${misc:Depends},
  ${python:Depends}
-Suggests: python-hp3parclient, python-ceph
+Suggests: python-ceph, python-hp3parclient
 Description: Cinder Python libraries
  OpenStack is a reliable cloud infrastructure. Its mission is to produce
  the ubiquitous cloud computing platform that will meet the needs of public