Applied havana branch changes.

Rewritten-From: fc5a90d6b80ff3baa0e4509b7f0cb9d5ffa6a4a5

diff --git a/trusty/debian/changelog b/trusty/debian/changelog
index bdf5d2cba490dd53a9628db0cf918d6e1f51b461..c98e12a08a131853adc5814d3e7eb73eacae5a0c 100644 (file)
--- a/trusty/debian/changelog
+++ b/trusty/debian/changelog
@@ -4,7 +4,28 @@ heat (2014.1~b2-1) experimental; urgency=low
   * Added new (build)-depends python-heatclient (>= 0.2.3).
   * Now building the sphinx doc in a heat-doc package.
 
- -- Thomas Goirand <zigo@debian.org>  Tue, 28 Jan 2014 16:51:59 +0800
+ -- Thomas Goirand <zigo@debian.org>  Mon, 17 Feb 2014 15:23:17 +0800
+
+heat (2013.2.2-2) unstable; urgency=medium
+
+  * Rebuilt using openstack-pkg-tools >= 9~.
+
+ -- Thomas Goirand <zigo@debian.org>  Fri, 14 Feb 2014 17:43:18 +0000
+
+heat (2013.2.2-1) unstable; urgency=medium
+
+  * New upstream point release.
+  * Removed fix-call-to-usr-bin-coverage.patch applied upstream.
+
+ -- Thomas Goirand <zigo@debian.org>  Fri, 14 Feb 2014 11:47:35 +0800
+
+heat (2013.2.1-3) unstable; urgency=medium
+
+  * Restart daemons after logrotate.
+  * Fix webob version in requirements.txt.
+  * Delete .coverage and .testrepository folders on clean.
+
+ -- Thomas Goirand <zigo@debian.org>  Mon, 03 Feb 2014 16:14:42 +0800
 
 heat (2013.2.1-2) unstable; urgency=low
 

diff --git a/trusty/debian/control b/trusty/debian/control
index 6fa51426684567061fde4c93fef677affcfa67a4..c7eb66eea2b9dfcccba8bffbb0fde8b79817230e 100644 (file)
--- a/trusty/debian/control
+++ b/trusty/debian/control
@@ -6,7 +6,7 @@ Uploaders: Julien Danjou <acid@debian.org>,
            Thomas Goirand <zigo@debian.org>,
            Mehdi Abaakouk <sileht@sileht.net>
 Build-Depends: debhelper (>= 9),
-               openstack-pkg-tools (>= 8~),
+               openstack-pkg-tools (>= 9~),
                po-debconf,
                python-all (>= 2.6.6-3~),
                python-pbr (>= 0.5.21)