Commited changes form the havana branch.

diff --git a/debian/changelog b/debian/changelog
index e351a6336170be4bc78f9e69f2da7c5772e5aa78..c9eeff4cca7755189f64551c66ac94138206369c 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,7 +2,33 @@ cinder (2014.1~b2-1) UNRELEASED; urgency=low
 
   * New upstream release.
 
- -- Thomas Goirand <zigo@debian.org>  Thu, 19 Dec 2013 17:50:32 +0800
+ -- Thomas Goirand <zigo@debian.org>  Mon, 17 Feb 2014 15:11:34 +0800
+
+cinder (2013.2.2-2) unstable; urgency=medium
+
+  * Rebuilt using openstack-pkg-tools >= 9.
+
+ -- Thomas Goirand <zigo@debian.org>  Fri, 14 Feb 2014 17:36:24 +0000
+
+cinder (2013.2.2-1) unstable; urgency=medium
+
+  * New upstream point release.
+
+ -- Thomas Goirand <zigo@debian.org>  Fri, 14 Feb 2014 11:04:50 +0800
+
+cinder (2013.2.1-4) unstable; urgency=medium
+
+  * Added postrotate script after logrotate to restart daemons.
+  * Fix webob version in requirements.txt.
+
+ -- Thomas Goirand <zigo@debian.org>  Mon, 03 Feb 2014 15:49:21 +0800
+
+cinder (2013.2.1-3) unstable; urgency=medium
+
+  * Updated fr.po debconf thanks to Julien Patriarca (Closes: #733091).
+  * New sv.po debconf translation thanks to Martin Bagge (Closes: #734585).
+
+ -- Thomas Goirand <zigo@debian.org>  Mon, 13 Jan 2014 17:27:07 +0800
 
 cinder (2013.2.1-2) unstable; urgency=medium
 

diff --git a/debian/control b/debian/control
index 74ac3811acd31f4b2d70a9aad9af17f55cffcc2a..b4f46966032719cae3c65e01cceb36dedd785d20 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -6,7 +6,7 @@ Uploaders: Julien Danjou <acid@debian.org>,
            Thomas Goirand <zigo@debian.org>,
            Mehdi Abaakouk <sileht@sileht.net>
 Build-Depends: debhelper (>= 8.0.0),
-               openstack-pkg-tools,
+               openstack-pkg-tools (>= 9~),
                po-debconf,
                python-all (>= 2.6.6-3~),
                python-pbr (>= 0.5.21),

diff --git a/debian/patches/fix-webob-requirements.txt b/debian/patches/fix-webob-requirements.txt
new file mode 100644 (file)
index 0000000..eb4c790
--- /dev/null
+++ b/debian/patches/fix-webob-requirements.txt
@@ -0,0 +1,17 @@
+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 0fe267def6aec7dd7d48102f798b36420900c0e9..8a61f8a6d287ccac302d5fea1ee50acfcc968a12 100644 (file)
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 install-missing-files.patch
 fix-sqlalchemy-requirements.txt
+fix-webob-requirements.txt