[postgis] 05/06: 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 postgis.

commit 9f48a9dbf2cd6aa4858d783651003cfff7694a9c
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Sun Jun 25 10:06:44 2017 +0200

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

diff --git a/debian/changelog b/debian/changelog
index 21c9c72..a00f187 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ postgis (2.3.2+dfsg-2) UNRELEASED; urgency=medium
     (closes: #865775)
   * Disable PIE on Ubuntu where it's still problematic.
   * Bump Standards-Version to 4.0.0, no changes.
+  * Use pkg-info.mk variables instead of dpkg-parsechangelog output.
 
  -- Bas Couwenberg <sebastic at debian.org>  Sun, 25 Jun 2017 10:03:01 +0200
 
diff --git a/debian/rules b/debian/rules
index 1ff6aa9..41ff3ff 100755
--- a/debian/rules
+++ b/debian/rules
@@ -17,6 +17,8 @@ ifeq ($(VENDOR_DERIVES_FROM_UBUNTU),yes)
 	export DEB_BUILD_MAINT_OPTIONS=hardening=+all,-pie
 endif
 
+include /usr/share/dpkg/pkg-info.mk
+
 # Magic to automatically create a debian/control file for the (or all)
 # supported versions of Postgres.
 #
@@ -66,7 +68,7 @@ ifeq ($(VENDOR_DERIVES_FROM_UBUNTU),yes)
 endif
 
 # Upstream version (including ~rcN) for symbols version
-UPSTREAM_VERSION := $(shell dpkg-parsechangelog | sed -ne 's/^Version: \(.*\)-.*/\1/p' | sed -e 's/\+.*//; s/^[0-9]://')
+UPSTREAM_VERSION := $(shell echo $(DEB_VERSION_UPSTREAM) | sed -e 's/\+.*//')
 
 MAJOR_VERSION = $(shell grep ^POSTGIS_MAJOR_VERSION Version.config | cut -d= -f2)
 MINOR_VERSION = $(shell grep ^POSTGIS_MINOR_VERSION Version.config | cut -d= -f2)

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