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

[Chuck Short]

[Yolanda Robla (yolanda.robla)]

Looks good to me

review: Approve

[Adam Gandelman (gandelman-a)]

This needs to be targeted at the havana/saucy branches, not grizzly.

Unmerged revisions

99. By Chuck Short on 2013-04-30

* New upstream version.
* debian/patches/fix_cinder_dependencies.patch: Refreshed.
* debian/control: Bump standards version to 3.9.4.

=== modified file 'debian/changelog'
--- debian/changelog	2013-04-23 18:41:24 +0000
+++ debian/changelog	2013-04-30 13:20:32 +0000
@@ -1,3 +1,11 @@
+cinder (1:2013.2.a163.ga4ba17b-0ubuntu1) UNRELEASED; urgency=low
+
+  * New upstream version.
+  * debian/patches/fix_cinder_dependencies.patch: Refreshed.
+  * debian/control: Bump standards version to 3.9.4.
+
+ -- Chuck Short <[e-mail]>  Tue, 30 Apr 2013 08:09:08 -0500
+
 cinder (1:2013.1-0ubuntu2) raring; urgency=low
 
   * debian/control: Bump minimum stevedore version 0.8.

=== modified file 'debian/control'
--- debian/control	2013-04-16 21:32:22 +0000
+++ debian/control	2013-04-30 13:20:32 +0000
@@ -36,7 +36,7 @@
  python-stevedore (>= 0.8),
  python-suds,
  python-webob
-Standards-Version: 3.9.3
+Standards-Version: 3.9.4
 Homepage: http://launchpad.net/cinder
 
 Package: python-cinder

=== modified file 'debian/patches/fix_cinder_dependencies.patch'
--- debian/patches/fix_cinder_dependencies.patch	2013-02-22 16:40:10 +0000
+++ debian/patches/fix_cinder_dependencies.patch	2013-04-30 13:20:32 +0000
@@ -1,11 +1,11 @@
-diff -Naurp cinder-2013.1.g3.orig/tools/pip-requires cinder-2013.1.g3/tools/pip-requires
---- cinder-2013.1.g3.orig/tools/pip-requires	2013-02-21 16:08:48.000000000 -0600
-+++ cinder-2013.1.g3/tools/pip-requires	2013-02-22 10:38:34.786411293 -0600
-@@ -18,7 +18,6 @@ suds>=0.4
- paramiko
- Babel>=0.9.6
- iso8601>=0.1.4
+diff -Naurp cinder-2013.2.a163.ga4ba17b.orig/tools/pip-requires cinder-2013.2.a163.ga4ba17b/tools/pip-requires
+--- cinder-2013.2.a163.ga4ba17b.orig/tools/pip-requires	2013-04-30 08:04:01.000000000 -0500
++++ cinder-2013.2.a163.ga4ba17b/tools/pip-requires	2013-04-30 08:07:44.181680954 -0500
+@@ -17,7 +17,6 @@ python-glanceclient>=0.5.0,<2
+ python-keystoneclient>=0.2,<0.3
+ python-swiftclient>=1.2,<2
+ routes>=1.12.3
 -setuptools_git>=0.4
- python-glanceclient>=0.5.0,<2
- python-keystoneclient>=0.2.0
- python-swiftclient
+ sqlalchemy>=0.7,<=0.7.99
+ sqlalchemy-migrate>=0.7
+ stevedore>=0.7