Merge lp:~gandelman-a/ubuntu/saucy/cinder/paramiko_vers into lp:~openstack-ubuntu-testing/cinder/havana

[Adam Gandelman]

Avoid the hard version requirement on paramiko. Our package is patched to fix the bug that caused upstream to require 0.8. I'm currently working on getting new upstream release into Debian, so we can drop this when that comes.

(This supercedes a merge I mistakenly targeted at the grizzly branch)

=== modified file 'debian/changelog'
--- debian/changelog	2013-05-17 17:05:27 +0000
+++ debian/changelog	2013-05-24 02:34:26 +0000
@@ -1,4 +1,4 @@
-cinder (1:2013.2.a226.g1d6de0f-0ubuntu1) UNRELEASED; urgency=low
+cinder (1:2013.2.a226.g1d6de0f-0ubuntu2) UNRELEASED; urgency=low
 
   [ Chuck Short ]
   * New upstream version.
@@ -14,7 +14,11 @@
     package build process (its just way to late).
   * debian/control: Drop surplus BD on python-cheetah.
 
- -- Chuck Short <[e-mail]>  Tue, 30 Apr 2013 08:09:08 -0500
+  [ Adam Gandelman ]
+  * debian/patches/avoid_paramiko_vers_depends.patch: Avoid version
+    requirement on paramiko.
+
+ -- Adam Gandelman <[e-mail]>  Thu, 23 May 2013 19:12:56 -0700
 
 cinder (1:2013.1-0ubuntu2) raring; urgency=low
 
 
=== added file 'debian/patches/avoid_paramiko_vers_depends.patch'
--- debian/patches/avoid_paramiko_vers_depends.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/avoid_paramiko_vers_depends.patch	2013-05-24 02:34:26 +0000
@@ -0,0 +1,21 @@
+From: Adam Gandelman <[e-mail]>
+Date: Thu May 23 19:12:03 PDT 2013
+Remove version requirements of paramiko dependency until new upstream paramiko
+version is packaged.  Current version in Saucy (1.7.7.1-3.1ubuntu1) has a
+cherry-picked patch to avoid the bug that prompted the version requirement
+here.
+
+
+Index: cinder/tools/pip-requires
+===================================================================
+--- cinder.orig/tools/pip-requires	2013-05-23 19:09:24.115223372 -0700
++++ cinder/tools/pip-requires	2013-05-23 19:10:22.699221220 -0700
+@@ -11,7 +11,7 @@
+ lockfile>=0.8
+ lxml>=2.3
+ oslo.config>=1.1.0
+-paramiko>=1.8.0
++paramiko
+ paste
+ pastedeploy>=1.5.0
+ python-glanceclient>=0.5.0,<2
 
=== added file 'debian/patches/series'
--- debian/patches/series	1970-01-01 00:00:00 +0000
+++ debian/patches/series	2013-05-24 02:34:26 +0000
@@ -0,0 +1,1 @@
+avoid_paramiko_vers_depends.patch