Merge lp:~zulcss/python-keystoneclient/pbr-fixes into lp:~openstack-ubuntu-testing/python-keystoneclient/havana

Proposed by Chuck Short
Status: Merged
Merged at revision: 65
Proposed branch: lp:~zulcss/python-keystoneclient/pbr-fixes
Merge into: lp:~openstack-ubuntu-testing/python-keystoneclient/havana
Diff against target: 41 lines (+6/-2)
2 files modified
debian/changelog (+3/-1)
debian/control (+3/-1)
To merge this branch: bzr merge lp:~zulcss/python-keystoneclient/pbr-fixes
Reviewer Review Type Date Requested Status
Yolanda Robla (community) Needs Fixing
Review via email: mp+166031@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Yolanda Robla (yolanda.robla) wrote :

typo in debian/cntrol

review: Needs Fixing

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-04-30 12:56:53 +0000
3+++ debian/changelog 2013-05-28 12:10:39 +0000
4@@ -1,6 +1,8 @@
5-python-keystoneclient (1:0.2.3.11.g22228f5-0ubuntu1) UNRELEASED; urgency=low
6+python-keystoneclient (1:0.2.3.41.gef6530d-0ubuntu1) UNRELEASED; urgency=low
7
8 * New upstream release.
9+ * debian/control: Add python-d2to1 and python-pbr
10+ * debian/cntrol: Add testrepository, dropped python-nose
11
12 -- Chuck Short <zulcss@ubuntu.com> Tue, 30 Apr 2013 07:45:10 -0500
13
14
15=== modified file 'debian/control'
16--- debian/control 2013-04-20 03:35:09 +0000
17+++ debian/control 2013-05-28 12:10:39 +0000
18@@ -6,6 +6,8 @@
19 python-all (>= 2.6.6-3~),
20 python-coverage,
21 python-crypto,
22+ python-d2to1,
23+ python-pbr,
24 python-fixtures,
25 python-httplib2,
26 python-keyring,
27@@ -13,13 +15,13 @@
28 python-oslo.config,
29 python-mock,
30 python-mox,
31- python-nose,
32 python-prettytable,
33 python-requests (>= 1.1.0),
34 python-setuptools,
35 python-simplejson,
36 python-testtools,
37 python-webob,
38+ testrepository
39 Standards-Version: 3.9.4
40
41 Package: python-keystoneclient

Subscribers

People subscribed via source and target branches