Merge lp:~andreserl/python-cinderclient/packaging_update_new_upstream into lp:~openstack-ubuntu-testing/python-cinderclient/havana

Proposed by Andres Rodriguez on 2013-05-22
Status: Merged
Approved by: Chuck Short on 2013-05-27
Approved revision: 24
Merged at revision: 24
Proposed branch: lp:~andreserl/python-cinderclient/packaging_update_new_upstream
Merge into: lp:~openstack-ubuntu-testing/python-cinderclient/havana
Diff against target: 49 lines (+21/-0)
4 files modified
debian/changelog (+8/-0)
debian/control (+2/-0)
debian/patches/01-fix-running-test-location.patch (+10/-0)
debian/patches/series (+1/-0)
To merge this branch: bzr merge lp:~andreserl/python-cinderclient/packaging_update_new_upstream
Reviewer Review Type Date Requested Status
Adam Gandelman 2013-05-22 Needs Fixing on 2013-05-22
Review via email: mp+165216@code.launchpad.net
To post a comment you must log in.
Adam Gandelman (gandelman-a) wrote :

forgot to bzr add the patch?

review: Needs Fixing
24. By Andres Rodriguez on 2013-05-22

Add patch

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-02 14:20:54 +0000
3+++ debian/changelog 2013-05-22 18:26:23 +0000
4@@ -1,3 +1,11 @@
5+python-cinderclient (1:1.0.4.10.gbf1ce84-0ubuntu1) UNRELEASED; urgency=low
6+
7+ * New upstream release.
8+ * debian/control: Build-Depends python-pbr and python-d2to1.
9+ * debian/patches/01-fix-running-test-location.patch: Fix test location.
10+
11+ -- Andres Rodriguez <andreserl@ubuntu.com> Wed, 22 May 2013 11:28:30 -0400
12+
13 python-cinderclient (1:1.0.3-0ubuntu1) raring; urgency=low
14
15 * New upstream release.
16
17=== modified file 'debian/control'
18--- debian/control 2013-01-29 15:46:01 +0000
19+++ debian/control 2013-05-22 18:26:23 +0000
20@@ -15,6 +15,8 @@
21 python-setuptools-git (>= 0.4),
22 python-testtools,
23 python-fixtures,
24+ python-pbr,
25+ python-d2to1,
26 testrepository
27 Standards-Version: 3.9.3
28 X-Python-Version: >= 2.5
29
30=== added file 'debian/patches/01-fix-running-test-location.patch'
31--- debian/patches/01-fix-running-test-location.patch 1970-01-01 00:00:00 +0000
32+++ debian/patches/01-fix-running-test-location.patch 2013-05-22 18:26:23 +0000
33@@ -0,0 +1,10 @@
34+Index: python-cinderclient-1.0.4.10.gbf1ce84/.testr.conf
35+===================================================================
36+--- python-cinderclient-1.0.4.10.gbf1ce84.orig/.testr.conf 2013-05-22 11:25:57.000000000 -0400
37++++ python-cinderclient-1.0.4.10.gbf1ce84/.testr.conf 2013-05-22 14:01:14.197192257 -0400
38+@@ -1,4 +1,4 @@
39+ [DEFAULT]
40+-test_command=OS_STDOUT_CAPTURE=1 OS_STDERR_CAPTURE=1 ${PYTHON:-python} -m subunit.run discover -t ./ ./tests $LISTOPT $IDOPTION
41++test_command=OS_STDOUT_CAPTURE=1 OS_STDERR_CAPTURE=1 ${PYTHON:-python} -m subunit.run discover -t ./ ./cinderclient/tests $LISTOPT $IDOPTION
42+ test_id_option=--load-list $IDFILE
43+ test_list_option=--list
44
45=== added file 'debian/patches/series'
46--- debian/patches/series 1970-01-01 00:00:00 +0000
47+++ debian/patches/series 2013-05-22 18:26:23 +0000
48@@ -0,0 +1,1 @@
49+01-fix-running-test-location.patch

Subscribers

People subscribed via source and target branches