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

[Steve Langasek]

Author: vorlon
Date: 2007-12-16 09:03:50 +0000 (Sun, 16 Dec 2007)
New Revision: 904

Added:
   openldap/trunk/debian/libldap-2.4-2.links
   openldap/trunk/debian/libldap-2.4-2.shlibs
Modified:
   openldap/trunk/debian/changelog
   openldap/trunk/debian/libldap-2.4-2.install
   openldap/trunk/debian/libldap2-dev.install
   openldap/trunk/debian/libldap2-dev.links
   openldap/trunk/debian/rules
Log:
* drop libldap.so as was done for libldap2, making it a link to
  libldap_r.so to avoid unfortunate symbol collisions.

Modified: openldap/trunk/debian/changelog
===================================================================
--- openldap/trunk/debian/changelog	2007-12-15 11:24:12 UTC (rev 903)
+++ openldap/trunk/debian/changelog	2007-12-16 09:03:50 UTC (rev 904)
@@ -16,8 +16,10 @@
     on per policy; ship the files under /usr/share/slapd and symlink the
     /other/ way, which also spares us from dh_compress trying to gzip
     slapd.conf.  Closes: #452749.
+  * drop libldap.so as was done for libldap2, making it a link to
+    libldap_r.so to avoid unfortunate symbol collisions.
 
- -- Steve Langasek <vorlon at debian.org>  Sat, 15 Dec 2007 02:24:25 -0800
+ -- Steve Langasek <vorlon at debian.org>  Sun, 16 Dec 2007 00:14:31 -0800
 
 openldap2.3 (2.3.39-1) unstable; urgency=medium
 

Modified: openldap/trunk/debian/libldap-2.4-2.install
===================================================================
--- openldap/trunk/debian/libldap-2.4-2.install	2007-12-15 11:24:12 UTC (rev 903)
+++ openldap/trunk/debian/libldap-2.4-2.install	2007-12-16 09:03:50 UTC (rev 904)
@@ -1,7 +1,5 @@
 debian/tmp/usr/lib/liblber-2.4.so.2 usr/lib
 debian/tmp/usr/lib/liblber-2.4.so.2.*.* usr/lib
-debian/tmp/usr/lib/libldap-2.4.so.2 usr/lib
-debian/tmp/usr/lib/libldap-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

Added: openldap/trunk/debian/libldap-2.4-2.links
===================================================================
--- openldap/trunk/debian/libldap-2.4-2.links	                        (rev 0)
+++ openldap/trunk/debian/libldap-2.4-2.links	2007-12-16 09:03:50 UTC (rev 904)
@@ -0,0 +1 @@
+usr/lib/libldap_r-2.4.so.2 usr/lib/libldap-2.4.so.2

Added: openldap/trunk/debian/libldap-2.4-2.shlibs
===================================================================
--- openldap/trunk/debian/libldap-2.4-2.shlibs	                        (rev 0)
+++ openldap/trunk/debian/libldap-2.4-2.shlibs	2007-12-16 09:03:50 UTC (rev 904)
@@ -0,0 +1,3 @@
+liblber-2.4 2 libldap-2.4-2 (>= 2.4.7)
+libldap-2.4 2 libldap-2.4-2 (>= 2.4.7)
+libldap_r-2.4 2 libldap-2.4-2 (>= 2.4.7)

Modified: openldap/trunk/debian/libldap2-dev.install
===================================================================
--- openldap/trunk/debian/libldap2-dev.install	2007-12-15 11:24:12 UTC (rev 903)
+++ openldap/trunk/debian/libldap2-dev.install	2007-12-16 09:03:50 UTC (rev 904)
@@ -6,8 +6,6 @@
 debian/tmp/usr/include/ldap.h usr/include
 debian/tmp/usr/include/ldap_schema.h usr/include
 debian/tmp/usr/include/ldap_utf8.h usr/include
-debian/tmp/usr/lib/libldap.a usr/lib
-debian/tmp/usr/lib/libldap.so usr/lib
 debian/tmp/usr/lib/liblber.a usr/lib
 debian/tmp/usr/lib/liblber.so usr/lib
 debian/tmp/usr/lib/libldap_r.a usr/lib

Modified: openldap/trunk/debian/libldap2-dev.links
===================================================================
--- openldap/trunk/debian/libldap2-dev.links	2007-12-15 11:24:12 UTC (rev 903)
+++ openldap/trunk/debian/libldap2-dev.links	2007-12-16 09:03:50 UTC (rev 904)
@@ -8,3 +8,5 @@
 lber-types.3	usr/share/man/man3/ber_int_t.3
 lber-types.3	usr/share/man/man3/ber_len_t.3
 lber-types.3	usr/share/man/man3/ber_tag_t.3
+usr/lib/libldap_r.so usr/lib/libldap.so
+usr/lib/libldap_r.a usr/lib/libldap.a

Modified: openldap/trunk/debian/rules
===================================================================
--- openldap/trunk/debian/rules	2007-12-15 11:24:12 UTC (rev 903)
+++ openldap/trunk/debian/rules	2007-12-16 09:03:50 UTC (rev 904)
@@ -135,7 +135,6 @@
 	dh_link -a
 	dh_compress -a
 	dh_fixperms -a
-	dh_makeshlibs -plibldap-2.4-2
 	dh_installdeb -a
 	perl -w debian/dh_installscripts-common -p slapd
 	dh_shlibdeps -a -L libldap-2.4-2 -l $(installdir)/usr/lib