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

Proposed by Chuck Short on 2013-05-17
Status: Merged
Approved by: Adam Gandelman on 2013-05-17
Approved revision: 101
Merged at revision: 101
Proposed branch: lp:~zulcss/cinder/cinder-ftbfs-pbr
Merge into: lp:~openstack-ubuntu-testing/cinder/havana
Diff against target: 92 lines (+12/-18)
6 files modified
debian/changelog (+5/-2)
debian/cinder-common.install (+1/-0)
debian/control (+2/-0)
debian/patches/fix_cinder_dependencies.patch (+0/-11)
debian/patches/series (+0/-1)
debian/rules (+4/-4)
To merge this branch: bzr merge lp:~zulcss/cinder/cinder-ftbfs-pbr
Reviewer Review Type Date Requested Status
Adam Gandelman 2013-05-17 Pending
Review via email: mp+164468@code.launchpad.net

This proposal supersedes a proposal from 2013-05-17.

To post a comment you must log in.
Adam Gandelman (gandelman-a) wrote : Posted in a previous version of this proposal

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

review: Disapprove

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2013-05-03 08:19:56 +0000
3+++ debian/changelog 2013-05-17 17:20:30 +0000
4@@ -1,9 +1,12 @@
5-cinder (1:2013.2.a163.ga4ba17b-0ubuntu1) UNRELEASED; urgency=low
6+cinder (1:2013.2.a226.g1d6de0f-0ubuntu1) UNRELEASED; urgency=low
7
8 [ Chuck Short ]
9 * New upstream version.
10- * debian/patches/fix_cinder_dependencies.patch: Refreshed.
11+ * debian/patches/fix_cinder_dependencies.patch: Dropped.
12 * debian/control: Bump standards version to 3.9.4.
13+ * debian/control: Add python-pbr and python-d2to1 to build-depends.
14+ * debian/rules: Add work around to remove wonky setup.py setup
15+ * debian/cinder-common.install: Add cinder-rpc-zmq-receiver binary.
16
17 [ James Page ]
18 * debian/control: Drop surplus dependency on python-glance (LP: #1175600).
19
20=== modified file 'debian/cinder-common.install'
21--- debian/cinder-common.install 2013-02-20 10:31:01 +0000
22+++ debian/cinder-common.install 2013-05-17 17:20:30 +0000
23@@ -6,3 +6,4 @@
24 etc/cinder/rootwrap.conf etc/cinder
25 usr/bin/cinder-manage
26 usr/bin/cinder-rootwrap
27+usr/bin/cinder-rpc-zmq-receiver
28
29=== modified file 'debian/control'
30--- debian/control 2013-05-03 08:19:56 +0000
31+++ debian/control 2013-05-17 17:20:30 +0000
32@@ -7,6 +7,7 @@
33 python-amqplib,
34 python-anyjson,
35 python-coverage,
36+ python-d2to1,
37 python-eventlet,
38 python-glanceclient,
39 python-greenlet,
40@@ -25,6 +26,7 @@
41 python-paramiko,
42 python-paste,
43 python-pastedeploy,
44+ python-pbr,
45 python-routes,
46 python-swiftclient,
47 python-setuptools,
48
49=== removed file 'debian/patches/fix_cinder_dependencies.patch'
50--- debian/patches/fix_cinder_dependencies.patch 2013-04-30 13:11:39 +0000
51+++ debian/patches/fix_cinder_dependencies.patch 1970-01-01 00:00:00 +0000
52@@ -1,11 +0,0 @@
53-diff -Naurp cinder-2013.2.a163.ga4ba17b.orig/tools/pip-requires cinder-2013.2.a163.ga4ba17b/tools/pip-requires
54---- cinder-2013.2.a163.ga4ba17b.orig/tools/pip-requires 2013-04-30 08:04:01.000000000 -0500
55-+++ cinder-2013.2.a163.ga4ba17b/tools/pip-requires 2013-04-30 08:07:44.181680954 -0500
56-@@ -17,7 +17,6 @@ python-glanceclient>=0.5.0,<2
57- python-keystoneclient>=0.2,<0.3
58- python-swiftclient>=1.2,<2
59- routes>=1.12.3
60--setuptools_git>=0.4
61- sqlalchemy>=0.7,<=0.7.99
62- sqlalchemy-migrate>=0.7
63- stevedore>=0.7
64
65=== removed file 'debian/patches/series'
66--- debian/patches/series 2013-02-25 17:37:22 +0000
67+++ debian/patches/series 1970-01-01 00:00:00 +0000
68@@ -1,1 +0,0 @@
69-fix_cinder_dependencies.patch
70
71=== modified file 'debian/rules'
72--- debian/rules 2013-05-03 16:31:16 +0000
73+++ debian/rules 2013-05-17 17:20:30 +0000
74@@ -3,10 +3,6 @@
75 # Uncomment this to turn on verbose mode.
76 #export DH_VERBOSE=1
77
78-DEBVERS ?= $(shell dpkg-parsechangelog | sed -n -e 's/^Version: //p')
79-VERSION ?= $(shell echo '$(DEBVERS)' | sed -e 's/^[[:digit:]]*://' -e 's/[-].*//')
80-export OSLO_PACKAGE_VERSION=$(VERSION)
81-
82 %:
83 dh $@ --with python2
84
85@@ -23,3 +19,7 @@
86
87 override_dh_fixperms:
88 dh_fixperms -Xcinder_tgt.conf
89+
90+override_dh_clean:
91+ # temporary workaround for d2to1 wonkyness
92+ dh_clean -Xsetup.cfg

Subscribers

People subscribed via source and target branches