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

[vorlon at alioth.debian.org]

Author: vorlon
Date: 2011-10-09 08:07:56 +0000 (Sun, 09 Oct 2011)
New Revision: 1401

Modified:
   openldap/trunk/debian/rules
Log:
don't override dh_gencontrol just to strip out a duplicate dependency - debhelper is
smart enough to figure this out

Modified: openldap/trunk/debian/rules
===================================================================
--- openldap/trunk/debian/rules	2011-10-09 07:06:12 UTC (rev 1400)
+++ openldap/trunk/debian/rules	2011-10-09 08:07:56 UTC (rev 1401)
@@ -87,10 +87,10 @@
 		sed -i "s/^dependency_libs=.*/dependency_libs=''/" $$F; \
 	done
 	
-	# Check all built libraries for unresolved symbols except for the libslapi
-	# library.  It is a special case since the SLAPI interface depends on symbols
-	# defined in slapd itself.  Those symbols will remain unresolved until the
-	# plugin is loaded into slapd.
+	# Check all built libraries for unresolved symbols except for the
+	# libslapi library.  It is a special case since the SLAPI interface
+	# depends on symbols defined in slapd itself.  Those symbols will
+	# remain unresolved until the plugin is loaded into slapd.
 	for F in $(installdir)/usr/lib/$(DEB_HOST_MULTIARCH)/*.so.*.*.*; do \
 	    if echo "$$F" | grep -q libslapi ; then \
 	        continue; \
@@ -148,11 +148,6 @@
 	dh_installdeb
 	perl -w debian/dh_installscripts-common -p slapd
 
-override_dh_gencontrol:
-	# Strip duplicate dependency out of substvars.
-	sed -i -e 's/ libldap-2.4-2,//' debian/*.substvars
-	dh_gencontrol
-
 override_dh_auto_clean:
 	dh_auto_clean
 	# Update translation templates for debconf