Merge lp:~james-page/ubuntu/oneiric/python-novaclient/825127 into lp:~openstack-ubuntu-packagers/python-novaclient/ubuntu

Proposed by James Page on 2011-08-18
Status: Merged
Merged at revision: 9
Proposed branch: lp:~james-page/ubuntu/oneiric/python-novaclient/825127
Merge into: lp:~openstack-ubuntu-packagers/python-novaclient/ubuntu
Diff against target: 49 lines (+15/-5)
3 files modified
debian/changelog (+10/-1)
debian/control (+1/-1)
debian/rules (+4/-3)
To merge this branch: bzr merge lp:~james-page/ubuntu/oneiric/python-novaclient/825127
Reviewer Review Type Date Requested Status
Chuck Short (community) 2011-08-18 Approve on 2011-08-23
Review via email: mp+72031@code.launchpad.net

Description of the change

Updates for Ubuntu MIR

To post a comment you must log in.
James Page (james-page) wrote :

Not updates to latest snapshot as fails test suite.

Chuck Short (zulcss) wrote :

lgtm

review: Approve

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 2011-08-12 09:42:28 +0000
3+++ debian/changelog 2011-08-18 12:46:23 +0000
4@@ -1,7 +1,16 @@
5-python-novaclient (2.6.1~bzr78-0ubunt1) oneiric; urgency=low
6+python-novaclient (2.6.1~bzr78-0ubuntu1) oneiric; urgency=low
7
8+ [ Chuck Short ]
9 * New upstream version.
10
11+ [ James Page ]
12+ * Updates to support Ubuntu MIR (LP: #825127):
13+ - debian/rules:
14+ - Completed dh_python2 transition.
15+ - Enabled test suite.
16+ - debian/control:
17+ - Bumped Standards-Version: 3.9.2, no changes.
18+
19 -- Chuck Short <zulcss@ubuntu.com> Fri, 12 Aug 2011 05:42:22 -0400
20
21 python-novaclient (2.6.1~bzr74-0ubuntu1) oneiric; urgency=low
22
23=== modified file 'debian/control'
24--- debian/control 2011-08-08 16:46:25 +0000
25+++ debian/control 2011-08-18 12:46:23 +0000
26@@ -11,7 +11,7 @@
27 python-mock,
28 python-httplib2
29 X-Python-Version: >= 2.5
30-Standards-Version: 3.9.1
31+Standards-Version: 3.9.2
32
33 Package: python-novaclient
34 Architecture: all
35
36=== modified file 'debian/rules' (properties changed: -x to +x)
37--- debian/rules 2011-08-08 16:46:25 +0000
38+++ debian/rules 2011-08-18 12:46:23 +0000
39@@ -1,6 +1,7 @@
40 #!/usr/bin/make -f
41
42 %:
43- dh $@
44-
45-
46+ dh $@ --with python2
47+
48+override_dh_auto_test::
49+ python setup.py test

Subscribers

People subscribed via source and target branches