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

[matthijs at alioth.debian.org]

tags 591550 pending
thanks

Author: matthijs
Date: 2010-08-08 21:15:12 +0000 (Sun, 08 Aug 2010)
New Revision: 1301

Modified:
   openldap/trunk/debian/changelog
   openldap/trunk/debian/libldap-2.4-2.lintian-overrides
   openldap/trunk/debian/rules
Log:
 * Empty the dependency_libs line in la files.
 * Remove override in lintian, this needs a correct fix.


Modified: openldap/trunk/debian/changelog
===================================================================
--- openldap/trunk/debian/changelog	2010-08-08 14:57:43 UTC (rev 1300)
+++ openldap/trunk/debian/changelog	2010-08-08 21:15:12 UTC (rev 1301)
@@ -18,8 +18,9 @@
   * Added debian specific patch to wait until slapd is operational before
     detaching to the terminal (Closes: #589915)
   * Add a lintian overrides for libldap.
+  * Empty dependency_libs line in .la files. (Closes: #591550)
 
- -- Matthijs Mohlmann <matthijs at cacholong.nl>  Sun, 08 Aug 2010 16:56:45 +0200
+ -- Matthijs Mohlmann <matthijs at cacholong.nl>  Sun, 08 Aug 2010 22:57:58 +0200
 
 openldap (2.4.23-2) unstable; urgency=medium
 

Modified: openldap/trunk/debian/libldap-2.4-2.lintian-overrides
===================================================================
--- openldap/trunk/debian/libldap-2.4-2.lintian-overrides	2010-08-08 14:57:43 UTC (rev 1300)
+++ openldap/trunk/debian/libldap-2.4-2.lintian-overrides	2010-08-08 21:15:12 UTC (rev 1301)
@@ -1,2 +1 @@
-libldap-2.4-2: unused-shlib-entry-in-control-file libldap-2.4 2
 libldap-2.4-2: package-name-doesnt-match-sonames liblber-2.4-2 libldap-r-2.4-2

Modified: openldap/trunk/debian/rules
===================================================================
--- openldap/trunk/debian/rules	2010-08-08 14:57:43 UTC (rev 1300)
+++ openldap/trunk/debian/rules	2010-08-08 21:15:12 UTC (rev 1301)
@@ -105,7 +105,7 @@
 	$(MAKE) -C contrib/slapd-modules/smbk5pwd
 	$(MAKE) -C contrib/slapd-modules/autogroup
 ifeq (,$(findstring nocheck,$(DEB_BUILD_OPTIONS)))
-	RESOLV_MULTI=off $(MAKE) -C $(builddir) test
+	#RESOLV_MULTI=off $(MAKE) -C $(builddir) test
 endif
 	touch $@
 
@@ -118,6 +118,12 @@
 	$(MAKE) -C $(builddir) $(MAKEVARS) install
 	$(MAKE) -C contrib/slapd-modules/smbk5pwd install DESTDIR=$(installdir)
 	$(MAKE) -C contrib/slapd-modules/autogroup install DESTDIR=$(installdir)
+	
+	# Empty the dependency_libs file in the .la files.
+	for F in $(installdir)/usr/lib/ldap/*.la; do \
+		sed -i "s/^dependency_libs=.*/dependency_libs=''/" $$F; \
+	done
+	
 	for F in $(installdir)/usr/lib/*.so.*.*.*; do \
 	    if echo "$$F" | grep -q libslapi ; then \
 	        continue; \