From de6da91c927f0fe4db2e1ef46137d0baade71799 Mon Sep 17 00:00:00 2001 From: Dmitry Burmistrov Date: Tue, 22 Oct 2013 13:22:06 +0400 Subject: [PATCH] Update DEB-specs to 2013.2 version --- debian/changelog | 59 ++++++++++++++- debian/control | 71 ++++++++++--------- .../patches/avoid_paramiko_vers_depends.patch | 19 ----- debian/patches/fix-babel-requirements.patch | 17 +++++ .../patches/fix-sqlalchemy-requirements.patch | 13 ++-- debian/patches/series | 2 +- 6 files changed, 118 insertions(+), 63 deletions(-) delete mode 100644 debian/patches/avoid_paramiko_vers_depends.patch create mode 100644 debian/patches/fix-babel-requirements.patch diff --git a/debian/changelog b/debian/changelog index a451f9117..14d1ad611 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,63 @@ -cinder (1:2013.2~b2-0ubuntu3~cloud0) precise-havana; urgency=low +cinder (1:2013.2-0ubuntu1~cloud0) precise-havana; urgency=low * New upstream release for the Ubuntu Cloud Archive. - -- Chuck Short Tue, 23 Jul 2013 08:18:43 -0400 + -- James Page Wed, 16 Oct 2013 11:27:06 +0100 + +cinder (1:2013.2~rc3-0ubuntu1) saucy; urgency=low + + * New upstream release candidate (LP: #1240254). + + -- James Page Wed, 16 Oct 2013 08:59:28 +0100 + +cinder (1:2013.2~rc2-0ubuntu1) saucy; urgency=low + + * New upstream release candidate (LP: #1239156). + + -- James Page Sat, 12 Oct 2013 16:52:11 +0100 + +cinder (1:2013.2~rc1-0ubuntu1) saucy; urgency=low + + * New upstream release candidate. + * debian/patches/skip-sqlachemy-failures.patch: Dropped + * debian/patches/fix-sqlalchemy-requirements.patch: Refreshed. + * debian/patches/fix-babel-requirements.patch: Revert dependency requirement + for python-babel. + * debian/control: + - Dropped python-nose and python-setuptool-git. + - Added python-netaddr as a build-dependency. (LP: #1227153) + - Added python-six as a build-dependency. + - Added versioned dependencies to python-pbr, python-amqplib, + python-glanceclient, python-novaclient, and python-swiftclient, + python-lxml, python-webob, python-oslo.config, python-sqlalchemy, + python-fixtures, python-testtools, and python-fixtures + - Bumped versioned dependencies for python-eventlet, python-hp3parclient, + python-keystoneclient, and python-novaclient + + -- Chuck Short Fri, 04 Oct 2013 08:40:26 -0400 + +cinder (1:2013.2~b3-0ubuntu1) saucy; urgency=low + + [ James Page ] + * d/control: Switch ceph-common -> python-ceph inline with upstream + refactoring of Ceph RBD driver, move to Suggests of python-cinder. + (LP: #1190791). + + [ 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). + * Add minimum requirement python-paramiko (>= 1.8). + + [ 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. + * debian/control: Add python-novaclient to build-depends. + + -- Chuck Short Sun, 08 Sep 2013 21:09:46 -0400 cinder (1:2013.2~b2-0ubuntu3) saucy; urgency=low diff --git a/debian/control b/debian/control index 1b2b78ab3..8bf9f19ea 100644 --- a/debian/control +++ b/debian/control @@ -4,41 +4,43 @@ Priority: extra Maintainer: Chuck Short Build-Depends: debhelper (>= 8.0.0), python-all (>= 2.6) Build-Depends-Indep: - python-amqplib, + python-amqplib (>= 0.6.1), python-anyjson (>= 0.3.3), + python-babel, python-coverage, python-d2to1, - python-eventlet, - python-fixtures, - python-glanceclient, - python-greenlet, - python-hp3parclient (>= 1.0.0), + python-eventlet (>= 0.13.0), + python-fixtures (>= 0.3.14), + python-glanceclient (>= 1:0.9.0), + python-greenlet (>= 0.3.2), + python-hp3parclient (>= 2.0.0), python-iso8601, - python-keystoneclient (>= 0.2.3), + python-keystoneclient (>= 1:0.3.0), python-kombu (>= 2.5.12), python-lockfile, - python-lxml, + python-lxml (>= 2.3), python-migrate, python-mock, python-mox, python-mysqldb, - python-nose, - python-oslo.config, - python-paramiko, + python-netaddr, + python-novaclient (>= 1:2.15.0), + python-oslo.config (>= 1:1.1.0), + python-paramiko (>= 1.8), python-paste, python-pastedeploy, - python-pbr, + python-pbr (>= 0.5.21), python-routes, - python-swiftclient, python-setuptools, - python-setuptools-git, + python-six, python-sphinx, - python-sqlalchemy, - python-stevedore (>= 0.9), + python-sqlalchemy (>= 0.8.2), + python-stevedore (>= 0.10), python-suds, - python-testtools, - python-webob, - testrepository + python-swiftclient (>= 1:1.5), + python-testtools (>= 0.9.32), + python-webob (>= 1.2.3), + testrepository (>= 0.0.17) Standards-Version: 3.9.4 Homepage: http://launchpad.net/cinder Vcs-Browser: http://bazaar.launchpad.net/~ubuntu-server-dev/cinder/havana/files @@ -49,30 +51,34 @@ Package: python-cinder Section: python Architecture: all Depends: - python-amqplib, + python-amqplib (>= 0.6.1), python-anyjson (>= 0.3.3), - python-eventlet, - python-glanceclient, - python-keystoneclient (>= 0.2.3), - python-oslo.config, - python-greenlet, + python-babel, + python-eventlet (>= 0.13.0), + python-glanceclient (>= 1:0.9.0), + python-greenlet (>= 0.3.2), python-iso8601, + python-keystoneclient (>= 1:0.3.0), python-kombu (>= 2.5.12), python-lockfile, - python-lxml, + python-lxml (>= 2.3), python-migrate, - python-paramiko, + python-netaddr, + python-novaclient (>= 1:2.12.0), + python-oslo.config (>= 1:1.1.0), + python-paramiko (>= 1.8), python-paste, python-pastedeploy, python-routes, - python-stevedore (>= 0.9), - python-swiftclient, - python-sqlalchemy, + python-six, + python-sqlalchemy (>= 0.8.2), + python-stevedore (>= 0.10), python-suds, - python-webob, + python-swiftclient (>= 1:1.5), + python-webob (>= 1.2.3), ${misc:Depends}, ${python:Depends} -Suggests: python-hp3parclient +Suggests: python-ceph, python-hp3parclient Description: Cinder Python libraries OpenStack is a reliable cloud infrastructure. Its mission is to produce the ubiquitous cloud computing platform that will meet the needs of public @@ -122,7 +128,6 @@ Depends: tgt, ${misc:Depends}, ${python:Depends} -Suggests: ceph-common Breaks: cinder-common ( <= 2012.2~rc1~20120907.1154-0ubuntu1 ) Replaces: cinder-common ( <= 2012.2~rc1~20120907.1154-0ubuntu1 ) Description: Cinder storage service - Volume server diff --git a/debian/patches/avoid_paramiko_vers_depends.patch b/debian/patches/avoid_paramiko_vers_depends.patch deleted file mode 100644 index f7fd08653..000000000 --- a/debian/patches/avoid_paramiko_vers_depends.patch +++ /dev/null @@ -1,19 +0,0 @@ -From: Adam Gandelman -Date: Thu May 23 19:12:03 PDT 2013 -Remove version requirements of paramiko dependency until new upstream paramiko -version is packaged. Current version in Saucy (1.7.7.1-3.1ubuntu1) has a -cherry-picked patch to avoid the bug that prompted the version requirement -here. - -diff -Naurp cinder-2013.2.a359.g5be6852.orig/requirements.txt cinder-2013.2.a359.g5be6852/requirements.txt ---- cinder-2013.2.a359.g5be6852.orig/requirements.txt 2013-07-16 11:30:02.000000000 -0400 -+++ cinder-2013.2.a359.g5be6852/requirements.txt 2013-07-16 11:34:18.769962552 -0400 -@@ -11,7 +11,7 @@ lockfile>=0.8 - lxml>=2.3 - netaddr - oslo.config>=1.1.0 --paramiko>=1.8.0 -+paramiko - Paste - PasteDeploy>=1.5.0 - python-glanceclient>=0.9.0 diff --git a/debian/patches/fix-babel-requirements.patch b/debian/patches/fix-babel-requirements.patch new file mode 100644 index 000000000..ff81c44a6 --- /dev/null +++ b/debian/patches/fix-babel-requirements.patch @@ -0,0 +1,17 @@ +Author: Revert new babel requirements. +Author: Chuck Short +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 + diff --git a/debian/patches/fix-sqlalchemy-requirements.patch b/debian/patches/fix-sqlalchemy-requirements.patch index 81c2ec773..473c092fe 100644 --- a/debian/patches/fix-sqlalchemy-requirements.patch +++ b/debian/patches/fix-sqlalchemy-requirements.patch @@ -1,15 +1,12 @@ -Description: Bump sqlalchemy to support 0.8. -Author: Chuck Short -Forwarded: No -diff -Naurp cinder-2013.2.b2.orig/requirements.txt cinder-2013.2.b2/requirements.txt ---- cinder-2013.2.b2.orig/requirements.txt 2013-07-18 11:49:19.000000000 -0400 -+++ cinder-2013.2.b2/requirements.txt 2013-07-22 08:05:15.282522549 -0400 -@@ -20,7 +20,7 @@ python-novaclient>=2.12.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,<=0.8.99 ++SQLAlchemy>=0.7.8,<=0.8.99 sqlalchemy-migrate>=0.7.2 stevedore>=0.10 suds>=0.4 diff --git a/debian/patches/series b/debian/patches/series index 9ae05cd38..82e379d48 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,2 +1,2 @@ -avoid_paramiko_vers_depends.patch fix-sqlalchemy-requirements.patch +fix-babel-requirements.patch -- 2.32.3