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

Proposed by Chuck Short
Status: Merged
Approved by: Adam Gandelman
Approved revision: 575
Merged at revision: 575
Proposed branch: lp:~zulcss/nova/havana-pbr
Merge into: lp:~openstack-ubuntu-testing/nova/havana
Diff against target: 62 lines (+11/-13)
4 files modified
debian/changelog (+9/-0)
debian/control (+2/-0)
debian/patches/avoid_setuptools_git_dependency.patch (+0/-12)
debian/patches/series (+0/-1)
To merge this branch: bzr merge lp:~zulcss/nova/havana-pbr
Reviewer Review Type Date Requested Status
Openstack Ubuntu Testers Pending
Review via email: mp+163578@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Adam Gandelman (gandelman-a) wrote :

Approved but note that both new deps need MIRs before this will build in distro.

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-04-24 18:43:36 +0000
3+++ debian/changelog 2013-05-13 17:09:26 +0000
4@@ -1,3 +1,12 @@
5+nova (1:2013.2.a613.gda1d739-0ubuntu1) UNRELEASED; urgency=low
6+
7+ * New upstream version.
8+ * debian/patches/avoid_setuptools_git_dependency.patch: Dropped
9+ no longer needed.
10+ * debian/control: Add python-pbr and python-d2to1 as build dependencies.
11+
12+ -- Chuck Short <zulcss@ubuntu.com> Mon, 13 May 2013 11:37:26 -0500
13+
14 nova (1:2013.1-0ubuntu2) raring; urgency=low
15
16 * debian/nova-cells.upstart: Fix typo in upstart job. (LP: #1163218)
17
18=== modified file 'debian/control'
19--- debian/control 2013-04-11 12:54:27 +0000
20+++ debian/control 2013-05-13 17:09:26 +0000
21@@ -16,6 +16,7 @@
22 python-cinderclient,
23 python-coverage,
24 python-crypto,
25+ python-d2to1,
26 python-distutils-extra,
27 python-eventlet,
28 python-fixtures (>= 0.3.12),
29@@ -32,6 +33,7 @@
30 python-paramiko,
31 python-paste,
32 python-pastedeploy (>= 1.5.0),
33+ python-pbr,
34 python-pyasn1,
35 python-quantumclient,
36 python-routes,
37
38=== removed file 'debian/patches/avoid_setuptools_git_dependency.patch'
39--- debian/patches/avoid_setuptools_git_dependency.patch 2013-03-14 00:48:45 +0000
40+++ debian/patches/avoid_setuptools_git_dependency.patch 1970-01-01 00:00:00 +0000
41@@ -1,12 +0,0 @@
42-Index: nova/tools/pip-requires
43-===================================================================
44---- nova.orig/tools/pip-requires 2013-03-13 17:47:30.180806431 -0700
45-+++ nova/tools/pip-requires 2013-03-13 17:47:45.816807224 -0700
46-@@ -20,7 +20,6 @@
47- Babel>=0.9.6
48- iso8601>=0.1.4
49- httplib2
50--setuptools_git>=0.4
51- python-cinderclient>=1.0.1
52- python-quantumclient>=2.2.0,<3.0.0
53- python-glanceclient>=0.5.0,<2
54
55=== modified file 'debian/patches/series'
56--- debian/patches/series 2012-12-11 10:27:32 +0000
57+++ debian/patches/series 2013-05-13 17:09:26 +0000
58@@ -2,4 +2,3 @@
59 path-to-the-xenhost.conf-fixup.patch
60 fix-ubuntu-tests.patch
61 fix-docs-build-without-network.patch
62-avoid_setuptools_git_dependency.patch

Subscribers

People subscribed via source and target branches