From 39b6a9906ad30ced28cc020eb9224203eca0447c Mon Sep 17 00:00:00 2001 From: Thomas Goirand Date: Tue, 13 Dec 2016 17:24:24 +0100 Subject: [PATCH] Allow SQLAlchemy >= 1.1 * Added lsb-base to depends. * Allow SQLAlchemy >= 1.1. Change-Id: I63e61aacd4040813711f928698ad4b216483af82 --- debian/changelog | 10 +++++++--- debian/control | 14 +++++++------- debian/debian_control_vars | 1 + debian/patches/allow-sqla-1.1.patch | 16 ++++++++++++++++ debian/patches/series | 1 + debian/ubuntu_control_vars | 0 6 files changed, 32 insertions(+), 10 deletions(-) create mode 100644 debian/debian_control_vars create mode 100644 debian/patches/allow-sqla-1.1.patch create mode 100644 debian/ubuntu_control_vars diff --git a/debian/changelog b/debian/changelog index 33aa808c..ba0f4df7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,13 @@ -designate (1:3.0.0-2) UNRELEASED; urgency=medium +designate (1:3.0.0-2) unstable; urgency=medium + [ Ondřej Nový ] * Bumped debhelper compat version to 10 - * Added lsb-base to depends - -- Ondřej Nový Wed, 23 Nov 2016 23:48:07 +0100 + [ Thomas Goirand ] + * Added lsb-base to depends. + * Allow SQLAlchemy >= 1.1. + + -- Thomas Goirand Tue, 13 Dec 2016 17:23:04 +0100 designate (1:3.0.0-1) unstable; urgency=medium diff --git a/debian/control b/debian/control index 0ce8dc03..266cfc21 100644 --- a/debian/control +++ b/debian/control @@ -183,8 +183,8 @@ Depends: adduser, designate-common (= ${binary:Version}), python-openstackclient, q-text-as-data, - lsb-base, ${misc:Depends}, + ${ostack-lsb-base}, ${python:Depends}, Description: OpenStack DNS as a Service - API server Designate provides DNSaaS services for OpenStack. It provides a multi-tenant @@ -199,8 +199,8 @@ Package: designate-central Architecture: all Depends: designate-common (= ${binary:Version}), python-designate (= ${binary:Version}), - lsb-base, ${misc:Depends}, + ${ostack-lsb-base}, ${python:Depends}, Description: OpenStack DNS as a Service - central daemon Designate provides DNSaaS services for OpenStack. It provides a multi-tenant @@ -215,8 +215,8 @@ Package: designate-agent Architecture: all Depends: designate-common (= ${binary:Version}), python-designate (= ${binary:Version}), - lsb-base, ${misc:Depends}, + ${ostack-lsb-base}, ${python:Depends}, Description: OpenStack DNS as a Service - agent Designate provides DNSaaS services for OpenStack. It provides a multi-tenant @@ -231,8 +231,8 @@ Package: designate-sink Architecture: all Depends: designate-common (= ${binary:Version}), python-designate (= ${binary:Version}), - lsb-base, ${misc:Depends}, + ${ostack-lsb-base}, ${python:Depends}, Description: OpenStack DNS as a Service - sink Designate provides DNSaaS services for OpenStack. It provides a multi-tenant @@ -247,8 +247,8 @@ Package: designate-mdns Architecture: all Depends: designate-common (= ${binary:Version}), python-designate (= ${binary:Version}), - lsb-base, ${misc:Depends}, + ${ostack-lsb-base}, ${python:Depends}, Description: OpenStack DNS as a Service - mdns Designate provides DNSaaS services for OpenStack. It provides a multi-tenant @@ -263,8 +263,8 @@ Package: designate-pool-manager Architecture: all Depends: designate-common (= ${binary:Version}), python-designate (= ${binary:Version}), - lsb-base, ${misc:Depends}, + ${ostack-lsb-base}, ${python:Depends}, Description: OpenStack DNS as a Service - pool manager Designate provides DNSaaS services for OpenStack. It provides a multi-tenant @@ -279,8 +279,8 @@ Package: designate-zone-manager Architecture: all Depends: designate-common (= ${binary:Version}), python-designate (= ${binary:Version}), - lsb-base, ${misc:Depends}, + ${ostack-lsb-base}, ${python:Depends}, Description: OpenStack DNS as a Service - zone manager Designate provides DNSaaS services for OpenStack. It provides a multi-tenant diff --git a/debian/debian_control_vars b/debian/debian_control_vars new file mode 100644 index 00000000..81c37237 --- /dev/null +++ b/debian/debian_control_vars @@ -0,0 +1 @@ +ostack-lsb-base= lsb-base (>= 3.0.6) diff --git a/debian/patches/allow-sqla-1.1.patch b/debian/patches/allow-sqla-1.1.patch new file mode 100644 index 00000000..9894a325 --- /dev/null +++ b/debian/patches/allow-sqla-1.1.patch @@ -0,0 +1,16 @@ +Description: Allow SQLAlchemy 1.1 +Author: Thomas Goirand +Forwarded: no +Last-Update: 2016-12-13 + +--- designate-3.0.0.orig/requirements.txt ++++ designate-3.0.0/requirements.txt +@@ -30,7 +30,7 @@ python-neutronclient>=5.1.0 # Apache-2.0 + Routes + requests>=2.10.0 # Apache-2.0 + six>=1.9.0 # MIT +-SQLAlchemy<1.1.0,>=1.0.10 # MIT ++SQLAlchemy>=1.0.10 # MIT + sqlalchemy-migrate>=0.9.6 # Apache-2.0 + stevedore>=1.16.0 # Apache-2.0 + suds-jurko>=0.6 # LGPLv3+ diff --git a/debian/patches/series b/debian/patches/series index bd637649..5df37eca 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,3 +1,4 @@ fixes-keystone-authtoken.patch install-missing-files.patch fix-requirements.txt.patch +allow-sqla-1.1.patch diff --git a/debian/ubuntu_control_vars b/debian/ubuntu_control_vars new file mode 100644 index 00000000..e69de29b