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

[Chuck Short]

[Adam Gandelman (gandelman-a)]

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

review: Disapprove

Unmerged revisions

101. By Chuck Short on 2013-05-17

* debian/patches/fix_cinder_dependencies.patch: Dropped.
* 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.

100. By James Page on 2013-05-03

* debian/control: Drop surplus dependency on python-glance (LP: #1175600).
* debian/control,rules: Drop dependency on pep8, don't run pep8 tests during
  package build process (its just way to late).
* debian/control: Drop surplus BD on python-cheetah.

99. By Chuck Short on 2013-04-30

* New upstream version.
* debian/patches/fix_cinder_dependencies.patch: Refreshed.
* debian/control: Bump standards version to 3.9.4.

=== modified file 'debian/changelog'
--- debian/changelog	2013-05-14 16:05:08 +0000
+++ debian/changelog	2013-05-17 17:09:25 +0000
@@ -1,3 +1,4 @@
+<<<<<<< TREE
 cinder (1:2013.1.1-0ubuntu1) raring-proposed; urgency=low
 
   * Resynchronize with stable/grizzly (a4856c4e) (LP: #1179626):
@@ -25,6 +26,26 @@
 
  -- Adam Gandelman <[e-mail]>  Tue, 14 May 2013 07:49:04 -0700
 
+=======
+cinder (1:2013.2.a226.g1d6de0f-0ubuntu1) UNRELEASED; urgency=low
+
+  [ Chuck Short ]
+  * New upstream version.
+  * 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).
+  * debian/control,rules: Drop dependency on pep8, don't run pep8 tests during
+    package build process (its just way to late).
+  * debian/control: Drop surplus BD on python-cheetah.
+
+ -- Chuck Short <[e-mail]>  Tue, 30 Apr 2013 08:09:08 -0500
+
+>>>>>>> MERGE-SOURCE
 cinder (1:2013.1-0ubuntu2) raring; urgency=low
 
   * debian/control: Bump minimum stevedore version 0.8.

=== 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:09:25 +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-04-16 21:32:22 +0000
+++ debian/control	2013-05-17 17:09:25 +0000
@@ -4,11 +4,10 @@
 Maintainer: Chuck Short <[e-mail]>
 Build-Depends: debhelper (>= 8.0.0), python-all (>= 2.6)
 Build-Depends-Indep:
- pep8,
  python-amqplib,
  python-anyjson,
- python-cheetah,
  python-coverage,
+ python-d2to1,
  python-eventlet,
  python-glanceclient,
  python-greenlet,
@@ -27,6 +26,7 @@
  python-paramiko,
  python-paste,
  python-pastedeploy,
+ python-pbr,
  python-routes,
  python-swiftclient,
  python-setuptools,
@@ -36,7 +36,7 @@
  python-stevedore (>= 0.8),
  python-suds,
  python-webob
-Standards-Version: 3.9.3
+Standards-Version: 3.9.4
 Homepage: http://launchpad.net/cinder
 
 Package: python-cinder
@@ -46,7 +46,6 @@
  python-amqplib,
  python-anyjson,
  python-eventlet,
- python-glance,
  python-glanceclient,
  python-keystoneclient,
  python-oslo.config,

=== removed file 'debian/patches/fix_cinder_dependencies.patch'
--- debian/patches/fix_cinder_dependencies.patch	2013-02-22 16:40:10 +0000
+++ debian/patches/fix_cinder_dependencies.patch	1970-01-01 00:00:00 +0000
@@ -1,11 +0,0 @@
-diff -Naurp cinder-2013.1.g3.orig/tools/pip-requires cinder-2013.1.g3/tools/pip-requires
---- cinder-2013.1.g3.orig/tools/pip-requires	2013-02-21 16:08:48.000000000 -0600
-+++ cinder-2013.1.g3/tools/pip-requires	2013-02-22 10:38:34.786411293 -0600
-@@ -18,7 +18,6 @@ suds>=0.4
- paramiko
- Babel>=0.9.6
- iso8601>=0.1.4
--setuptools_git>=0.4
- python-glanceclient>=0.5.0,<2
- python-keystoneclient>=0.2.0
- python-swiftclient

=== 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-03-25 13:31:36 +0000
+++ debian/rules	2013-05-17 17:09:25 +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
 
@@ -15,7 +11,7 @@
 
 ifeq (,$(findstring nocheck, $(DEB_BUILD_OPTIONS)))
 override_dh_auto_test:
-	PYTHONPATH=$(CURDIR) bash run_tests.sh -N -v
+	PYTHONPATH=$(CURDIR) bash run_tests.sh -N -P
 endif
 
 override_dh_install:
@@ -23,3 +19,7 @@
 
 override_dh_fixperms:
 	dh_fixperms -Xcinder_tgt.conf
+
+override_dh_clean:
+	# temporary workaround for d2to1 wonkyness
+	dh_clean -Xsetup.cfg