[Pkg-openldap-devel] [openldap] 03/07: copy libldap shlibs into place manually (#742841)

[Ryan Tandy]

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

rtandy-guest pushed a commit to branch master
in repository openldap.

commit 6f3bc636147e032243d901b7a49d9ac1ebfc8cdb
Author: Ryan Tandy <ryan at nardis.ca>
Date:   Mon Aug 25 13:38:36 2014 -0700

    copy libldap shlibs into place manually (#742841)
---
 debian/changelog | 5 ++++-
 debian/rules     | 2 ++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 5b7c52e..972262d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,7 +9,10 @@ openldap (2.4.39-2) UNRELEASED; urgency=low
       symlink. (Closes: #742862)
     - When upgrading a database, ignore extra nested directories as they might 
       contain other databases. Patch from Kenny Millington. (LP: #1003854)
-  * debian/rules: Enable parallel building.
+  * debian/rules:
+    - Enable parallel building.
+    - Copy libldap-2.4-2.shlibs into place manually, as a workaround for
+      #676168. (Closes: #742841)
   * debian/slapd.README.Debian: Add a note about database format upgrades and 
     the consequences of missing one. (Closes: #594711)
   * Build with GnuTLS 3 (Closes: #745231):
diff --git a/debian/rules b/debian/rules
index d1f5297..d13c75e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -151,6 +151,8 @@ override_dh_makeshlibs:
 	# at all, but that requires adjusting the build scripts first to
 	# link against libldap_r, otherwise dh_shlibdeps fails
 	#dh_makeshlibs -plibldap-2.4-2 -V 'libldap-2.4-2 (>= 2.4.7)'
+	mkdir -p debian/libldap-2.4-2/DEBIAN
+	cp -p debian/libldap-2.4-2.shlibs debian/libldap-2.4-2/DEBIAN/shlibs
 	echo "slapd:Provides=$$(objdump -p debian/slapd/usr/lib/$(DEB_HOST_MULTIARCH)/libslapi-*.so.* \
 		| sed -ne '/SONAME/ { s/[[:space:]]*SONAME[[:space:]]*//; \
 		                      s/\.so\./-/; p; q }' \

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