[med-svn] [ngs-sdk] 03/05: d/rules: do not parse d/changelog

[Andreas Tille]

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

tille pushed a commit to branch master
in repository ngs-sdk.

commit ff161f08e1716efa18a73b4f13d8ec8f9a84072d
Author: Andreas Tille <tille at debian.org>
Date:   Mon Aug 28 23:10:11 2017 +0200

    d/rules: do not parse d/changelog
---
 debian/changelog |  1 +
 debian/rules     | 14 +++++++-------
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index cb4c2ba..d1d8140 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,7 @@ ngs-sdk (1.3.0-3) UNRELEASED; urgency=medium
   [ Andreas Tille ]
   * debhelper 10
   * Standards-Version: 4.1.0 (no changes needed)
+  * d/rules: do not parse d/changelog
 
  -- Andreas Tille <tille at debian.org>  Mon, 28 Aug 2017 23:08:07 +0200
 
diff --git a/debian/rules b/debian/rules
index 946521f..e1722b5 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,13 +4,13 @@
 
 export DEB_BUILD_MAINT_OPTIONS=hardening=+bindnow
 
-DEBPKGNAME     := $(shell dpkg-parsechangelog | awk '/^Source:/ {print $$2}')
+include /usr/share/dpkg/default.mk
 
 OS := $(shell dpkg-architecture -qDEB_BUILD_ARCH_OS)
 CPU := $(shell dpkg-architecture -qDEB_BUILD_GNU_CPU)
 MULTIARCH := $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
 # since build-results are not ending up in the proper dir its saver to use "*" instead of "$(CPU)"
-SODIR := $(DEBPKGNAME)/$(MULTIARCH)/$(DEBPKGNAME)/$(OS)/gcc/*
+SODIR := $(DEB_SOURCE)/$(MULTIARCH)/$(DEB_SOURCE)/$(OS)/gcc/*
 
 build2vers := $(shell pyversions -sv)
 build3vers := $(shell py3versions -sv)
@@ -20,7 +20,7 @@ build3vers := $(shell py3versions -sv)
 
 override_dh_auto_clean:
 	if [ -e ngs-sdk/Makefile.config.$(OS).$(CPU) ] ; then \
-	#    dh_auto_clean --sourcedirectory=$(DEBPKGNAME) ; \
+	#    dh_auto_clean --sourcedirectory=$(DEB_SOURCE) ; \
 	dh_auto_clean ; \
 	fi
 	rm -rf ngs-java/$(MULTIARCH)
@@ -30,7 +30,7 @@ override_dh_auto_clean:
 	rm -f ngs-bam/Makefile.config.linux.x86_64
 	rm -f ngs-bam/reconfigure
 
-	rm -rf $(DEBPKGNAME)/$(MULTIARCH)
+	rm -rf $(DEB_SOURCE)/$(MULTIARCH)
 	rm -rf ngs-python/build
 
 override_dh_auto_configure:
@@ -38,9 +38,9 @@ override_dh_auto_configure:
 	./configure --build=$(MULTIARCH) --prefix=/usr -- --source=1.7
 
 override_dh_auto_build:
-	#dh_auto_build --sourcedirectory=$(DEBPKGNAME)
+	#dh_auto_build --sourcedirectory=$(DEB_SOURCE)
 	echo "DEBPKGNAME: $DEBPKGNAME"
-	dh_auto_build --sourcedirectory=$(DEBPKGNAME)
+	dh_auto_build --sourcedirectory=$(DEB_SOURCE)
 	# Remove ngs-bam generation, expects ngs-sdk and cannot find a way
 	# to specify it
 	#cd ngs-bam && LD_LIBRARY_PATH=../$(SODIR)/rel/lib ./configure --build=$(MULTIARCH) --prefix=/usr --with-ngs-sdk-prefix=../ngs-sdk
@@ -49,7 +49,7 @@ override_dh_auto_build:
 	markdown_py -f README.html README.md
 
 override_dh_auto_test:
-	make -C $(DEBPKGNAME)/test
+	make -C $(DEB_SOURCE)/test
 	# Tests of Java binding disabled because need external lib ncbi-vdb,
 	# not available in Debian at this time
 	#CLASSPATH=../$(MULTIARCH)/ngs-java/jar/ngs-java.jar LD_LIBRARY_PATH=$(SODIR)/rel/lib:$(LD_LIBRARY_PATH) make -C ngs-java/examples

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