python-swiftclient

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

  1. juno-update-deps
  2. Merge into juno
Proposed by Liam Young
Status: Merged
Merged at revision: 42
Proposed branch: lp:~gnuoy/python-swiftclient/juno-update-deps
Merge into: lp:~ubuntu-server-dev/python-swiftclient/juno
Diff against target: 59 lines (+17/-5)
2 files modified
debian/changelog (+6/-0)
debian/control (+11/-5)
To merge this branch: bzr merge lp:~gnuoy/python-swiftclient/juno-update-deps
Reviewer Review Type Date Requested Status
Ubuntu Server Developers Pending
Review via email: mp+225676@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-03 14:15:42 +0000
3+++ debian/changelog 2014-07-04 14:10:56 +0000
4@@ -1,3 +1,9 @@
5+python-swiftclient (1:2.1.0-0ubuntu2) utopic; urgency=medium
6+
7+ * debian/control: Merged in deps from requirements.txt
8+
9+ -- Liam Young <liam.young@canonical.com> Thu, 03 Jul 2014 10:17:33 +0100
10+
11 python-swiftclient (1:2.1.0-0ubuntu1) utopic; urgency=medium
12
13 * New upstream release.
14
15=== modified file 'debian/control'
16--- debian/control 2014-06-03 14:15:42 +0000
17+++ debian/control 2014-07-04 14:10:56 +0000
18@@ -3,19 +3,21 @@
19 Priority: extra
20 Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
21 XSBC-Original-Maintainer: Adam Gandelman <adamg@canonical.com>
22-Build-Depends: debhelper (>= 8.0.0),
23+Build-Depends:
24+ debhelper (>= 8.0.0),
25 python-all (>= 2.6.6-3~),
26 python-coverage,
27 python-fixtures,
28 python-httplib2,
29 python-keystoneclient,
30 python-mock,
31- python-six,
32 python-pbr,
33+ python-requests (>= 1.1),
34 python-setuptools,
35- python-simplejson,
36+ python-simplejson (>= 2.0.9),
37+ python-six (>= 1.5.2),
38+ python-subunit,
39 python-testtools,
40- python-subunit,
41 testrepository
42 Standards-Version: 3.9.4
43 X-Python-Version: >= 2.7
44@@ -25,10 +27,14 @@
45
46 Package: python-swiftclient
47 Architecture: all
48-Depends: python-eventlet,
49+Depends:
50+ python-eventlet,
51 python-httplib2,
52 python-keystoneclient,
53+ python-requests (>= 1.1),
54 python-setuptools,
55+ python-simplejson (>= 2.0.9),
56+ python-six (>= 1.5.2),
57 ${misc:Depends},
58 ${python:Depends}
59 Breaks: swift ( << 1.7.4-0ubuntu2)

Subscribers

People subscribed via source and target branches