[mapserver] 04/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 master
in repository mapserver.

commit 5f79f14cbcac5171ba24baf767925a9114fae96e
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Wed Jun 21 20:56:02 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 d9d5615..317772d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 mapserver (7.0.6-1) UNRELEASED; urgency=medium
 
   * New upstream release.
+  * Use pkg-info.mk variables instead of dpkg-parsechangelog output.
 
  -- Bas Couwenberg <sebastic at debian.org>  Wed, 21 Jun 2017 20:53:59 +0200
 
diff --git a/debian/rules b/debian/rules
index 963027e..5cc665c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -11,6 +11,8 @@ export DH_OPTIONS
 # Enable hardening build flags
 export DEB_BUILD_MAINT_OPTIONS=hardening=+all
 
+include /usr/share/dpkg/pkg-info.mk
+
 DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
 
 CPPFLAGS := $(shell dpkg-buildflags --get CPPFLAGS)
@@ -25,8 +27,8 @@ RUBYVERSIONS := $(shell dh_ruby --print-supported)
 
 MANPAGES := $(wildcard debian/man/*.*.xml)
 
-MS_VERSION := $(shell dpkg-parsechangelog | sed -ne 's/^Version: \(.*\)-.*/\1/p' | sed -e 's/\+.*//; s/^[0-9]://')
-BUILD_DATE := $(shell dpkg-parsechangelog | sed -ne 's/^Date: //p' | LC_ALL=C date -u "+%d %B %Y" -f -)
+MS_VERSION := $(shell echo $(DEB_VERSION_UPSTREAM) | sed -e 's/\+.*//')
+BUILD_DATE := $(shell echo $(SOURCE_DATE_EPOCH) | LC_ALL=C date -u "+%d %B %Y" -f -)
 
 CMAKE_OPTS := \
 		-DCMAKE_BUILD_TYPE=RelWithDebInfo \

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