[med-svn] [ncbi-vdb] 05/07: Do not parse changelog

Andreas Tille tille at debian.org
Thu Oct 19 21:46:53 UTC 2017


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

tille pushed a commit to tag debian/2.8.2-2+dfsg-1
in repository ncbi-vdb.

commit 76989af92a31e011179edd2b383685af73192516
Author: Andreas Tille <tille at debian.org>
Date:   Thu Oct 19 23:35:06 2017 +0200

    Do not parse changelog
---
 debian/changelog |  1 +
 debian/rules     | 40 ++++++++++++++++++++--------------------
 2 files changed, 21 insertions(+), 20 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 7931586..3879f1f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ ncbi-vdb (2.8.2-2+dfsg-1) UNRELEASED; urgency=medium
   * cme fix dpkg-control
   * Standards-Version: 4.1.1
   * More adaptations to Debian packaged libmbedx
+  * d/rules: Do not parse changelog
 
  -- Andreas Tille <tille at debian.org>  Thu, 19 Oct 2017 22:48:33 +0200
 
diff --git a/debian/rules b/debian/rules
index 5ab8d57..9d3b15f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -6,17 +6,17 @@ DEB_BUILD_OPTIONS := nocheck
 
 # DH_VERBOSE := 1
 
-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)/$(DEBPKGNAME)/$(OS)/gcc
+SODIR := $(DEB_SOURCE)/$(DEB_SOURCE)/$(OS)/gcc
 VDB_ARCH := $(word 1, $(subst -, ,$(DEB_HOST_MULTIARCH)))
-LIBINSTALLDIR := debian/tmp/usr/$(DEBPKGNAME)/$(OS)/gcc/$(VDB_ARCH)/dbg/lib
+LIBINSTALLDIR := debian/tmp/usr/$(DEB_SOURCE)/$(OS)/gcc/$(VDB_ARCH)/dbg/lib
 LIBPKG := libncbi-vdb2
-SCHEMADIR := debian/$(LIBPKG)/usr/lib/$(DEBPKGNAME)
+SCHEMADIR := debian/$(LIBPKG)/usr/lib/$(DEB_SOURCE)
 
 %:
 	dh $@
@@ -25,7 +25,7 @@ override_dh_auto_clean:
 	if [ -e ngs-sdk/Makefile.config.$(OS).$(CPU) ] ; then \
 		dh_auto_clean ; \
 	fi
-	rm -rf $(DEBPKGNAME)/$(MULTIARCH)
+	rm -rf $(DEB_SOURCE)/$(MULTIARCH)
 
 override_dh_auto_configure:
 	# that's no standard configure script lacking support of default options
@@ -61,19 +61,19 @@ override_dh_auto_install:
 		    --override s/libmbedcrypto0-dev/libmbedtls-dev/ \
 		    --override s/libmbedtls10-dev/libmbedtls-dev/ \
 		    --override s/libmbedx509-0-dev/libmbedtls-dev/ \
-		    --movedev debian/tmp/usr/$(DEBPKGNAME)/$(OS)/gcc/*/dbg/lib/libncbi-ngs-c++.a usr/lib/$(MULTIARCH) \
-		    --movedev debian/tmp/usr/$(DEBPKGNAME)/$(OS)/gcc/*/dbg/ilib/libkapp.a usr/lib/$(MULTIARCH) \
-		    --movedev debian/tmp/usr/$(DEBPKGNAME)/$(OS)/gcc/*/dbg/ilib/libkapp-norsrc.a usr/lib/$(MULTIARCH) \
-		    --movedev debian/tmp/usr/$(DEBPKGNAME)/$(OS)/gcc/*/dbg/ilib/libkff.a usr/lib/$(MULTIARCH) \
-		    --movedev debian/tmp/usr/$(DEBPKGNAME)/$(OS)/gcc/*/dbg/ilib/libktst.a usr/lib/$(MULTIARCH) \
-		    --movedev debian/tmp/usr/$(DEBPKGNAME)/$(OS)/gcc/*/dbg/ilib/libkxfs.a usr/lib/$(MULTIARCH) \
-		    --movedev debian/tmp/usr/$(DEBPKGNAME)/$(OS)/gcc/*/dbg/ilib/libkxml.a usr/lib/$(MULTIARCH) \
-                    --movedev debian/tmp/usr/$(DEBPKGNAME)/$(OS)/gcc/*/dbg/ilib/libload.a usr/lib/$(MULTIARCH) \
-		    --movedev debian/tmp/usr/$(DEBPKGNAME)/$(OS)/gcc/*/dbg/ilib/libtui.a usr/lib/$(MULTIARCH) \
-                    --movedev debian/tmp/usr/$(DEBPKGNAME)/$(OS)/gcc/*/dbg/ilib/libtui_cpp.a usr/lib/$(MULTIARCH) \
+		    --movedev debian/tmp/usr/$(DEB_SOURCE)/$(OS)/gcc/*/dbg/lib/libncbi-ngs-c++.a usr/lib/$(MULTIARCH) \
+		    --movedev debian/tmp/usr/$(DEB_SOURCE)/$(OS)/gcc/*/dbg/ilib/libkapp.a usr/lib/$(MULTIARCH) \
+		    --movedev debian/tmp/usr/$(DEB_SOURCE)/$(OS)/gcc/*/dbg/ilib/libkapp-norsrc.a usr/lib/$(MULTIARCH) \
+		    --movedev debian/tmp/usr/$(DEB_SOURCE)/$(OS)/gcc/*/dbg/ilib/libkff.a usr/lib/$(MULTIARCH) \
+		    --movedev debian/tmp/usr/$(DEB_SOURCE)/$(OS)/gcc/*/dbg/ilib/libktst.a usr/lib/$(MULTIARCH) \
+		    --movedev debian/tmp/usr/$(DEB_SOURCE)/$(OS)/gcc/*/dbg/ilib/libkxfs.a usr/lib/$(MULTIARCH) \
+		    --movedev debian/tmp/usr/$(DEB_SOURCE)/$(OS)/gcc/*/dbg/ilib/libkxml.a usr/lib/$(MULTIARCH) \
+                    --movedev debian/tmp/usr/$(DEB_SOURCE)/$(OS)/gcc/*/dbg/ilib/libload.a usr/lib/$(MULTIARCH) \
+		    --movedev debian/tmp/usr/$(DEB_SOURCE)/$(OS)/gcc/*/dbg/ilib/libtui.a usr/lib/$(MULTIARCH) \
+                    --movedev debian/tmp/usr/$(DEB_SOURCE)/$(OS)/gcc/*/dbg/ilib/libtui_cpp.a usr/lib/$(MULTIARCH) \
 		    --movedev interfaces usr/include \
-		    debian/tmp/usr/$(DEBPKGNAME)/$(OS)/gcc/*/dbg/lib/libncbi-vdb.so
-	mv debian/libncbi-vdb-dev/usr/include/interfaces debian/libncbi-vdb-dev/usr/include/$(DEBPKGNAME)
+		    debian/tmp/usr/$(DEB_SOURCE)/$(OS)/gcc/*/dbg/lib/libncbi-vdb.so
+	mv debian/libncbi-vdb-dev/usr/include/interfaces debian/libncbi-vdb-dev/usr/include/$(DEB_SOURCE)
 	d-shlibmove --commit \
 		    --multiarch \
 		    --devunversioned \
@@ -82,17 +82,17 @@ override_dh_auto_install:
 		    --override s/libmbedcrypto0-dev/libmbedtls-dev/ \
 		    --override s/libmbedtls10-dev/libmbedtls-dev/ \
 		    --override s/libmbedx509-0-dev/libmbedtls-dev/ \
-		    debian/tmp/usr/$(DEBPKGNAME)/$(OS)/gcc/*/dbg/lib/libkdf5.so
+		    debian/tmp/usr/$(DEB_SOURCE)/$(OS)/gcc/*/dbg/lib/libkdf5.so
 	d-shlibmove --commit \
 		    --multiarch \
 		    --devunversioned \
 		    --exclude-la \
-		    debian/tmp/usr/$(DEBPKGNAME)/$(OS)/gcc/*/dbg/lib/libncbi-wvdb.so
+		    debian/tmp/usr/$(DEB_SOURCE)/$(OS)/gcc/*/dbg/lib/libncbi-wvdb.so
 	find debian/lib* -name .gitignore -delete
 	# move schemata from development packages to library packages since these are used in executables
 	mkdir -p $(SCHEMADIR)
 	set -x ; \
-	for schema in `find debian/libncbi-vdb-dev/usr/include/$(DEBPKGNAME) -name "*.vschema"` ; do \
+	for schema in `find debian/libncbi-vdb-dev/usr/include/$(DEB_SOURCE) -name "*.vschema"` ; do \
 	    schemafile=`basename $${schema}` ; \
 	    schemadir=`basename $$(dirname $${schema})` ; \
 	    mkdir -p $(SCHEMADIR)/$${schemadir} ; \

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



More information about the debian-med-commit mailing list