Merge lp:~gnuoy/python-cinderclient/juno-update-deps into lp:~ubuntu-server-dev/python-cinderclient/juno

Proposed by Liam Young
Status: Merged
Merged at revision: 49
Proposed branch: lp:~gnuoy/python-cinderclient/juno-update-deps
Merge into: lp:~ubuntu-server-dev/python-cinderclient/juno
Diff against target: 73 lines (+19/-15)
2 files modified
debian/changelog (+6/-2)
debian/control (+13/-13)
To merge this branch: bzr merge lp:~gnuoy/python-cinderclient/juno-update-deps
Reviewer Review Type Date Requested Status
Ubuntu Server Developers Pending
Review via email: mp+225668@code.launchpad.net
To post a comment you must log in.

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 2014-06-20 15:03:05 +0000
3+++ debian/changelog 2014-07-04 13:58:32 +0000
4@@ -1,11 +1,15 @@
5-python-cinderclient (1:1.0.8-0ubuntu3) UNRELEASED; urgency=medium
6+python-cinderclient (1:1.0.8-0ubuntu4) UNRELEASED; urgency=medium
7
8+ [ Chuck Short ]
9 * debian/rules: Run testr directly.
10 * debian/control: Add python-keystoneclientclient as a dependency.
11 * debian/control: Open up juno release
12 * debian/control: Add python-httpretty as a depdendency.
13
14- -- Chuck Short <zulcss@ubuntu.com> Tue, 22 Apr 2014 11:25:45 -0400
15+ [ Liam Young ]
16+ * debian/control: Merged in deps from requirements.txt
17+
18+ -- Liam Young <liam.young@canonical.com> Thu, 03 Jul 2014 13:12:53 +0100
19
20 python-cinderclient (1:1.0.8-0ubuntu1) trusty; urgency=medium
21
22
23=== modified file 'debian/control'
24--- debian/control 2014-06-20 15:03:05 +0000
25+++ debian/control 2014-07-04 13:58:32 +0000
26@@ -5,20 +5,20 @@
27 Build-Depends:
28 debhelper (>= 8.0.0),
29 python-all (>= 2.6),
30+ python-babel (>= 1.3),
31+ python-fixtures (>= 0.3.12),
32 python-httpretty,
33- python-babel,
34- python-fixtures (>= 0.3.12),
35- python-keystoneclient,
36+ python-keystoneclient (>= 1:0.9.0),
37 python-mock,
38- python-pbr (>= 0.5.21),
39- python-prettytable (>= 0.6),
40+ python-pbr (>= 0.6),
41+ python-prettytable (>= 0.7),
42 python-requests (>= 1.1),
43 python-setuptools,
44- python-six,
45 python-simplejson (>= 2.0.9),
46+ python-six (>= 1.7.0),
47 python-sphinx,
48 python-testtools (>= 0.9.32),
49- testrepository (>= 0.0.17),
50+ testrepository (>= 0.0.17)
51 Standards-Version: 3.9.4
52 X-Python-Version: >= 2.5
53 Vcs-Browser: http://bazaar.launchpad.net/~ubuntu-server-dev/python-cinderclient/juno/files
54@@ -28,13 +28,13 @@
55 Package: python-cinderclient
56 Architecture: all
57 Depends:
58- python-keystoneclient,
59- python-prettytable (>= 0.6),
60- python-requests (>= 1.1),
61- python-simplejson (>= 2.0.9),
62- python-babel,
63- python-six,
64+ python-babel (>= 1.3),
65+ python-keystoneclient (>= 1:0.9.0),
66 python-pkg-resources,
67+ python-prettytable (>= 0.7),
68+ python-requests (>= 1.1),
69+ python-simplejson (>= 2.0.9),
70+ python-six (>= 1.7.0),
71 ${misc:Depends},
72 ${python:Depends}
73 Description: python bindings to the OpenStack Volume API

Subscribers

People subscribed via source and target branches