[Pkg-openldap-devel] r922 - openldap/trunk/debian

[Steve Langasek]

Author: vorlon
Date: 2007-12-20 09:06:52 +0000 (Thu, 20 Dec 2007)
New Revision: 922

Modified:
   openldap/trunk/debian/changelog
   openldap/trunk/debian/control
   openldap/trunk/debian/libldap-2.4-2.install
   openldap/trunk/debian/rules
   openldap/trunk/debian/slapd.install
Log:
* Move libslapi into the slapd package and provide a virtual package for
  library dependencies, since this is expected to stay lockstep with the
  server.

Modified: openldap/trunk/debian/changelog
===================================================================
--- openldap/trunk/debian/changelog	2007-12-16 12:58:16 UTC (rev 921)
+++ openldap/trunk/debian/changelog	2007-12-20 09:06:52 UTC (rev 922)
@@ -41,8 +41,11 @@
   * Don't build with LAN Manager password support; these passwords are more
     insecure than traditional Unix crypt, and only relevant when talking to
     Windows 98.
+  * Move libslapi into the slapd package and provide a virtual package for
+    library dependencies, since this is expected to stay lockstep with the
+    server.
 
- -- Steve Langasek <vorlon at debian.org>  Sun, 16 Dec 2007 04:33:49 -0800
+ -- Steve Langasek <vorlon at debian.org>  Tue, 18 Dec 2007 15:07:16 -0800
 
 openldap2.3 (2.3.39-1) unstable; urgency=medium
 

Modified: openldap/trunk/debian/control
===================================================================
--- openldap/trunk/debian/control	2007-12-16 12:58:16 UTC (rev 921)
+++ openldap/trunk/debian/control	2007-12-20 09:06:52 UTC (rev 922)
@@ -20,7 +20,7 @@
 Suggests: ldap-utils
 Conflicts: umich-ldapd, ldap-server, libltdl3 (= 1.5.4-1)
 Replaces: libldap2, ldap-utils (<< 2.2.23-3)
-Provides: ldap-server
+Provides: ldap-server, ${slapd:Provides}
 Description: OpenLDAP server (slapd)
  This is the OpenLDAP (Lightweight Directory Access Protocol) standalone
  server (slapd). The server can be used to provide a standalone directory

Modified: openldap/trunk/debian/libldap-2.4-2.install
===================================================================
--- openldap/trunk/debian/libldap-2.4-2.install	2007-12-16 12:58:16 UTC (rev 921)
+++ openldap/trunk/debian/libldap-2.4-2.install	2007-12-20 09:06:52 UTC (rev 922)
@@ -2,5 +2,3 @@
 debian/tmp/usr/lib/liblber-2.4.so.2.*.* usr/lib
 debian/tmp/usr/lib/libldap_r-2.4.so.2 usr/lib
 debian/tmp/usr/lib/libldap_r-2.4.so.2.*.* usr/lib
-debian/tmp/usr/lib/libslapi-2.4.so.2 usr/lib
-debian/tmp/usr/lib/libslapi-2.4.so.2.*.* usr/lib

Modified: openldap/trunk/debian/rules
===================================================================
--- openldap/trunk/debian/rules	2007-12-16 12:58:16 UTC (rev 921)
+++ openldap/trunk/debian/rules	2007-12-20 09:06:52 UTC (rev 922)
@@ -141,6 +141,11 @@
 	# 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)'
+	echo "slapd:Provides=$$(objdump -p debian/slapd/usr/lib/libslapi-*.so.* \
+		| sed -ne '/SONAME/ { s/[[:space:]]*SONAME[[:space:]]*//; \
+		                      s/\.so\./-/; p; q }' \
+	)" >> debian/slapd.substvars
+	dh_makeshlibs -pslapd -X/usr/lib/ldap/ -V "$$(sed -ne's/slapd:Provides=//p' debian/slapd.substvars)"
 	dh_installdeb -a
 	perl -w debian/dh_installscripts-common -p slapd
 	dh_shlibdeps -a -L libldap-2.4-2 -l $(installdir)/usr/lib

Modified: openldap/trunk/debian/slapd.install
===================================================================
--- openldap/trunk/debian/slapd.install	2007-12-16 12:58:16 UTC (rev 921)
+++ openldap/trunk/debian/slapd.install	2007-12-20 09:06:52 UTC (rev 922)
@@ -2,6 +2,7 @@
 debian/tmp/usr/lib/slapd usr/sbin
 debian/tmp/usr/lib/ldap/*.so* usr/lib/ldap
 debian/tmp/usr/lib/ldap/*.la usr/lib/ldap
+debian/tmp/usr/lib/libslapi-*.so.* usr/lib
 debian/lintian-overrides/slapd usr/share/lintian/overrides
 debian/fix_ldif usr/share/slapd
 debian/ldiftopasswd usr/share/slapd