From: Thomas Goirand <thomas@goirand.fr>
Date: Tue, 14 Jun 2016 07:12:56 +0000 (+0000)
Subject:   * Do not use custom OSLO_PACKAGE_VERSION and build-depends on
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=7fae2866457252e8871dfc283fe0d4a2950cce79;p=openstack-build%2Fcinder-build.git

  * Do not use custom OSLO_PACKAGE_VERSION and build-depends on
    openstack-pkg-tools 50.

Rewritten-From: ed98ef3c86bc49965e80f70503ba23771e04520d
---

diff --git a/xenial/debian/changelog b/xenial/debian/changelog
index 633e30ecf..a3eb04fd0 100644
--- a/xenial/debian/changelog
+++ b/xenial/debian/changelog
@@ -4,6 +4,8 @@ cinder (2:9.0.0~b1+dfsg1-1) experimental; urgency=medium
   * Fixed (build-)depends for this release.
   * Refreshed patches.
   * Fixed generation of cinder.conf namespace list.
+  * Do not use custom OSLO_PACKAGE_VERSION and build-depends on
+    openstack-pkg-tools 50.
 
  -- Thomas Goirand <zigo@debian.org>  Thu, 09 Jun 2016 09:31:38 +0200
 
diff --git a/xenial/debian/control b/xenial/debian/control
index bfb15aa2a..37b6d06b0 100644
--- a/xenial/debian/control
+++ b/xenial/debian/control
@@ -6,7 +6,7 @@ Uploaders: Thomas Goirand <zigo@debian.org>,
 Build-Depends: debhelper (>= 9),
                dh-python,
                dh-systemd,
-               openstack-pkg-tools (>= 40~),
+               openstack-pkg-tools (>= 50~),
                po-debconf,
                python-all,
                python-pbr (>= 1.8),
diff --git a/xenial/debian/rules b/xenial/debian/rules
index 909bdb365..3f805a66b 100755
--- a/xenial/debian/rules
+++ b/xenial/debian/rules
@@ -1,7 +1,6 @@
 #!/usr/bin/make -f
 
 include /usr/share/openstack-pkg-tools/pkgos.make
-export OSLO_PACKAGE_VERSION=$(shell dpkg-parsechangelog | grep Version: | cut -d' ' -f2 | sed -e 's/^[[:digit:]]*://' -e 's/[-].*//' -e 's/~/.0/' | head -n 1)
 
 %:
 	dh $@ --buildsystem=python_distutils --with python2,systemd,sphinxdoc