[med-svn] [sga] 04/05: d/rules: do not parse d/changelog, hardening=+all

[Andreas Tille]

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

tille pushed a commit to tag debian/0.10.15-3
in repository sga.

commit e5fc8b746cca9b084dc286c1d421ae3761747cbe
Author: Andreas Tille <tille at debian.org>
Date:   Mon Aug 28 21:35:55 2017 +0200

    d/rules: do not parse d/changelog, hardening=+all
---
 debian/changelog |  2 ++
 debian/rules     | 26 ++++++++++++--------------
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index c81cc81..4113efe 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,8 @@ sga (0.10.15-3) UNRELEASED; urgency=medium
   * abs() requires int arguments
     Closes: #853656
   * Avoid privacy breaching links
+  * d/rules: do not parse d/changelog
+  * hardening=+all
 
  -- Andreas Tille <tille at debian.org>  Sun, 27 Aug 2017 15:34:21 +0200
 
diff --git a/debian/rules b/debian/rules
index 7c3bccd..639c9e9 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,9 +4,9 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-# +all does not build
-# export DEB_BUILD_MAINT_OPTIONS = hardening=+all
-export DEB_BUILD_MAINT_OPTIONS = hardening=+bindnow
+export DEB_BUILD_MAINT_OPTIONS = hardening=+all
+
+include /usr/share/dpkg/default.mk
 
 %:
 	dh $@ --sourcedirectory=src
@@ -14,44 +14,42 @@ export DEB_BUILD_MAINT_OPTIONS = hardening=+bindnow
 override_dh_auto_configure:
 	dh_auto_configure -- --with-bamtools=/usr/
 
-pkg := $(shell dpkg-parsechangelog | sed -n 's/^Source: //p')
-version=$(shell dpkg-parsechangelog -ldebian/changelog | grep Version: | cut -f2 -d' ' | cut -f1 -d- )
-mandir=$(CURDIR)/debian/$(pkg)/usr/share/man/man1/
-bindir=$(CURDIR)/debian/$(pkg)/usr/bin
+mandir=$(CURDIR)/debian/$(DEB_SOURCE)/usr/share/man/man1/
+bindir=$(CURDIR)/debian/$(DEB_SOURCE)/usr/bin
 
 override_dh_auto_install:
 	dh_auto_install
-	cp -a src/bin/sga-bam2de.pl	debian/$(pkg)/usr/bin/sga-bam2de
-	cp -a src/bin/sga-astat.py	debian/$(pkg)/usr/bin/sga-astat
+	cp -a src/bin/sga-bam2de.pl	debian/$(DEB_SOURCE)/usr/bin/sga-bam2de
+	cp -a src/bin/sga-astat.py	debian/$(DEB_SOURCE)/usr/bin/sga-astat
 
 override_dh_installexamples:
 	dh_installexamples
-	mkdir -p debian/$(pkg)/usr/share/doc/$(pkg)/examples
+	mkdir -p debian/$(DEB_SOURCE)/usr/share/doc/$(DEB_SOURCE)/examples
 	sed -e 's?^\(SGA_BIN=sga\).*?\1?' \
 	    -e 's?^.*/bin/sga-align?sga-align?' \
 	    -e 's?^.*/bin/sga-bam2de.pl?sga-bam2de?' \
 	    -e 's?^.*/bin/sga-astat.py?sga-astat?' \
-	    src/examples/sga-celegans.sh > debian/$(pkg)/usr/share/doc/$(pkg)/examples/sga-celegans.sh
+	    src/examples/sga-celegans.sh > debian/$(DEB_SOURCE)/usr/share/doc/$(DEB_SOURCE)/examples/sga-celegans.sh
 
 override_dh_installman:
 	dh_installman
 	mkdir -p $(mandir)
 	PATH=/usr/lib/abyss:${PATH} \
 	help2man \
-		--version-string="$(version)" \
+		--version-string="$(DEB_VERSION_UPSTREAM)" \
 		--no-info \
 		--name "Make a distance estimate file from a bam file of reads aligned to contigs" \
 		--output $(mandir)/sga-bam2de.1 \
 		$(bindir)/sga-bam2de
 	help2man \
 		--no-info \
-		--version-string="$(version)" \
+		--version-string="$(DEB_VERSION_UPSTREAM)" \
 		--name="String Graph Assembler: de novo genome assembler that uses string graphs" \
 		--output $(mandir)/sga.1 \
 		$(bindir)/sga
 	help2man \
 		--no-info\
-		--version-string="$(version)" \
+		--version-string="$(DEB_VERSION_UPSTREAM)" \
 		--name="generate sga merge commands from a list of files" \
 		--output $(mandir)/sga-mergeDriver.1 \
 		$(bindir)/sga-mergeDriver

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