[med-svn] [bamtools] 02/02: Drop d-shlibs patch and add versioned Build-Depends for 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 bamtools.

commit 30e9bffe976ac81970a3059f8cecac4b7b0c1636
Author: Andreas Tille <tille at debian.org>
Date:   Mon Jun 30 10:06:49 2014 +0200

    Drop d-shlibs patch and add versioned Build-Depends for d-shlibs
---
 debian/changelog         |  7 +++++++
 debian/control           |  2 +-
 debian/d-shlibmove.patch | 20 --------------------
 debian/rules             |  6 +-----
 4 files changed, 9 insertions(+), 26 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 7553c31..269cacd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+bamtools (2.3.0+dfsg-2) unstable; urgency=medium
+
+  * Drop d-shlibs patch and add versioned Build-Depends for d-shlibs
+    Closes: #753210
+
+ -- Andreas Tille <tille at debian.org>  Mon, 30 Jun 2014 09:50:50 +0200
+
 bamtools (2.3.0+dfsg-1) unstable; urgency=low
 
   * Initial release (Closes: #692498)
diff --git a/debian/control b/debian/control
index cf1fbf2..40a0f15 100644
--- a/debian/control
+++ b/debian/control
@@ -5,7 +5,7 @@ Uploaders: Michael R. Crusoe <michael.crusoe at gmail.com>,
 Section: science
 Priority: optional
 Build-Depends: debhelper (>= 9.0.0),
-               d-shlibs,
+               d-shlibs (>= 0.56),
                cmake,
                libz-dev,
                libjsoncpp-dev,
diff --git a/debian/d-shlibmove.patch b/debian/d-shlibmove.patch
deleted file mode 100644
index 1bd7e6a..0000000
--- a/debian/d-shlibmove.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-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 07dff81..6f59a5a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -10,16 +10,12 @@ DEBPKGNAME     := $(shell dpkg-parsechangelog | awk '/^Source:/ {print $$2}')
 	dh $@ --parallel
 
 override_dh_install:
-	# 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 \
+	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
 	# no need to install different versions of bamtools
 	rm -rf debian/$(DEBPKGNAME)/usr/bin/$(DEBPKGNAME)

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