Avoid option -S of dpkg-parsechangelog which is incompatible with Trusty.

Rewritten-From: e6a63e68418717cc509eba2a25bf447785a3ce29

diff --git a/xenial/debian/changelog b/xenial/debian/changelog
index 42504be7cfec7b90a160e87d5060c482f53d92d6..2a2907b73ec221d1d4fce9ed64a257ef2eea041a 100644 (file)
--- a/xenial/debian/changelog
+++ b/xenial/debian/changelog
@@ -1,3 +1,9 @@
+heat (1:6.0.0~b2-2) UNRELEASED; urgency=medium
+
+  * Avoid option -S of dpkg-parsechangelog which is incompatible with Trusty.
+
+ -- Thomas Goirand <zigo@debian.org>  Mon, 25 Jan 2016 16:05:12 +0000
+
 heat (1:6.0.0~b2-1) experimental; urgency=medium
 
   * New upstream release.

diff --git a/xenial/debian/rules b/xenial/debian/rules
index 5f449d074eb8139b6e2224099a527bfa019cf260..d96c22d5bd866f820570a9b95352cb7062bb8bcc 100755 (executable)
--- a/xenial/debian/rules
+++ b/xenial/debian/rules
@@ -4,7 +4,7 @@ PYTHONS:=$(shell pyversions -vr)
 #PYTHON3S:=$(shell py3versions -vr)
 
 include /usr/share/openstack-pkg-tools/pkgos.make
-export OSLO_PACKAGE_VERSION=$(shell dpkg-parsechangelog -S Version | sed -e 's/^[[:digit:]]*://' -e 's/[-].*//' -e 's/~/.0/')
+export OSLO_PACKAGE_VERSION=$(shell dpkg-parsechangelog | grep Version: | cut -d' ' -f2 | sed -e 's/^[[:digit:]]*://' -e 's/[-].*//' -e 's/~/.0/')
 
 %:
        dh $@ --buildsystem=python_distutils --with python2,sphinxdoc,systemd