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

[Chuck Short]

Icehouse fixes

[James Page (james-page)]

debian/paches/fix-requirements.patch:

Did you mean to drop rtslib-fb rather than replace it with rtslib?

review: Needs Information

[James Page (james-page)]

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2013-10-22 16:53:20 +0000
+++ debian/changelog	2013-11-27 16:10:14 +0000
@@ -1,6 +1,13 @@
 cinder (1:2013.2-0ubuntu2) UNRELEASED; urgency=low
 
-  * debian/control: open icehouse release.
+  * debian/control: 
+    - Open icehouse release.
+    - Add python-rtslib as a dependency.
+  * debian/patches/fix-sqlalchemy-requirements.patch: Dropped no longer needed.
+  * debian/patches/fix-babel-requirements.patch: Dropped no longer needed.
+  * debian/paches/fix-requirements.patch:  Fixed up requirements.txt for 
+    dependencies we have in Ubuntu.
+  * debian/cinder-common.install: Add "cinder-rtstool".
 
  -- Chuck Short <[e-mail]>  Tue, 22 Oct 2013 09:53:20 -0700
 
 
=== modified file 'debian/cinder-common.install'
--- debian/cinder-common.install	2013-05-17 17:05:27 +0000
+++ debian/cinder-common.install	2013-11-27 16:10:14 +0000
@@ -7,3 +7,4 @@
 usr/bin/cinder-manage
 usr/bin/cinder-rootwrap
 usr/bin/cinder-rpc-zmq-receiver
+usr/bin/cinder-rtstool
 
=== removed file 'debian/patches/fix-babel-requirements.patch'
--- debian/patches/fix-babel-requirements.patch	2013-10-03 00:22:17 +0000
+++ debian/patches/fix-babel-requirements.patch	1970-01-01 00:00:00 +0000
@@ -1,17 +0,0 @@
-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
-
 
=== added file 'debian/patches/fix-requirements.patch'
--- debian/patches/fix-requirements.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/fix-requirements.patch	2013-11-27 16:10:14 +0000
@@ -0,0 +1,17 @@
+Description: Update requirements to match Ubuntu.
+Author: Chuck Short <[e-mail]>
+Forwarded: No
+diff -Naurp cinder-2014.1.dev551.g1c6ad38.orig/requirements.txt cinder-2014.1.dev551.g1c6ad38/requirements.txt
+--- cinder-2014.1.dev551.g1c6ad38.orig/requirements.txt	2013-11-27 08:49:27.000000000 -0500
++++ cinder-2014.1.dev551.g1c6ad38/requirements.txt	2013-11-27 10:57:45.067332399 -0500
+@@ -18,9 +18,8 @@ python-keystoneclient>=0.4.1
+ python-novaclient>=2.15.0
+ python-swiftclient>=1.5
+ Routes>=1.12.3
+-rtslib-fb>=2.1.39
+ six>=1.4.1
+-SQLAlchemy>=0.7.8,<=0.7.99
++SQLAlchemy>=0.7.8,<=0.8.99
+ sqlalchemy-migrate>=0.7.2
+ stevedore>=0.10
+ suds>=0.4
 
=== removed file 'debian/patches/fix-sqlalchemy-requirements.patch'
--- debian/patches/fix-sqlalchemy-requirements.patch	2013-10-04 12:40:30 +0000
+++ debian/patches/fix-sqlalchemy-requirements.patch	1970-01-01 00:00:00 +0000
@@ -1,12 +0,0 @@
-diff -Naurp cinder-2013.2.rc1.orig/requirements.txt cinder-2013.2.rc1/requirements.txt
---- cinder-2013.2.rc1.orig/requirements.txt	2013-10-04 05:11:50.000000000 -0400
-+++ cinder-2013.2.rc1/requirements.txt	2013-10-04 08:33:32.072164528 -0400
-@@ -20,7 +20,7 @@ python-novaclient>=2.15.0
- python-swiftclient>=1.5
- Routes>=1.12.3
- six
--SQLAlchemy>=0.7.8,<=0.7.99
-+SQLAlchemy>=0.7.8,<=0.8.99
- sqlalchemy-migrate>=0.7.2
- stevedore>=0.10
- suds>=0.4
 
=== modified file 'debian/patches/series'
--- debian/patches/series	2013-10-03 00:22:17 +0000
+++ debian/patches/series	2013-11-27 16:10:14 +0000
@@ -1,2 +1,1 @@
-fix-sqlalchemy-requirements.patch
-fix-babel-requirements.patch
+fix-requirements.patch