Ubuntu
python-keystoneclient package

Merge lp:~gandelman-a/ubuntu/raring/python-keystoneclient/drop_oslo into lp:~openstack-ubuntu-testing/python-keystoneclient/grizzly

  1. Raring (13.04)
  2. drop_oslo
  3. Merge into grizzly
Proposed by Adam Gandelman
Status: Merged
Approved by: Chuck Short
Approved revision: 56
Merged at revision: 56
Proposed branch: lp:~gandelman-a/ubuntu/raring/python-keystoneclient/drop_oslo
Merge into: lp:~openstack-ubuntu-testing/python-keystoneclient/grizzly
Diff against target: 41 lines (+0/-7)
3 files modified
debian/changelog (+0/-4)
debian/control (+0/-2)
debian/pydist-overrides (+0/-1)
To merge this branch: bzr merge lp:~gandelman-a/ubuntu/raring/python-keystoneclient/drop_oslo
Reviewer Review Type Date Requested Status
Openstack Ubuntu Testers Pending
Review via email: mp+152250@code.launchpad.net

Description of the change

Reverts yesterday's change that added and over-rode python-oslo-config / python-oslo.config. I jumped the gun and submitted before the most recent python-oslo-config package was synced to the PPA. dh_python2 should take care of the dependency now that python-oslo-config is a transitional package to the new python-oslo.config.

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 2013-03-07 01:14:47 +0000
3+++ debian/changelog 2013-03-07 18:18:22 +0000
4@@ -3,10 +3,6 @@
5 [ Chuck Short ]
6 * debian/patches/fix-requests-requirements.patch: Dropped.
7
8- [ Adam Gandelman ]
9- * debian/control, pydist-overrides: Add python-oslo-config.
10- * wrap-and-sort.
11-
12 -- Adam Gandelman <adamg@ubuntu.com> Wed, 06 Mar 2013 16:18:27 -0800
13
14 python-keystoneclient (1:0.2.2-0ubuntu2) raring; urgency=low
15
16=== modified file 'debian/control'
17--- debian/control 2013-03-07 01:14:47 +0000
18+++ debian/control 2013-03-07 18:18:22 +0000
19@@ -8,7 +8,6 @@
20 python-mock,
21 python-mox,
22 python-nose,
23- python-oslo-config,
24 python-prettytable,
25 python-setuptools,
26 python-simplejson
27@@ -17,7 +16,6 @@
28 Package: python-keystoneclient
29 Architecture: all
30 Depends: python-iso8601,
31- python-oslo-config,
32 python-pkg-resources,
33 python-requests,
34 ${misc:Depends},
35
36=== modified file 'debian/pydist-overrides'
37--- debian/pydist-overrides 2013-03-07 01:14:47 +0000
38+++ debian/pydist-overrides 2013-03-07 18:18:22 +0000
39@@ -1,2 +1,1 @@
40 argparse
41-oslo.config python-oslo-config

Subscribers

People subscribed via source and target branches