From bfa30b2efb01de06564f82eb3b560933556879d7 Mon Sep 17 00:00:00 2001 From: Thomas Goirand Date: Mon, 17 Feb 2014 15:12:23 +0800 Subject: [PATCH] Commited changes form the havana branch. Rewritten-From: f201dd1ccca75d7e9970ac550872e4369e1f2a29 --- xenial/debian/changelog | 28 ++++++++++++++++++- xenial/debian/control | 2 +- .../debian/patches/fix-webob-requirements.txt | 17 +++++++++++ xenial/debian/patches/series | 1 + 4 files changed, 46 insertions(+), 2 deletions(-) create mode 100644 xenial/debian/patches/fix-webob-requirements.txt diff --git a/xenial/debian/changelog b/xenial/debian/changelog index e351a6336..c9eeff4cc 100644 --- a/xenial/debian/changelog +++ b/xenial/debian/changelog @@ -2,7 +2,33 @@ cinder (2014.1~b2-1) UNRELEASED; urgency=low * New upstream release. - -- Thomas Goirand Thu, 19 Dec 2013 17:50:32 +0800 + -- Thomas Goirand Mon, 17 Feb 2014 15:11:34 +0800 + +cinder (2013.2.2-2) unstable; urgency=medium + + * Rebuilt using openstack-pkg-tools >= 9. + + -- Thomas Goirand Fri, 14 Feb 2014 17:36:24 +0000 + +cinder (2013.2.2-1) unstable; urgency=medium + + * New upstream point release. + + -- Thomas Goirand 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 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 Mon, 13 Jan 2014 17:27:07 +0800 cinder (2013.2.1-2) unstable; urgency=medium diff --git a/xenial/debian/control b/xenial/debian/control index 74ac3811a..b4f469660 100644 --- a/xenial/debian/control +++ b/xenial/debian/control @@ -6,7 +6,7 @@ Uploaders: Julien Danjou , Thomas Goirand , Mehdi Abaakouk 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/xenial/debian/patches/fix-webob-requirements.txt b/xenial/debian/patches/fix-webob-requirements.txt new file mode 100644 index 000000000..eb4c79008 --- /dev/null +++ b/xenial/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 +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/xenial/debian/patches/series b/xenial/debian/patches/series index 0fe267def..8a61f8a6d 100644 --- a/xenial/debian/patches/series +++ b/xenial/debian/patches/series @@ -1,2 +1,3 @@ install-missing-files.patch fix-sqlalchemy-requirements.txt +fix-webob-requirements.txt -- 2.45.2