[ogdi-dfsg] 01/02: 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 ogdi-dfsg.

commit 96852c4799cd59ceaf0cba1f486a07bc70d886de
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Wed Sep 27 15:19:50 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 d0b5016..ec15099 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ ogdi-dfsg (3.2.0+ds-3) UNRELEASED; urgency=medium
 
   * Change priority from extra to optional.
   * Bump Standards-Version to 4.1.0, changes: priority.
+  * Use pkg-info.mk variables instead of dpkg-parsechangelog output.
 
  -- Bas Couwenberg <sebastic at debian.org>  Sun, 24 Sep 2017 13:16:04 +0200
 
diff --git a/debian/rules b/debian/rules
index 55e5067..ee6489f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -13,7 +13,9 @@ export CFG=debug
 # Don't treat format-security as an error, caused build failure.
 CFLAGS += -Wno-error=format-security
 
-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/\+.*//')
 
 %:
 	dh $@ --with autoreconf --parallel

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