From caec251209ffb9ff514471cc21ca064fef2cdbef Mon Sep 17 00:00:00 2001 From: Thomas Goirand Date: Wed, 20 Jan 2016 10:47:57 +0000 Subject: [PATCH] export OSLO_PACKAGE_VERSION now compatible with Trusty version of dpkg. Rewritten-From: 6f9c29414dfe25c1be8d48f17911e3cdaa72d75d --- xenial/debian/changelog | 1 + xenial/debian/rules | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/xenial/debian/changelog b/xenial/debian/changelog index 12f94b7ac..b7efa1f5c 100644 --- a/xenial/debian/changelog +++ b/xenial/debian/changelog @@ -7,6 +7,7 @@ neutron (1:8.0.0~b2-1) experimental; urgency=medium * Did some cleanups in debian/rules. * Using oslo-config-generator to generate config files, as upstream moved to use that as well. + * export OSLO_PACKAGE_VERSION now compatible with Trusty version of dpkg. -- Thomas Goirand Fri, 04 Dec 2015 09:03:42 +0100 diff --git a/xenial/debian/rules b/xenial/debian/rules index 88692d4a6..2dbe9f8b2 100755 --- a/xenial/debian/rules +++ b/xenial/debian/rules @@ -1,7 +1,7 @@ #!/usr/bin/make -f 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/' | head -n 1) PYTHONS:=$(shell pyversions -vr) -- 2.45.2