Merge lp:~james-page/python-cinderclient/re-enable-trunk into lp:~ubuntu-server-dev/python-cinderclient/havana

[James Page]

Re-enabled required fixes for trunk.

=== modified file 'debian/changelog'
--- debian/changelog	2013-07-18 13:45:03 +0000
+++ debian/changelog	2013-07-18 13:53:28 +0000
@@ -1,3 +1,13 @@
+python-cinderclient (1:1.0.4.20.g9357c1-0ubuntu1) UNRELEASED; urgency=low
+
+  [ Andres Rodriguez ]
+  * debian/control: Build-Depends python-pbr and python-d2to1.
+
+  [ Chuck Short ]
+  * debian/patches/fix-requirements.patch: Fix requests dependency.
+
+ -- Yolanda Robla <[e-mail]>  Mon, 10 Jun 2013 13:36:00 +0200
+
 python-cinderclient (1:1.0.4-0ubuntu1) saucy; urgency=low
 
   [ Yolanda Robla ]
 
=== modified file 'debian/control'
--- debian/control	2013-07-18 13:36:56 +0000
+++ debian/control	2013-07-18 13:53:28 +0000
@@ -5,9 +5,11 @@
 Build-Depends:
  debhelper (>= 8.0.0),
  python-all (>= 2.6),
+ python-d2to1,
  python-fixtures,
  python-httplib2,
  python-mock,
+ python-pbr,
  python-prettytable,
  python-requests,
  python-setuptools,
 
=== added directory 'debian/patches'
=== added file 'debian/patches/fix-requirements.patch'
--- debian/patches/fix-requirements.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/fix-requirements.patch	2013-07-18 13:53:28 +0000
@@ -0,0 +1,14 @@
+Description: Remove uperbound limit for requests.
+Author: Chuck Short <[e-mail]>
+Forwarded: No
+diff -Naurp python-cinderclient-1.0.4.66.g509a54b.orig/requirements.txt python-cinderclient-1.0.4.66.g509a54b/requirements.txt
+--- python-cinderclient-1.0.4.66.g509a54b.orig/requirements.txt	2013-07-17 08:21:14.000000000 -0400
++++ python-cinderclient-1.0.4.66.g509a54b/requirements.txt	2013-07-17 09:04:26.781486565 -0400
+@@ -2,6 +2,6 @@ d2to1>=0.2.10,<0.3
+ pbr>=0.5.16,<0.6
+ argparse
+ prettytable>=0.6,<0.8
+-requests>=1.1,<1.2.3
++requests>=1.1
+ simplejson>=2.0.9
+ six
 
=== added file 'debian/patches/series'
--- debian/patches/series	1970-01-01 00:00:00 +0000
+++ debian/patches/series	2013-07-18 13:53:28 +0000
@@ -0,0 +1,1 @@
+fix-requirements.patch