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

Proposed by Liam Young
Status: Merged
Merged at revision: 17
Proposed branch: lp:~gnuoy/python-heatclient/juno-update-deps
Merge into: lp:~ubuntu-server-dev/python-heatclient/juno
Diff against target: 65 lines (+17/-8)
2 files modified
debian/changelog (+6/-2)
debian/control (+11/-6)
To merge this branch: bzr merge lp:~gnuoy/python-heatclient/juno-update-deps
Reviewer Review Type Date Requested Status
Ubuntu Server Developers Pending
Review via email: mp+225672@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
=== modified file 'debian/changelog'
--- debian/changelog 2014-06-23 13:41:44 +0000
+++ debian/changelog 2014-07-04 14:05:53 +0000
@@ -1,8 +1,12 @@
1python-heatclient (0.2.9-0ubuntu2) UNRELEASED; urgency=medium1python-heatclient (0.2.9-0ubuntu3) UNRELEASED; urgency=medium
22
3 [ Chuck Short ]
3 * debian/patches/skip-ubuntu-tests.patch: Skip failing test.4 * debian/patches/skip-ubuntu-tests.patch: Skip failing test.
45
5 -- Chuck Short <zulcss@ubuntu.com> Mon, 23 Jun 2014 09:41:25 -04006 [ Liam Young ]
7 * debian/control: Merged in deps from requirements.txt
8
9 -- Liam Young <liam.young@canonical.com> Thu, 03 Jul 2014 14:20:25 +0100
610
7python-heatclient (0.2.9-0ubuntu1) utopic; urgency=medium11python-heatclient (0.2.9-0ubuntu1) utopic; urgency=medium
812
913
=== modified file 'debian/control'
--- debian/control 2014-04-22 15:26:24 +0000
+++ debian/control 2014-07-04 14:05:53 +0000
@@ -15,19 +15,21 @@
15 python-coverage,15 python-coverage,
16 python-fixtures,16 python-fixtures,
17 python-httplib2,17 python-httplib2,
18 python-iso8601,18 python-iso8601 (>= 0.1.9),
19 python-keystoneclient (>= 1:0.2),19 python-keystoneclient (>= 1:0.9.0),
20 python-mock,20 python-mock,
21 python-mox,21 python-mox,
22 python-mox3,22 python-mox3,
23 python-pbr,23 python-pbr (>= 0.6),
24 python-prettytable (<< 0.8),24 python-prettytable (<< 0.8),
25 python-prettytable (>= 0.5),25 python-prettytable (>= 0.5),
26 python-requests (>= 1.1),
26 python-setuptools (>= 0.6.24),27 python-setuptools (>= 0.6.24),
27 python-setuptools-git,28 python-setuptools-git,
29 python-six (>= 1.7.0),
28 python-testscenarios,30 python-testscenarios,
29 python-testtools,31 python-testtools,
30 python-yaml,32 python-yaml (>= 3.1.0),
31 testrepository33 testrepository
32Standards-Version: 3.9.434Standards-Version: 3.9.4
33Vcs-Browser: http://bazaar.launchpad.net/~ubuntu-server-dev/python-heatclient/juno/files35Vcs-Browser: http://bazaar.launchpad.net/~ubuntu-server-dev/python-heatclient/juno/files
@@ -39,11 +41,14 @@
39Depends:41Depends:
40 python (>= 2.7),42 python (>= 2.7),
41 python-httplib2,43 python-httplib2,
42 python-iso8601,44 python-iso8601 (>= 0.1.9),
43 python-keystoneclient (>= 1:0.2),45 python-keystoneclient (>= 1:0.9.0),
44 python-pkg-resources,46 python-pkg-resources,
45 python-prettytable (<< 0.8),47 python-prettytable (<< 0.8),
46 python-prettytable (>= 0.5),48 python-prettytable (>= 0.5),
49 python-requests (>= 1.1),
50 python-six (>= 1.7.0),
51 python-yaml (>= 3.1.0),
47 ${misc:Depends},52 ${misc:Depends},
48 ${python:Depends},53 ${python:Depends},
49 ${wheezy-added-deps}54 ${wheezy-added-deps}

Subscribers

People subscribed via source and target branches