[Reportbug-commits] [reportbug] 32/38: dont call dpkg-parsechangelog directly, use dpkg/pkg-info.mk instead

[Sandro Tosi]

This is an automated email from the git hooks/post-receive script.

morph pushed a commit to branch master
in repository reportbug.

commit b49bb42dc485b25d7f3b21f2d2ee4bc8ae2b709a
Author: Sandro Tosi <morph at debian.org>
Date:   Thu Dec 28 21:26:17 2017 -0500

    dont call dpkg-parsechangelog directly, use dpkg/pkg-info.mk instead
---
 debian/changelog | 4 +++-
 debian/rules     | 7 ++-----
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 4d46e88..1352868 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -42,8 +42,10 @@ reportbug (7.1.8) UNRELEASED; urgency=medium
     - leave only me as Upstream-Author and Packaged-By
   * debian/control
     - bump Standards-Version to 4.1.2 (no changes needed)
+  * debian/rules
+    - dont call dpkg-parsechangelog directly, use dpkg/pkg-info.mk instead
 
- -- Sandro Tosi <morph at debian.org>  Thu, 28 Dec 2017 21:21:14 -0500
+ -- Sandro Tosi <morph at debian.org>  Thu, 28 Dec 2017 21:25:21 -0500
 
 reportbug (7.1.7) unstable; urgency=medium
 
diff --git a/debian/rules b/debian/rules
index 66335a8..189a71d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,10 +1,7 @@
 #!/usr/bin/make -f
 
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
+include /usr/share/dpkg/pkg-info.mk
 
-VERSION := $(shell dpkg-parsechangelog | egrep '^Version:' | sed 's/^Version: \([^+]*\).*/\1/')
-DISTRO := $(shell dpkg-parsechangelog | egrep '^Distribution:' | sed 's/^Distribution: \([^+]*\).*/\1/')
 REPORTBUG_VERSION := $(shell python3 -c "import reportbug; print(reportbug.VERSION_NUMBER)")
 
 %:
@@ -12,7 +9,7 @@ REPORTBUG_VERSION := $(shell python3 -c "import reportbug; print(reportbug.VERSI
 
 override_dh_auto_build:
 	# Test if versions are synchronized (only if releasing); this will bomb if not synced
-	if [ "$(DISTRO)" != "UNRELEASED" -a "$(REPORTBUG_VERSION)" != "$(VERSION)" ] ; \
+	if [ "$(DEB_DISTRIBUTION)" != "UNRELEASED" -a "$(REPORTBUG_VERSION)" != "$(DEB_VERSION)" ] ; \
 	then \
 		echo 'Please update VERSION_NUMBER variable in reportbug/__init__.py'; exit 1 ; \
 	fi

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