[med-svn] [bamtools] 01/02: Work around the fact that bamtools does not create versioned *.so files but d-shlibmove is expecting this

Andreas Tille tille at debian.org
Thu Apr 10 09:10:52 UTC 2014


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

tille pushed a commit to branch debian
in repository bamtools.

commit 7204a84486864c99d26daa1eb0989e21a90df465
Author: Andreas Tille <tille at debian.org>
Date:   Thu Apr 10 10:14:36 2014 +0200

    Work around the fact that bamtools does not create versioned *.so files but d-shlibmove is expecting this
---
 debian/d-shlibmove.patch | 20 ++++++++++++++++++++
 debian/rules             |  6 +++++-
 2 files changed, 25 insertions(+), 1 deletion(-)

diff --git a/debian/d-shlibmove.patch b/debian/d-shlibmove.patch
new file mode 100644
index 0000000..1bd7e6a
--- /dev/null
+++ b/debian/d-shlibmove.patch
@@ -0,0 +1,20 @@
+Author: Andreas Tille <tille at debian.org>
+Last-Update: 2014-04-10 09:58:01
+Desciption: since the upstream build does not create versioned SO libs
+ d-shlibs would try to move the *.so file twice which fails.  This is
+ prevented with the following patch to d-shlibs.
+
+--- debian/d-shlibmove.orig	2014-04-10 10:03:12.488539739 +0200
++++ debian/d-shlibmove	2014-04-10 09:58:01.000000000 +0200
+@@ -216,8 +216,9 @@
+ fi
+ echo "mv $(dirname $1)/${PK}.so debian/${PKGDEV}/usr/lib"  >> "$execscript"
+ echo "mv $(dirname ${REALSO})/${SONAME} debian/${PKGSHL}/usr/lib"  >> "$execscript"
+-echo "mv ${REALSO} debian/${PKGSHL}/usr/lib"  >> "$execscript"
+-
++if [ "$(dirname ${REALSO})/${SONAME}" != "${REALSO}" ] ; then
++    echo "mv ${REALSO} debian/${PKGSHL}/usr/lib"  >> "$execscript"
++fi
+ if [ -n "${SHLIBSLOCALVER}" ]; then 
+     echo "echo \"${SONAMELIBNAME} ${SONAMEVERSION} ${PKGSHL} (>= ${SHLIBSLOCALVER})\" >> debian/shlibs.local" >> "$execscript"
+ fi
diff --git a/debian/rules b/debian/rules
index c0c7c3e..63336f7 100755
--- a/debian/rules
+++ b/debian/rules
@@ -8,12 +8,16 @@
 	dh $@ --parallel
 
 override_dh_install:
-	d-shlibmove --commit \
+	# since the upstream build does not create versioned we need to tweak d-shlibmove
+	cp /usr/bin/d-shlibmove $(CURDIR)/debian/d-shlibmove
+	patch -p0 < debian/d-shlibmove.patch
+	$(CURDIR)/debian/d-shlibmove --commit \
 		    --multiarch \
 		    --devunversioned \
 		    --exclude-la \
 		    --movedev debian/tmp/usr/include/* usr/include \
 		    debian/tmp/usr/lib/lib*.so
+	rm $(CURDIR)/debian/d-shlibmove
 	dh_install
 
 override_dh_installman:

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



More information about the debian-med-commit mailing list