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
1=== modified file 'debian/changelog'
2--- debian/changelog 2013-03-07 17:14:52 +0000
3+++ debian/changelog 2013-03-14 21:51:20 +0000
4@@ -1,3 +1,9 @@
5+python-quantumclient (1:2.2.0-0ubuntu1) UNRELEASED; urgency=low
6+
7+ * debian/control: Set version minimum for python-cliff (>= 1.3.1~).
8+
9+ -- Adam Gandelman <adamg@ubuntu.com> Thu, 14 Mar 2013 10:48:41 -0700
10+
11 python-quantumclient (1:2.1.2-0ubuntu1) raring; urgency=low
12
13 [ Adam Gandelman ]
14
15=== modified file 'debian/control'
16--- debian/control 2013-02-12 15:49:05 +0000
17+++ debian/control 2013-03-14 21:51:20 +0000
18@@ -6,7 +6,7 @@
19 Build-Depends: debhelper (>= 8.0.0),
20 pep8,
21 python-all (>= 2.6.6-3~),
22- python-cliff,
23+ python-cliff (>= 1.3.1),
24 python-fixtures,
25 python-httplib2,
26 python-mox,
27@@ -24,7 +24,7 @@
28 Package: python-quantumclient
29 Architecture: all
30 Replaces: quantum-client
31-Depends: python-cliff,
32+Depends: python-cliff (>= 1.3.1),
33 python-httplib2,
34 python-prettytable,
35 python-pyparsing,

Subscribers

People subscribed via source and target branches