Merge lp:~zulcss/keystone/keystone-cleanup into lp:~openstack-ubuntu-testing/keystone/grizzly

Proposed by Chuck Short
Status: Merged
Approved by: Adam Gandelman
Approved revision: 180
Merged at revision: 180
Proposed branch: lp:~zulcss/keystone/keystone-cleanup
Merge into: lp:~openstack-ubuntu-testing/keystone/grizzly
Diff against target: 84 lines (+17/-11)
2 files modified
debian/changelog (+14/-1)
debian/control (+3/-10)
To merge this branch: bzr merge lp:~zulcss/keystone/keystone-cleanup
Reviewer Review Type Date Requested Status
Openstack Ubuntu Testers Pending
Review via email: mp+152212@code.launchpad.net

Description of the change

keysone dependency cleanup

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-01 14:14:56 +0000
3+++ debian/changelog 2013-03-07 16:19:21 +0000
4@@ -1,8 +1,21 @@
5-keystone (2013.1.g3-0ubuntu2) UNRELEASED; urgency=low
6+keystone (1:2013.1.a231.g0496907-0ubuntu1) UNRELEASED; urgency=low
7
8+ [ James Page ]
9 * d/watch: Update uversionmangle to deal with upstream versioning
10 changes, remove tarballs.openstack.org.
11
12+ [ Chuck Short ]
13+ * debian/control: Clean-up build-depends
14+ - Dropped pylint not needed.
15+ - Dropped python-all-dev and python-support not needed.
16+ - Renamed python-oslo-config to python-oslo.config.
17+ - Dropped python-prettytable no longer needed.
18+ - Dropped pyhthon-novaclient no longer needed.
19+ - Dropped pep8 no longer needed.
20+ * debian/control:Clean-up depends:
21+ - Dropped python-prettytable no longer needed.
22+ * Update standards
23+
24 -- James Page <james.page@ubuntu.com> Fri, 01 Mar 2013 14:11:04 +0000
25
26 keystone (2013.1.g3-0ubuntu1) raring; urgency=low
27
28=== modified file 'debian/control'
29--- debian/control 2013-02-22 13:58:37 +0000
30+++ debian/control 2013-03-07 16:19:21 +0000
31@@ -5,11 +5,8 @@
32 XSBC-Original-Maintainer: Monty Taylor <mordred@inaugust.com>
33 Uploaders: Soren Hansen <soren@ubuntu.com>
34 Build-Depends: debhelper (>= 7.0.50),
35- pep8,
36 po-debconf,
37- pylint,
38 python-all (>= 2.6),
39- python-all-dev (>= 2.6.6-3~) | python-support,
40 python-eventlet,
41 python-keystoneclient ( >= 1:0.2 ),
42 python-ldap,
43@@ -18,12 +15,11 @@
44 python-migrate,
45 python-mox,
46 python-nose,
47- python-oslo-config,
48+ python-oslo.config,
49 python-pam,
50 python-passlib,
51 python-paste,
52 python-pastedeploy,
53- python-prettytable,
54 python-routes,
55 python-sphinx,
56 python-sqlalchemy,
57@@ -31,8 +27,7 @@
58 python-unittest2,
59 python-webob,
60 python-webtest,
61- python-iso8601,
62- python-novaclient
63+ python-iso8601
64 Standards-Version: 3.9.3
65 XS-Python-Version: >= 2.6
66 Homepage: http://launchpad.net/keystone
67@@ -46,16 +41,14 @@
68 python-greenlet,
69 python-lxml,
70 python-migrate,
71- python-oslo-config,
72+ python-oslo.config,
73 python-pam,
74 python-passlib,
75 python-paste,
76 python-pastedeploy,
77- python-prettytable,
78 python-routes,
79 python-sqlalchemy,
80 python-migrate,
81- python-prettytable,
82 python-keystoneclient ( >= 1:0.2 ),
83 python-webob,
84 python-iso8601

Subscribers

People subscribed via source and target branches