[Pkg-openldap-devel] [openldap] 03/05: Switch libldap to dh_makeshlibs

[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 c8c0eb3b65ec8f60501c647388d267c4a5238619
Author: Ryan Tandy <ryan at nardis.ca>
Date:   Fri Nov 18 06:26:03 2016 +0000

    Switch libldap to dh_makeshlibs
    
    Since we now provide a symbols file, dh_makeshlibs getting confused
    about libldap vs libldap_r is no longer an issue.
    
    Deleting libldap-2.4-2.postinst replaces the manual call to ldconfig
    with a debhelper-generated trigger, fixing one Lintian error and one
    warning.
---
 debian/changelog              |  2 ++
 debian/libldap-2.4-2.postinst | 15 ---------------
 debian/rules                  |  8 +-------
 3 files changed, 3 insertions(+), 22 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 35b132c..643fc3f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
 openldap (2.4.44+dfsg-2) UNRELEASED; urgency=medium
 
   * Update Standards-Version to 3.9.8; no changes required.
+  * Enable dh_makeshlibs for libldap-2.4-2. Remove libldap-2.4-2.postinst, now 
+    replaced by the automatic ldconfig trigger.
 
  -- Ryan Tandy <ryan at nardis.ca>  Fri, 18 Nov 2016 06:00:35 +0000
 
diff --git a/debian/libldap-2.4-2.postinst b/debian/libldap-2.4-2.postinst
deleted file mode 100755
index 874273e..0000000
--- a/debian/libldap-2.4-2.postinst
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/bin/sh
-#
-# Run ldconfig after installing the shared library.  We have to do this
-# manually rather than letting dh_makeshlibs deal with it because
-# dh_makeshlibs can't cope with the trick we're pulling with libldap_r.
-
-set -e
-
-if [ "$1" = "configure" ]; then
-    ldconfig
-fi
-
-#DEBHELPER#
-
-exit 0
diff --git a/debian/rules b/debian/rules
index 024bf75..9ff16f6 100755
--- a/debian/rules
+++ b/debian/rules
@@ -181,13 +181,6 @@ override_dh_link:
 	dh_link
 
 override_dh_makeshlibs:
-	# ideally we would do this and not have any libldap-2.4.so.2 links
-	# 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
-	dpkg-gensymbols -plibldap-2.4-2 -Pdebian/libldap-2.4-2
 ifeq ($(filter stage1,$(DEB_BUILD_PROFILES)),)
 	echo "slapd:Provides=$$(objdump -p debian/slapd/usr/lib/$(DEB_HOST_MULTIARCH)/libslapi-*.so.* \
 		| sed -ne '/SONAME/ { s/[[:space:]]*SONAME[[:space:]]*//; \
@@ -195,6 +188,7 @@ ifeq ($(filter stage1,$(DEB_BUILD_PROFILES)),)
 	)" >> debian/slapd.substvars
 	dh_makeshlibs -pslapd -X/usr/lib/ldap/ -V "$$(sed -ne's/slapd:Provides=//p' debian/slapd.substvars)"
 endif
+	dh_makeshlibs --remaining-packages
 
 ifeq ($(filter stage1,$(DEB_BUILD_PROFILES)),)
 override_dh_installdeb:

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