[med-svn] [ncbi-vdb] 01/02: use d-shlibs

[Andreas Tille]

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

tille pushed a commit to branch master
in repository ncbi-vdb.

commit 30b6a8920d8c502b2f98fd2445843effcb50d67b
Author: Andreas Tille <tille at debian.org>
Date:   Tue Jul 19 22:15:39 2016 +0200

    use d-shlibs
---
 debian/control |  4 ++--
 debian/rules   | 14 ++++++++++++--
 2 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/debian/control b/debian/control
index 8b35edf..d3a2e78 100644
--- a/debian/control
+++ b/debian/control
@@ -15,7 +15,7 @@ Vcs-Browser: https://anonscm.debian.org/cgit/debian-med/ncbi-vdb.git
 Vcs-Git: https://anonscm.debian.org/git/debian-med/ncbi-vdb.git
 Homepage: https://github.com/ncbi/ncbi-vdb
 
-Package: libncbi-vdb1
+Package: libncbi-vdb2
 Architecture: any
 Section: libs
 Depends: ${shlibs:Depends},
@@ -38,7 +38,7 @@ Architecture: any
 Section: libdevel
 Depends: ${shlibs:Depends},
          ${misc:Depends},
-         libncbi-vdb1 (= ${binary:Version})
+         libncbi-vdb2 (= ${binary:Version})
 Description: libraries for using data in the INSDC Sequence Read Archives (devel)
  Much of the data submitted these days, for example in BAM, Illumina
  export.txt, and Complete Genomics formats, contain alignment
diff --git a/debian/rules b/debian/rules
index 40f8ea6..afe2a01 100755
--- a/debian/rules
+++ b/debian/rules
@@ -10,7 +10,7 @@ OS := $(shell dpkg-architecture -qDEB_BUILD_ARCH_OS)
 CPU := $(shell dpkg-architecture -qDEB_BUILD_GNU_CPU)
 BUILDTYPE := $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
 # since build-results are not ending up in the proper dir its saver to use "*" instead of "$(CPU)"
-SODIR := $(DEBPKGNAME)/$(BUILDTYPE)/$(DEBPKGNAME)/$(OS)/gcc/*
+SODIR := $(DEBPKGNAME)/$(DEBPKGNAME)/$(OS)/gcc
 
 %:
 	dh $@
@@ -24,7 +24,7 @@ override_dh_auto_clean:
 override_dh_auto_configure:
 	# that's no standard configure script lacking support of default options
 	# The build system shamelessly ignores those options like
-	#    --with-debug --with-ngs-java-prefix=/usr/share/java
+	#    --with-ngs-java-prefix=/usr/share/java
 	# so we need to go with patches.  The options are specified anyway.
 	./configure --build=$(BUILDTYPE) --prefix=/usr --build-prefix=$(CURDIR)/debian/tmp/usr --with-ngs-sdk-prefix=/usr --with-debug --with-ngs-java-prefix=/usr/share/java
 	# no idea how to convince configure script to use the correct include dir so patching result afterwards
@@ -37,3 +37,13 @@ ifeq (,$(findstring nocheck,$(DEB_BUILD_OPTIONS)))
 else
 	echo "Skip testing which takes a long time"
 endif
+
+override_dh_auto_install:
+	dh_auto_install
+	find . -name "*.so"
+	d-shlibmove --commit \
+		    --multiarch \
+		    --devunversioned \
+		    --movedev debian/tmp/usr/$(SODIR)/dbg/lib/*.a usr/lib/$(BUILDTYPE) \
+		    --movedev interfaces/ngs/ncbi/NGS.hpp usr/include/$(DEBPKGNAME) \
+		    debian/tmp/usr/$(DEBPKGNAME)/$(OS)/gcc/$(CPU)/dbg/lib/libncbi-vdb.so

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