From 1ef80d814e1f900ee610e959717778f93a1483fd Mon Sep 17 00:00:00 2001 From: Igor Yozhikov Date: Thu, 30 Jul 2015 13:26:22 +0300 Subject: [PATCH] update heat packages to 2015.1.2 * Version update to 2015.1.2 * Requirements.txt patch update * add dh-python Change-Id: I9336d978973fafcc744a76572c912d842f56076d Related-Bug: #1459837 --- trusty/debian/changelog | 8 ++++++++ trusty/debian/control | 3 ++- trusty/debian/patches/fix-requirements.patch | 18 +++++++++--------- 3 files changed, 19 insertions(+), 10 deletions(-) diff --git a/trusty/debian/changelog b/trusty/debian/changelog index 5a64efb3..8265c487 100644 --- a/trusty/debian/changelog +++ b/trusty/debian/changelog @@ -1,3 +1,11 @@ +heat (2015.1.2-1~u14.04+mos1) mos7.0; urgency=medium + + * Version update to 2015.1.2 + * Requirements.txt patch update + * LP#1459837 + + -- Igor Yozhikov Thu, 30 Jul 2015 13:15:13 +0300 + heat (2015.1.0-1~u14.04+mos4) mos7.0; urgency=medium * debian/control: diff --git a/trusty/debian/control b/trusty/debian/control index fa63cdc9..5c093ef7 100644 --- a/trusty/debian/control +++ b/trusty/debian/control @@ -4,6 +4,7 @@ Priority: optional Maintainer: MOS Heat Team Build-Depends: debhelper (>= 9), + dh-python, dh-systemd, openstack-pkg-tools (>= 21), python-all (>= 2.7.1), @@ -253,4 +254,4 @@ Description: OpenStack orchestration service - Documentation templates, through both an OpenStack-native ReST API and a CloudFormation-compatible Query API. . - This package contains the documentation. \ No newline at end of file + This package contains the documentation. diff --git a/trusty/debian/patches/fix-requirements.patch b/trusty/debian/patches/fix-requirements.patch index 22f581ac..eb224ce8 100644 --- a/trusty/debian/patches/fix-requirements.patch +++ b/trusty/debian/patches/fix-requirements.patch @@ -1,14 +1,14 @@ -diff -Naurp heat-2015.1.0.orig/requirements.txt heat-2015.1.0/requirements.txt ---- heat-2015.1.0.orig/requirements.txt 2015-04-30 14:01:47.000000000 +0200 -+++ heat-2015.1.0/requirements.txt 2015-04-30 14:44:43.546753986 +0200 -@@ -38,9 +38,8 @@ python-saharaclient>=0.8.0,<0.9.0 - python-swiftclient>=2.2.0,<2.5.0 - python-troveclient>=1.0.7,<1.1.0 + +--- heat/requirements.txt 2015-07-30 13:14:46.638768543 +0300 ++++ heat/requirements.txt 2015-07-30 13:15:31.142768911 +0300 +@@ -38,9 +38,8 @@ + python-swiftclient<2.5.0,>=2.2.0 + python-troveclient<1.1.0,>=1.0.7 PyYAML>=3.1.0 -qpid-python - requests>=2.2.0,!=2.4.0 --Routes>=1.12.3,!=2.0 + requests!=2.4.0,>=2.2.0 +-Routes!=2.0,>=1.12.3 +Routes>=1.12.3 six>=1.9.0 - SQLAlchemy>=0.9.7,<=0.9.99 + SQLAlchemy<=0.9.99,>=0.9.7 sqlalchemy-migrate>=0.9.5 -- 2.45.2