[libgeotiff-dfsg] 03/03: Use pkg-info.mk variables instead of dpkg-parsechangelog output.

[Bas Couwenberg]

This is an automated email from the git hooks/post-receive script.

sebastic pushed a commit to branch master
in repository libgeotiff-dfsg.

commit a21cbfe06ddb9d79c227b2dd6e4c6f0dcd58ff04
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Wed Sep 27 15:12:28 2017 +0200

    Use pkg-info.mk variables instead of dpkg-parsechangelog output.
---
 debian/changelog | 1 +
 debian/rules     | 6 ++++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index d46fbac..c3dd864 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ libgeotiff-dfsg (1.4.2-3) UNRELEASED; urgency=medium
 
   * Change priority from extra to optional.
   * Bump Standards-Version to 4.1.0, changes: priority.
+  * Use pkg-info.mk variables instead of dpkg-parsechangelog output.
 
  -- Bas Couwenberg <sebastic at debian.org>  Sun, 24 Sep 2017 13:06:02 +0200
 
diff --git a/debian/rules b/debian/rules
index 4afad74..7124e18 100755
--- a/debian/rules
+++ b/debian/rules
@@ -10,7 +10,9 @@ export DH_OPTIONS
 # Enable hardening build flags
 export DEB_BUILD_MAINT_OPTIONS=hardening=+all
 
-GEOTIFF_VERSION=$(shell dpkg-parsechangelog | sed -ne 's/^Version: \(.*\)-.*/\1/p' | sed -e 's/\+.*//; s/^[0-9]://')
+include /usr/share/dpkg/pkg-info.mk
+
+UPSTREAM_VERSION = $(shell echo $(DEB_VERSION_UPSTREAM) | sed -e 's/\+.*//')
 
 %:
 	dh $@ --with autoreconf --parallel
@@ -30,7 +32,7 @@ override_dh_installchangelogs:
 
 override_dh_makeshlibs:
 	# Forces failure ignoring to collect new symbols
-	dh_makeshlibs -- -v$(GEOTIFF_VERSION)
+	dh_makeshlibs -- -v$(UPSTREAM_VERSION)
 
 override_dh_strip:
 	dh_strip --dbg-package=libgeotiff2-dbg

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/libgeotiff-dfsg.git