[libspatialindex] 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 libspatialindex.

commit 7658cd652ac0609708908364adf6d0d6e5b35e8f
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Sun Jun 25 19:01:04 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 199411f..0d6c619 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ spatialindex (1.8.5-5) 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 19:00:01 +0200
 
diff --git a/debian/rules b/debian/rules
index 0309bcc..63e763b 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
 
-SPATIALINDEX_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,pkgkde_symbolshelper --parallel
@@ -21,7 +23,7 @@ override_dh_install:
 	dh_install --autodest --list-missing
 
 override_dh_makeshlibs:
-	dh_makeshlibs -- -c0 -v$(SPATIALINDEX_VERSION)
+	dh_makeshlibs -- -c0 -v$(UPSTREAM_VERSION)
 
 override_dh_strip:
 	dh_strip --dbg-package=libspatialindex-dbg

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