diff --git a/debian/changelog b/debian/changelog index 6e86e482..14d8504e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,15 +1,14 @@ -barbican (1:3.0.0-2) UNRELEASED; urgency=medium - - * Bumped debhelper compat version to 10 - * Added lsb-base to depends - - -- Ondřej Nový Wed, 23 Nov 2016 23:47:52 +0100 - barbican (1:3.0.0-1) unstable; urgency=medium + [ Thomas Goirand ] * New upstream release. - -- Thomas Goirand Thu, 06 Oct 2016 17:26:17 +0200 + [ Ondřej Nový ] + * Bumped debhelper compat version to 10 + * Added lsb-base to depends + * Patch-out upper constraints of SQLAlchemy + + -- Ondřej Nový Fri, 20 Jan 2017 10:36:47 +0100 barbican (1:3.0.0~rc1-2) unstable; urgency=medium diff --git a/debian/control b/debian/control index 6db9a4d1..8044e009 100644 --- a/debian/control +++ b/debian/control @@ -127,7 +127,7 @@ Package: barbican-api Architecture: all Depends: adduser, barbican-common (= ${binary:Version}), - lsb-base, + ${ostack-lsb-base}, python-openstackclient, q-text-as-data, ${misc:Depends}, @@ -142,7 +142,7 @@ Description: OpenStack Key Management Service - API Server Package: barbican-worker Architecture: all Depends: barbican-common (= ${binary:Version}), - lsb-base, + ${ostack-lsb-base}, ${misc:Depends}, ${python:Depends} Description: OpenStack Key Management Service - Worker Node @@ -156,7 +156,7 @@ Description: OpenStack Key Management Service - Worker Node Package: barbican-keystone-listener Architecture: all Depends: barbican-common (= ${binary:Version}), - lsb-base, + ${ostack-lsb-base}, ${misc:Depends}, ${python:Depends} Description: OpenStack Key Management Service - Keystone Listener diff --git a/debian/debian_control_vars b/debian/debian_control_vars new file mode 100644 index 00000000..d4e93e19 --- /dev/null +++ b/debian/debian_control_vars @@ -0,0 +1 @@ +ostack-lsb-base= lsb-base diff --git a/debian/patches/allow_newer_sqlalchemy.patch b/debian/patches/allow_newer_sqlalchemy.patch new file mode 100644 index 00000000..bbee4758 --- /dev/null +++ b/debian/patches/allow_newer_sqlalchemy.patch @@ -0,0 +1,10 @@ +--- a/requirements.txt ++++ b/requirements.txt +@@ -27,6 +27,6 @@ + ldap3>=0.9.8.2 # LGPLv3 + keystonemiddleware + six>=1.9.0 # MIT +-SQLAlchemy<1.1.0,>=1.0.10 # MIT ++SQLAlchemy>=1.0.10 # MIT + stevedore>=1.16.0 # Apache-2.0 + WebOb>=1.2.3 # MIT diff --git a/debian/patches/series b/debian/patches/series index 7db64da2..68e3bcf6 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -4,3 +4,4 @@ repair-broken-migration-scripts.patch fix-barbican-api.patch fixes-keystone_authtoken-in-config-file.patch fix-requirements.txt.patch +allow_newer_sqlalchemy.patch