[med-svn] [grinder] 03/03: do not explicitly parse debian/changelog

[Andreas Tille]

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

tille pushed a commit to tag debian/0.5.4-2
in repository grinder.

commit b444df0c8f0ace81ba35df54f0c3edc3a13a800a
Author: Andreas Tille <tille at debian.org>
Date:   Tue Aug 22 13:17:07 2017 +0200

    do not explicitly parse debian/changelog
---
 debian/changelog |  3 ++-
 debian/rules     | 12 ++++++------
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index d029b1c..b011f0b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-grinder (0.5.4-2) UNRELEASED; urgency=medium
+grinder (0.5.4-2) unstable; urgency=medium
 
   * Team upload.
   
@@ -12,6 +12,7 @@ grinder (0.5.4-2) UNRELEASED; urgency=medium
   [ Andreas Tille ]
   * cme fix dpkg-control
   * debhelper 10
+  * dp not explicitly parse debian/changelog
 
  -- Nadiya Sitdykova <rovensaksa at gmail.com>  Mon, 21 Aug 2017 17:34:12 -0400
 
diff --git a/debian/rules b/debian/rules
index 8551e49..5ae2a83 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,12 +1,12 @@
 #!/usr/bin/make -f
 
-PACKAGE := $(shell dpkg-parsechangelog | sed -n 's/^Source: //p')
+include /usr/share/dpkg/default.mk
+
 AUTHOR  := Florent Angly <florent.angly at gmail.com>
-VERSION := $(shell LC_ALL=C dpkg-parsechangelog | awk '/^Version:/{print $$2;}' | sed -e 's,-[^-]*$$,,g')
 SECTION := 1
 MANDIR  := debian/man
 
-NAME1   = $(PACKAGE)
+NAME1   = $(DEB_SOURCE)
 SCRIPT1 = bin/$(NAME1)
 DESC1   = 'Versatile omics shotgun and amplicon sequencing read simulator'
 MAN1    = $(MANDIR)/$(NAME1).$(SECTION)
@@ -51,9 +51,9 @@ override_dh_auto_test:
 override_dh_auto_build:
 	mkdir -p $(MANDIR)
 	echo "$$MORE" > $(MOREFILE)
-	help2man --no-discard-stderr --name $(DESC1) --section $(SECTION) --version-string $(VERSION) --no-info --include $(MOREFILE) --output $(MAN1) $(SCRIPT1)
-	help2man --no-discard-stderr --name $(DESC2) --section $(SECTION) --version-string $(VERSION) --no-info --include $(MOREFILE) --output $(MAN2) $(SCRIPT2)
-	help2man --no-discard-stderr --name $(DESC3) --section $(SECTION) --version-string $(VERSION) --no-info --include $(MOREFILE) --output $(MAN3) $(SCRIPT3)
+	help2man --no-discard-stderr --name $(DESC1) --section $(SECTION) --version-string $(DEB_VERSION_UPSTREAM) --no-info --include $(MOREFILE) --output $(MAN1) $(SCRIPT1)
+	help2man --no-discard-stderr --name $(DESC2) --section $(SECTION) --version-string $(DEB_VERSION_UPSTREAM) --no-info --include $(MOREFILE) --output $(MAN2) $(SCRIPT2)
+	help2man --no-discard-stderr --name $(DESC3) --section $(SECTION) --version-string $(DEB_VERSION_UPSTREAM) --no-info --include $(MOREFILE) --output $(MAN3) $(SCRIPT3)
 	rm $(MOREFILE)
 	dh_auto_build
 

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