Fixed requirements patches.

diff --git a/debian/patches/fix-sqlalchemy-requirements.txt b/debian/patches/fix-sqlalchemy-requirements.txt
index 3ccebe6067ad7e90a55353327bd6515a9bc73040..23cdb2c136dcb525cccccc4984e1e3c96fb86075 100644 (file)
--- a/debian/patches/fix-sqlalchemy-requirements.txt
+++ b/debian/patches/fix-sqlalchemy-requirements.txt
@@ -1,18 +1,16 @@
-Description: Fixes wrong sqlalchemy requirements
+Description: Allow SQLAlchemy 0.9.x
 Author: Thomas Goirand <zigo@debian.org>
 Forwarded: no
-Last-Update: 2013-12-19
+Last-Update: 2014-03-08
 
-Index: cinder/requirements.txt
-===================================================================
---- cinder.orig/requirements.txt       2014-01-24 14:46:56.000000000 +0800
-+++ cinder/requirements.txt    2014-01-24 16:25:31.000000000 +0800
-@@ -22,7 +22,7 @@
- taskflow>=0.1.1,<0.2
+--- cinder-2014.1~b3.orig/requirements.txt
++++ cinder-2014.1~b3/requirements.txt
+@@ -22,7 +22,7 @@ Routes>=1.12.3
+ taskflow>=0.1.3,<0.2
  rtslib-fb>=2.1.39
- six>=1.4.1
--SQLAlchemy>=0.7.8,<=0.7.99
+ six>=1.5.2
+-SQLAlchemy>=0.7.8,<=0.8.99
 +SQLAlchemy>=0.7.8
- sqlalchemy-migrate>=0.8.2
- stevedore>=0.12
+ sqlalchemy-migrate>=0.8.2,!=0.8.4
+ stevedore>=0.14
  suds>=0.4

diff --git a/debian/patches/fix-webob-requirements.txt b/debian/patches/fix-webob-requirements.txt
deleted file mode 100644 (file)
index eb4c790..0000000
--- a/debian/patches/fix-webob-requirements.txt
+++ /dev/null
@@ -1,17 +0,0 @@
-Description: Fix webob requirements.txt
- This avoid loads of unit tests errors.
-Author: Thomas Goirand <zigo@debian.org>
-Forwarded: no
-Last-Update: 2014-02-03
-
-Index: cinder/requirements.txt
-===================================================================
---- cinder.orig/requirements.txt       2014-02-17 15:13:26.000000000 +0800
-+++ cinder/requirements.txt    2014-02-17 15:13:49.000000000 +0800
-@@ -26,5 +26,5 @@
- sqlalchemy-migrate>=0.8.2
- stevedore>=0.12
- suds>=0.4
--WebOb>=1.2.3,<1.3
-+WebOb>=1.2.3
- wsgiref>=0.1.2

diff --git a/debian/patches/series b/debian/patches/series
index 8a61f8a6d287ccac302d5fea1ee50acfcc968a12..0fe267def6aec7dd7d48102f798b36420900c0e9 100644 (file)
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,2 @@
 install-missing-files.patch
 fix-sqlalchemy-requirements.txt
-fix-webob-requirements.txt