[Pkg-samba-maint] [samba] 02/02: Use ctdb path for shlibs

[Mathieu Parent]

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

sathieu pushed a commit to branch local-diffs
in repository samba.

commit 696055a80a5403e7efd5186ff6e891a11af4f796
Author: Mathieu Parent <math.parent at gmail.com>
Date:   Mon Jul 27 06:41:00 2015 +0200

    Use ctdb path for shlibs
---
 debian/make_shlibs | 7 ++++++-
 debian/rules       | 2 +-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/debian/make_shlibs b/debian/make_shlibs
index 7ac5495..a9a6a65 100755
--- a/debian/make_shlibs
+++ b/debian/make_shlibs
@@ -22,7 +22,12 @@ make_shlibs() {
 	#   the symbols file (dpkg-gensymbols -c4)
 	# - create first part of the shlibs file:
 	#   for public libraries, we want a weak dependency in the shlibs file
-	dh_makeshlibs -p$pkg -V -X/usr/lib/${DEB_HOST_MULTIARCH}/samba -X/usr/lib/${DEB_HOST_MULTIARCH}/plugin -- -c4
+	dh_makeshlibs -p$pkg -V \
+        -X/usr/lib/${DEB_HOST_MULTIARCH}/samba \
+        -X/usr/lib/${DEB_HOST_MULTIARCH}/ctdb \
+        -X/usr/lib/${DEB_HOST_MULTIARCH}/ctdb-tests \
+        -X/usr/lib/${DEB_HOST_MULTIARCH}/plugin \
+        -- -c4
 	[ -e $PKGDIR/shlibs ] && mv $PKGDIR/shlibs $PKGDIR/shlibs.1
 
 	# step 2:
diff --git a/debian/rules b/debian/rules
index 12c179e..6f3e145 100755
--- a/debian/rules
+++ b/debian/rules
@@ -217,7 +217,7 @@ ifneq (,$(filter ctdb, $(shell dh_listpackages)))
 endif
 
 override_dh_shlibdeps:
-	LD_LIBRARY_PATH=$(DESTDIR)/usr/lib/$(DEB_HOST_MULTIARCH)/samba:$$LD_LIBRARY_PATH dh_shlibdeps -a
+	LD_LIBRARY_PATH=$(DESTDIR)/usr/lib/$(DEB_HOST_MULTIARCH)/samba:$(DESTDIR)/usr/lib/$(DEB_HOST_MULTIARCH)/ctdb:$(DESTDIR)/usr/lib/$(DEB_HOST_MULTIARCH)/ctdb-tests:$$LD_LIBRARY_PATH dh_shlibdeps -a
 
 override_dh_gencontrol:
 	dh_gencontrol -- -Vldb:Depends=$(LDB_DEPENDS)

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