[gdal] 06/07: 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 experimental-2.2
in repository gdal.

commit 3377731fba0de13ff83d6c5bee9d1ebd4322eacf
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Fri Jun 23 16:39:12 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 684b6cf..47bf881 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,7 @@ gdal (2.2.1~rc1+dfsg-1) UNRELEASED; urgency=medium
   * Bump Standards-Version to 4.0.0, no changes.
   * Add autopkgtest to test installability.
   * Refresh patches.
+  * Use pkg-info.mk variables instead of dpkg-parsechangelog output.
 
  -- Bas Couwenberg <sebastic at debian.org>  Fri, 23 Jun 2017 14:51:05 +0200
 
diff --git a/debian/rules b/debian/rules
index 4c84242..8a61f88 100755
--- a/debian/rules
+++ b/debian/rules
@@ -18,7 +18,9 @@ ifeq ($(VENDOR_DERIVES_FROM_UBUNTU),yes)
 	export DEB_BUILD_MAINT_OPTIONS=hardening=+all,-pie
 endif
 
-UPSTREAM_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/\+.*//')
 
 PYVERS=$(shell pyversions -v -r debian/control) $(shell py3versions -v -r)
 PYDEF=$(shell pyversions -dv)

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