[proj] 01/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 proj.

commit 8c3753ae2ebd3790503da1f409a4948f6e740e4a
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Wed Sep 27 15:26:16 2017 +0200

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

diff --git a/debian/changelog b/debian/changelog
index 8deedf1..ecc68ae 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+proj (4.9.3-3) UNRELEASED; urgency=medium
+
+  * Use pkg-info.mk variables instead of dpkg-parsechangelog output.
+
+ -- Bas Couwenberg <sebastic at debian.org>  Wed, 27 Sep 2017 15:26:00 +0200
+
 proj (4.9.3-2) unstable; urgency=medium
 
   * Move from experimental to unstable.
diff --git a/debian/rules b/debian/rules
index ad58979..4f4afa4 100755
--- a/debian/rules
+++ b/debian/rules
@@ -14,7 +14,9 @@ export DEB_BUILD_MAINT_OPTIONS=hardening=+all
 
 DEB_HOST_MULTIARCH?=$(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
 
-PROJ_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/\+.*//')
 
 JAVA_HOME = /usr/lib/jvm/default-java
 
@@ -89,5 +91,5 @@ override_dh_installdocs:
 	dh_installdocs AUTHORS NEWS README
 
 override_dh_makeshlibs:
-	dh_makeshlibs -- -v$(PROJ_VERSION)
+	dh_makeshlibs -- -v$(UPSTREAM_VERSION)
 

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