Merge lp:~zulcss/python-keystoneclient/0.2.3 into lp:~openstack-ubuntu-testing/python-keystoneclient/grizzly

Proposed by Chuck Short
Status: Merged
Approved by: Yolanda Robla
Approved revision: 60
Merged at revision: 60
Proposed branch: lp:~zulcss/python-keystoneclient/0.2.3
Merge into: lp:~openstack-ubuntu-testing/python-keystoneclient/grizzly
Diff against target: 67 lines (+23/-5)
3 files modified
debian/changelog (+11/-2)
debian/control (+11/-2)
debian/rules (+1/-1)
To merge this branch: bzr merge lp:~zulcss/python-keystoneclient/0.2.3
Reviewer Review Type Date Requested Status
Yolanda Robla (community) Approve
Review via email: mp+154076@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Yolanda Robla (yolanda.robla) wrote :

Looks good to me

review: Approve

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 18:16:05 +0000
3+++ debian/changelog 2013-03-19 13:16:27 +0000
4@@ -1,9 +1,18 @@
5-python-keystoneclient (1:0.2.2-0ubuntu3) UNRELEASED; urgency=low
6+python-keystoneclient (1:0.2.3-0ubuntu1) raring; urgency=low
7
8 [ Chuck Short ]
9+ * New upstream release.
10+ * debian/rules: Run tests unconditionally.
11+ * debian/control:
12+ - Bump standards to 3.9.4.
13+ - Add python-requests, python-iso8601, python-fixtures, python-coverage,
14+ python-crypto, python-keyring, python-oslo.config, python-webob,
15+ and python-testtools to build-depends.
16+
17+ [ Adam Gandelman ]
18 * debian/patches/fix-requests-requirements.patch: Dropped.
19
20- -- Adam Gandelman <adamg@ubuntu.com> Wed, 06 Mar 2013 16:18:27 -0800
21+ -- Chuck Short <zulcss@ubuntu.com> Tue, 19 Mar 2013 07:47:35 -0500
22
23 python-keystoneclient (1:0.2.2-0ubuntu2) raring; urgency=low
24
25
26=== modified file 'debian/control'
27--- debian/control 2013-03-07 18:16:05 +0000
28+++ debian/control 2013-03-19 13:16:27 +0000
29@@ -4,14 +4,23 @@
30 Maintainer: Chuck Short <zulcss@ubuntu.com>
31 Build-Depends: debhelper (>= 8.0.0),
32 python-all (>= 2.6.6-3~),
33+ python-coverage,
34+ python-crypto,
35+ python-fixtures,
36 python-httplib2,
37+ python-keyring,
38+ python-iso8601,
39+ python-oslo.config,
40 python-mock,
41 python-mox,
42 python-nose,
43 python-prettytable,
44+ python-requests,
45 python-setuptools,
46- python-simplejson
47-Standards-Version: 3.9.2
48+ python-simplejson,
49+ python-testtools,
50+ python-webob,
51+Standards-Version: 3.9.4
52
53 Package: python-keystoneclient
54 Architecture: all
55
56=== modified file 'debian/rules'
57--- debian/rules 2012-02-01 14:47:47 +0000
58+++ debian/rules 2013-03-19 13:16:27 +0000
59@@ -8,7 +8,7 @@
60
61 override_dh_auto_test:
62 ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
63- bash run_test.sh -N || true
64+ bash run_tests.sh -N -P
65 endif
66
67 get-orig-source:

Subscribers

People subscribed via source and target branches