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

[Chuck Short]

- Add python-babel as a build-dependency
- Refreshed changelog.

[James Page (james-page)]

python-greenelet -> python-greenlet

review: Needs Fixing

[lp:~zulcss/cinder/babel]

128. By Chuck Short on 2013-08-06

Fix changelog

[James Page (james-page)]

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2013-07-30 17:27:25 +0000
+++ debian/changelog	2013-08-06 14:42:28 +0000
@@ -8,22 +8,17 @@
   [ Adam Gandelman ]
   * debian/patches/avoid_paramiko_vers_depends.patch: Dropped, no longer
     required.
+  * Add minimum requirement python-greenlet (>= 0.3.2).
+  * Add minimum requirement python-eventlet (>= 0.12.0).
 
   [ Chuck Short ]
   * New upstream release.
   * debian/patches/skip-sqlachemy-failures.patch: Skip testfailures 
     with sqlalchemy 0.8 until they are fixed upstream.
+  * debian/control: Add python-babel to build-depends.
 
  -- Chuck Short <[e-mail]>  Tue, 30 Jul 2013 16:40:20 +0000
 
-cinder (1:2013.2~b2-0ubuntu4) UNRELEASED; urgency=low
-
-  * debian/control:
-    - Add minimum requirement python-greenelet (>= 0.3.2).
-    - Add minimum requirement python-eventlet (>= 0.12.0).
-
- -- Adam Gandelman <[e-mail]>  Mon, 22 Jul 2013 12:18:16 -0700
-
 cinder (1:2013.2~b2-0ubuntu3) saucy; urgency=low
 
   * debian/patches/fix-sqlalchemy-requirements.patch: Fix requirements for sqlalchemy

=== modified file 'debian/control'
--- debian/control	2013-07-30 17:27:25 +0000
+++ debian/control	2013-08-06 14:42:28 +0000
@@ -6,6 +6,7 @@
 Build-Depends-Indep:
  python-amqplib,
  python-anyjson (>= 0.3.3),
+ python-babel,
  python-coverage,
  python-d2to1,
  python-eventlet (>= 0.12.0),