[libkml] 04/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 libkml.

commit 0500f95547032a1ca99500b48dd75877e19aab90
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Sun Jun 25 18:26:04 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 12b64d3..253532a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ libkml (1.3.0-4) UNRELEASED; urgency=medium
   * Bump Standards-Version to 4.0.0, no changes.
   * Add autopkgtest to test installability.
   * Enable PIE hardening buildflags.
+  * Use pkg-info.mk variables instead of dpkg-parsechangelog output.
 
  -- Bas Couwenberg <sebastic at debian.org>  Sun, 25 Jun 2017 18:23:48 +0200
 
diff --git a/debian/rules b/debian/rules
index fb085f9..cc19320 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,11 +3,13 @@
 # Enable hardening build flags
 export DEB_BUILD_MAINT_OPTIONS=hardening=+all
 
+include /usr/share/dpkg/pkg-info.mk
+
 JAVA_HOME = /usr/lib/jvm/default-java
 
 DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
 
-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/\+.*//')
 
 %:
 	dh $@ --with python2,pkgkde_symbolshelper --parallel

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