Merge lp:~zulcss/cinder/cinder-ftbfs-pbr into lp:~openstack-ubuntu-testing/cinder/havana

[Chuck Short]

[Adam Gandelman (gandelman-a)]

This merge is against the wrong branch? (grizzly, not havana)

review: Disapprove

=== modified file 'debian/changelog'
--- debian/changelog	2013-05-03 08:19:56 +0000
+++ debian/changelog	2013-05-17 17:20:30 +0000
@@ -1,9 +1,12 @@
-cinder (1:2013.2.a163.ga4ba17b-0ubuntu1) UNRELEASED; urgency=low
+cinder (1:2013.2.a226.g1d6de0f-0ubuntu1) UNRELEASED; urgency=low
 
   [ Chuck Short ]
   * New upstream version.
-  * debian/patches/fix_cinder_dependencies.patch: Refreshed.
+  * debian/patches/fix_cinder_dependencies.patch: Dropped.
   * debian/control: Bump standards version to 3.9.4.
+  * debian/control: Add python-pbr and python-d2to1 to build-depends.
+  * debian/rules: Add work around to remove wonky setup.py setup
+  * debian/cinder-common.install: Add cinder-rpc-zmq-receiver binary.
 
   [ James Page ]
   * debian/control: Drop surplus dependency on python-glance (LP: #1175600).
 
=== modified file 'debian/cinder-common.install'
--- debian/cinder-common.install	2013-02-20 10:31:01 +0000
+++ debian/cinder-common.install	2013-05-17 17:20:30 +0000
@@ -6,3 +6,4 @@
 etc/cinder/rootwrap.conf etc/cinder
 usr/bin/cinder-manage
 usr/bin/cinder-rootwrap
+usr/bin/cinder-rpc-zmq-receiver
 
=== modified file 'debian/control'
--- debian/control	2013-05-03 08:19:56 +0000
+++ debian/control	2013-05-17 17:20:30 +0000
@@ -7,6 +7,7 @@
  python-amqplib,
  python-anyjson,
  python-coverage,
+ python-d2to1,
  python-eventlet,
  python-glanceclient,
  python-greenlet,
@@ -25,6 +26,7 @@
  python-paramiko,
  python-paste,
  python-pastedeploy,
+ python-pbr,
  python-routes,
  python-swiftclient,
  python-setuptools,
 
=== removed file 'debian/patches/fix_cinder_dependencies.patch'
--- debian/patches/fix_cinder_dependencies.patch	2013-04-30 13:11:39 +0000
+++ debian/patches/fix_cinder_dependencies.patch	1970-01-01 00:00:00 +0000
@@ -1,11 +0,0 @@
-diff -Naurp cinder-2013.2.a163.ga4ba17b.orig/tools/pip-requires cinder-2013.2.a163.ga4ba17b/tools/pip-requires
---- cinder-2013.2.a163.ga4ba17b.orig/tools/pip-requires	2013-04-30 08:04:01.000000000 -0500
-+++ cinder-2013.2.a163.ga4ba17b/tools/pip-requires	2013-04-30 08:07:44.181680954 -0500
-@@ -17,7 +17,6 @@ python-glanceclient>=0.5.0,<2
- python-keystoneclient>=0.2,<0.3
- python-swiftclient>=1.2,<2
- routes>=1.12.3
--setuptools_git>=0.4
- sqlalchemy>=0.7,<=0.7.99
- sqlalchemy-migrate>=0.7
- stevedore>=0.7
 
=== removed file 'debian/patches/series'
--- debian/patches/series	2013-02-25 17:37:22 +0000
+++ debian/patches/series	1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
-fix_cinder_dependencies.patch
 
=== modified file 'debian/rules'
--- debian/rules	2013-05-03 16:31:16 +0000
+++ debian/rules	2013-05-17 17:20:30 +0000
@@ -3,10 +3,6 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-DEBVERS ?= $(shell dpkg-parsechangelog | sed -n -e 's/^Version: //p')
-VERSION ?= $(shell echo '$(DEBVERS)' | sed -e 's/^[[:digit:]]*://' -e 's/[-].*//')
-export OSLO_PACKAGE_VERSION=$(VERSION)
-
 %:
 	dh $@  --with python2
 
@@ -23,3 +19,7 @@
 
 override_dh_fixperms:
 	dh_fixperms -Xcinder_tgt.conf
+
+override_dh_clean:
+	# temporary workaround for d2to1 wonkyness
+	dh_clean -Xsetup.cfg