Merge lp:~zulcss/cinder/grizzly-ftbfs into lp:~openstack-ubuntu-testing/cinder/grizzly

[Chuck Short]

Fixes FTBFS and newer snapshot.

[James Page (james-page)]

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2012-11-23 14:44:23 +0000
+++ debian/changelog	2012-11-29 16:53:21 +0000
@@ -1,3 +1,11 @@
+cinder (2013.1~g2~20121128.437-0ubuntu1) UNRELEASED; urgency=low
+
+  * New upstream release. 
+  * debian/patches/avoid_setuptools_git_dependency.patch: Rediff
+    due to upstream changes.
+
+ -- Chuck Short <[e-mail]>  Thu, 29 Nov 2012 10:39:40 -0600
+
 cinder (2013.1~g1-0ubuntu1) raring; urgency=low
 
   * New upstream release.

=== modified file 'debian/patches/avoid_setuptools_git_dependency.patch'
--- debian/patches/avoid_setuptools_git_dependency.patch	2012-11-22 14:35:52 +0000
+++ debian/patches/avoid_setuptools_git_dependency.patch	2012-11-29 16:53:21 +0000
@@ -8,20 +8,14 @@
 dependencies (git!) installed with python-nova.
 
 Signed-off-by: Chuck Short <[e-mail]>
----
- tools/pip-requires | 1 -
- 1 file changed, 1 deletion(-)
 
-diff --git a/tools/pip-requires b/tools/pip-requires
-index 1a460b5..de056ce 100644
---- a/tools/pip-requires
-+++ b/tools/pip-requires
-@@ -16,5 +16,4 @@ suds==0.4
+diff -Naurp cinder-2013.1.orig/tools/pip-requires cinder-2013.1/tools/pip-requires
+--- cinder-2013.1.orig/tools/pip-requires	2012-11-28 13:25:36.000000000 -0600
++++ cinder-2013.1/tools/pip-requires	2012-11-29 10:41:07.931555948 -0600
+@@ -16,6 +16,5 @@ suds==0.4
  paramiko
  Babel>=0.9.6
  iso8601>=0.1.4
 -setuptools_git>=0.4
  python-glanceclient>=0.5.0,<2
--- 
-1.8.0
-
+ python-keystoneclient>=0.2.0