Merge lp:~zulcss/cinder/babel-ftbfs into lp:~ubuntu-server-dev/cinder/havana

[Chuck Short]

Revert babel change.

[James Page (james-page)]

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2013-09-24 13:25:43 +0000
+++ debian/changelog	2013-10-03 00:24:29 +0000
@@ -1,9 +1,11 @@
 cinder (1:2013.2~b3-0ubuntu2) UNRELEASED; urgency=low
 
   * New upstream release.
-  * debian/patches/skip-sqlachemy-failures.patch: Dropped 
+  * debian/patches/skip-sqlachemy-failures.patch: Dropped
   * debian/patches/fix-sqlalchemy-requirements.patch: Refreshed.
-  * debian/control: 
+  * debian/patches/fix-babel-requirements.patch: Revert dependency requirement
+    for python-babel.
+  * debian/control:
     - Dropped python-nose and python-setuptool-git.
     - Added python-netaddr as a build-dependency. (LP: #1227153)
     - Added python-six as a build-dependency.

=== added file 'debian/patches/fix-babel-requirements.patch'
--- debian/patches/fix-babel-requirements.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/fix-babel-requirements.patch	2013-10-03 00:24:29 +0000
@@ -0,0 +1,17 @@
+Author: Revert new babel requirements.
+Author: Chuck Short <[e-mail]>
+Forwarded: No, https://review.openstack.org/#/c/48739/
+diff --git a/requirements.txt b/requirements.txt
+index 219962d..01ec2e6 100644
+--- a/requirements.txt
++++ b/requirements.txt
+@@ -2,7 +2,7 @@ pbr>=0.5.21,<1.0
+ amqplib>=0.6.1
+ anyjson>=0.3.3
+ argparse
+-Babel>=1.3
++Babel>=0.9.6
+ eventlet>=0.13.0
+ greenlet>=0.3.2
+ iso8601>=0.1.4
+

=== modified file 'debian/patches/series'
--- debian/patches/series	2013-09-10 15:46:27 +0000
+++ debian/patches/series	2013-10-03 00:24:29 +0000
@@ -1,1 +1,2 @@
 fix-sqlalchemy-requirements.patch
+fix-babel-requirements.patch