Merge lp:~gandelman-a/ubuntu/raring/python-quantumclient/cliff_vers into lp:~openstack-ubuntu-testing/python-neutronclient/grizzly

Proposed by Adam Gandelman on 2013-03-14
Status: Merged
Merged at revision: 23
Proposed branch: lp:~gandelman-a/ubuntu/raring/python-quantumclient/cliff_vers
Merge into: lp:~openstack-ubuntu-testing/python-neutronclient/grizzly
Diff against target: 35 lines (+8/-2)
2 files modified
debian/changelog (+6/-0)
debian/control (+2/-2)
To merge this branch: bzr merge lp:~gandelman-a/ubuntu/raring/python-quantumclient/cliff_vers
Reviewer Review Type Date Requested Status
Adam Gandelman Resubmit on 2013-03-14
James Page 2013-03-14 Needs Fixing on 2013-03-14
Review via email: mp+153424@code.launchpad.net
To post a comment you must log in.
James Page (james-page) wrote :

Adam - as you are using the upstream version number there is no need to suffix with ~ - that only applies when using a package version as well.

review: Needs Fixing
24. By Adam Gandelman on 2013-03-14

d/control: drop ~ for python-cliff versioning.

Adam Gandelman (gandelman-a) wrote :

Ah! Thanks, fixed.

review: Resubmit

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'debian/changelog'
--- debian/changelog 2013-03-07 17:14:52 +0000
+++ debian/changelog 2013-03-14 21:51:20 +0000
@@ -1,3 +1,9 @@
1python-quantumclient (1:2.2.0-0ubuntu1) UNRELEASED; urgency=low
2
3 * debian/control: Set version minimum for python-cliff (>= 1.3.1~).
4
5 -- Adam Gandelman <adamg@ubuntu.com> Thu, 14 Mar 2013 10:48:41 -0700
6
1python-quantumclient (1:2.1.2-0ubuntu1) raring; urgency=low7python-quantumclient (1:2.1.2-0ubuntu1) raring; urgency=low
28
3 [ Adam Gandelman ]9 [ Adam Gandelman ]
410
=== modified file 'debian/control'
--- debian/control 2013-02-12 15:49:05 +0000
+++ debian/control 2013-03-14 21:51:20 +0000
@@ -6,7 +6,7 @@
6Build-Depends: debhelper (>= 8.0.0),6Build-Depends: debhelper (>= 8.0.0),
7 pep8,7 pep8,
8 python-all (>= 2.6.6-3~),8 python-all (>= 2.6.6-3~),
9 python-cliff,9 python-cliff (>= 1.3.1),
10 python-fixtures,10 python-fixtures,
11 python-httplib2,11 python-httplib2,
12 python-mox,12 python-mox,
@@ -24,7 +24,7 @@
24Package: python-quantumclient24Package: python-quantumclient
25Architecture: all25Architecture: all
26Replaces: quantum-client26Replaces: quantum-client
27Depends: python-cliff,27Depends: python-cliff (>= 1.3.1),
28 python-httplib2,28 python-httplib2,
29 python-prettytable,29 python-prettytable,
30 python-pyparsing,30 python-pyparsing,

Subscribers

People subscribed via source and target branches