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

[Chuck Short]

[James Page (james-page)]

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2013-01-18 13:44:57 +0000
+++ debian/changelog	2013-02-05 16:01:21 +0000
@@ -1,3 +1,10 @@
+python-keystoneclient (1:0.2.2-0ubuntu2) UNRELEASED; urgency=low
+
+  * debian/patches/fix-requests-requirements.patch: Bump python-requests
+    to 1.1.
+
+ -- Chuck Short <[e-mail]>  Tue, 05 Feb 2013 09:59:17 -0600
+
 python-keystoneclient (1:0.2.2-0ubuntu1) raring; urgency=low
 
   * New upstream release.

=== added file 'debian/patches/fix-requests-requirements.patch'
--- debian/patches/fix-requests-requirements.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/fix-requests-requirements.patch	2013-02-05 16:01:21 +0000
@@ -0,0 +1,10 @@
+diff -Naurp python-keystoneclient.orig/tools/pip-requires python-keystoneclient/tools/pip-requires
+--- python-keystoneclient.orig/tools/pip-requires	2013-02-05 09:58:02.814039981 -0600
++++ python-keystoneclient/tools/pip-requires	2013-02-05 09:58:19.802040386 -0600
+@@ -1,5 +1,5 @@
+ argparse
+ iso8601>=0.1.4
+ prettytable
+-requests>=0.8.8,<1.0
++requests>=0.8.8,<=1.1
+ simplejson

=== added file 'debian/patches/series'
--- debian/patches/series	1970-01-01 00:00:00 +0000
+++ debian/patches/series	2013-02-05 16:01:21 +0000
@@ -0,0 +1,1 @@
+fix-requests-requirements.patch