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

[Andres Rodriguez]

[Adam Gandelman (gandelman-a)]

forgot to bzr add the patch?

review: Needs Fixing

[lp:~andreserl/python-cinderclient/packaging_update_new_upstream]

24. By Andres Rodriguez on 2013-05-22

Add patch

=== modified file 'debian/changelog'
--- debian/changelog	2013-04-02 14:20:54 +0000
+++ debian/changelog	2013-05-22 18:26:23 +0000
@@ -1,3 +1,11 @@
+python-cinderclient (1:1.0.4.10.gbf1ce84-0ubuntu1) UNRELEASED; urgency=low
+
+  * New upstream release.
+  * debian/control: Build-Depends python-pbr and python-d2to1.
+  * debian/patches/01-fix-running-test-location.patch: Fix test location.
+
+ -- Andres Rodriguez <[e-mail]>  Wed, 22 May 2013 11:28:30 -0400
+
 python-cinderclient (1:1.0.3-0ubuntu1) raring; urgency=low
 
   * New upstream release. 

=== modified file 'debian/control'
--- debian/control	2013-01-29 15:46:01 +0000
+++ debian/control	2013-05-22 18:26:23 +0000
@@ -15,6 +15,8 @@
  python-setuptools-git (>= 0.4),
  python-testtools,
  python-fixtures,
+ python-pbr,
+ python-d2to1,
  testrepository
 Standards-Version: 3.9.3
 X-Python-Version: >= 2.5

=== added file 'debian/patches/01-fix-running-test-location.patch'
--- debian/patches/01-fix-running-test-location.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/01-fix-running-test-location.patch	2013-05-22 18:26:23 +0000
@@ -0,0 +1,10 @@
+Index: python-cinderclient-1.0.4.10.gbf1ce84/.testr.conf
+===================================================================
+--- python-cinderclient-1.0.4.10.gbf1ce84.orig/.testr.conf	2013-05-22 11:25:57.000000000 -0400
++++ python-cinderclient-1.0.4.10.gbf1ce84/.testr.conf	2013-05-22 14:01:14.197192257 -0400
+@@ -1,4 +1,4 @@
+ [DEFAULT]
+-test_command=OS_STDOUT_CAPTURE=1 OS_STDERR_CAPTURE=1 ${PYTHON:-python} -m subunit.run discover -t ./ ./tests $LISTOPT $IDOPTION
++test_command=OS_STDOUT_CAPTURE=1 OS_STDERR_CAPTURE=1 ${PYTHON:-python} -m subunit.run discover -t ./ ./cinderclient/tests $LISTOPT $IDOPTION
+ test_id_option=--load-list $IDFILE
+ test_list_option=--list

=== added file 'debian/patches/series'
--- debian/patches/series	1970-01-01 00:00:00 +0000
+++ debian/patches/series	2013-05-22 18:26:23 +0000
@@ -0,0 +1,1 @@
+01-fix-running-test-location.patch