Commits changes from the havana branch

Change-Id: I027135fcaa0d850a2c5479f147284bdf2e4eab16

Rewritten-From: 28ee6f3943ad10361bc2ad54b16cc6024c5f9061

diff --git a/trusty/debian/changelog b/trusty/debian/changelog
index 2f5408791d707678a1b02e414dbbb0b8f477d24f..ef35a09b8df7514f9ce5555480477f0343c82a57 100644 (file)
--- a/trusty/debian/changelog
+++ b/trusty/debian/changelog
@@ -8,6 +8,34 @@ ceilometer (2014.1~b2-1) experimental; urgency=low
 
  -- Thomas Goirand <zigo@debian.org>  Mon, 09 Dec 2013 17:09:33 +0800
 
+ceilometer (2013.2.2-2) unstable; urgency=medium
+
+  * Rebuilt Ceilometer with the new openstack-pkg-tools >= 9.
+
+ -- Thomas Goirand <zigo@debian.org>  Fri, 14 Feb 2014 17:24:30 +0000
+
+ceilometer (2013.2.2-1) unstable; urgency=medium
+
+  * New upstream point release.
+  * refreshed patches.
+
+ -- Thomas Goirand <zigo@debian.org>  Fri, 14 Feb 2014 10:19:27 +0800
+
+ceilometer (2013.2.1-5) unstable; urgency=medium
+
+  * Added missing postrotate scripts to restart daemons after logrotate
+    (Closes: #736930).
+
+ -- Thomas Goirand <zigo@debian.org>  Mon, 03 Feb 2014 15:41:29 +0800
+
+ceilometer (2013.2.1-4) unstable; urgency=medium
+
+  * Fix ${LIBVIRT_GROUP} when doing adduser ceilometer libvirt, so that it
+  * also
+    works on Ubuntu.
+
+ -- Thomas Goirand <zigo@debian.org>  Wed, 15 Jan 2014 17:37:07 +0800
+
 ceilometer (2013.2.1-3) unstable; urgency=medium
 
   * Adds ceilometer/api/app.wsgi to /usr/share/ceilometer.

diff --git a/trusty/debian/control b/trusty/debian/control
index 40baf3e7c778082c4e09e24e9983b96f259ac47e..98d3d7b47d16cdda6117070d947aa913a6f7035e 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 (>= 6~),
+               openstack-pkg-tools (>= 9~),
                po-debconf,
                python-all (>= 2.6.6-3~),
                python-pbr (>= 0.5.21)