[Pkg-openldap-devel] r835 - in openldap/trunk-2.3/debian: . lintian-overrides

[Russ Allbery]

Author: rra
Date: 2007-06-03 06:13:08 +0000 (Sun, 03 Jun 2007)
New Revision: 835

Removed:
   openldap/trunk-2.3/debian/lintian-overrides/ldap-utils
Modified:
   openldap/trunk-2.3/debian/changelog
   openldap/trunk-2.3/debian/control
   openldap/trunk-2.3/debian/ldap-utils.install
   openldap/trunk-2.3/debian/lintian-overrides/slapd
   openldap/trunk-2.3/debian/rules
Log:
* Remove duplicate libldap-2.3-0 package dependencies.
* Use binary:Version instead of Source-Version for the tight
  dependencies between slapd and ldap-utils and libldap-2.3-0.

Modified: openldap/trunk-2.3/debian/changelog
===================================================================
--- openldap/trunk-2.3/debian/changelog	2007-06-03 04:42:37 UTC (rev 834)
+++ openldap/trunk-2.3/debian/changelog	2007-06-03 06:13:08 UTC (rev 835)
@@ -29,8 +29,11 @@
   * Allow people building packages for outside Debian to skip the checks
     for non-DFSG-free material by setting a variable. Thanks, Peter
     Marschall.  (Closes: #427245)
+  * Remove duplicate libldap-2.3-0 package dependencies.
+  * Use binary:Version instead of Source-Version for the tight
+    dependencies between slapd and ldap-utils and libldap-2.3-0.
 
- -- Russ Allbery <rra at debian.org>  Sat, 02 Jun 2007 20:43:22 -0700
+ -- Russ Allbery <rra at debian.org>  Sat, 02 Jun 2007 22:35:13 -0700
 
 openldap2.3 (2.3.35-1) unstable; urgency=low
 

Modified: openldap/trunk-2.3/debian/control
===================================================================
--- openldap/trunk-2.3/debian/control	2007-06-03 04:42:37 UTC (rev 834)
+++ openldap/trunk-2.3/debian/control	2007-06-03 06:13:08 UTC (rev 835)
@@ -12,7 +12,7 @@
 Priority: optional
 Architecture: any
 Pre-Depends: debconf (>= 0.5) | debconf-2.0
-Depends: ${shlibs:Depends}, coreutils (>= 4.5.1-1), psmisc, perl (>> 5.8.0) | libmime-base64-perl, libldap-2.3-0 (= ${Source-Version}), adduser
+Depends: ${shlibs:Depends}, libldap-2.3-0 (= ${binary:Version}), coreutils (>= 4.5.1-1), psmisc, perl (>> 5.8.0) | libmime-base64-perl, adduser
 Recommends: libsasl2-modules
 Suggests: ldap-utils
 Conflicts: umich-ldapd, ldap-server, libltdl3 (= 1.5.4-1)
@@ -27,7 +27,7 @@
 Section: net
 Priority: optional
 Architecture: any
-Depends: ${shlibs:Depends}, libldap-2.3-0 (= ${Source-Version})
+Depends: ${shlibs:Depends}, libldap-2.3-0 (= ${binary:Version})
 Recommends: libsasl2-modules
 Conflicts: umich-ldap-utils, openldap-utils, ldap-client
 Replaces: openldap-utils, slapd (<< 2.2.23-0.pre6), openldapd

Modified: openldap/trunk-2.3/debian/ldap-utils.install
===================================================================
--- openldap/trunk-2.3/debian/ldap-utils.install	2007-06-03 04:42:37 UTC (rev 834)
+++ openldap/trunk-2.3/debian/ldap-utils.install	2007-06-03 06:13:08 UTC (rev 835)
@@ -6,4 +6,3 @@
 debian/tmp/usr/bin/ldapmodify usr/bin
 debian/tmp/usr/bin/ldappasswd usr/bin
 debian/tmp/usr/bin/ldapwhoami usr/bin
-debian/lintian-overrides/ldap-utils usr/share/lintian/overrides

Deleted: openldap/trunk-2.3/debian/lintian-overrides/ldap-utils
===================================================================
--- openldap/trunk-2.3/debian/lintian-overrides/ldap-utils	2007-06-03 04:42:37 UTC (rev 834)
+++ openldap/trunk-2.3/debian/lintian-overrides/ldap-utils	2007-06-03 06:13:08 UTC (rev 835)
@@ -1,3 +0,0 @@
-# dh_shlibdeps is not smart enough to wipe additional relations. Since this
-# is not easy to fix we don't even try to do it at this time.  -- Torsten
-ldap-utils: package-has-a-duplicate-relation depends: libldap-2.3-0, libldap-2.3-0 (= 2.3.35-1)

Modified: openldap/trunk-2.3/debian/lintian-overrides/slapd
===================================================================
--- openldap/trunk-2.3/debian/lintian-overrides/slapd	2007-06-03 04:42:37 UTC (rev 834)
+++ openldap/trunk-2.3/debian/lintian-overrides/slapd	2007-06-03 06:13:08 UTC (rev 835)
@@ -3,10 +3,6 @@
 # -- Torsten
 slapd: postinst-uses-db-input
 
-# dh_shlibdeps is not smart enough to wipe additional relations. Since this
-# is not easy to fix we don't even try to do it at this time.  -- Torsten
-slapd: package-has-a-duplicate-relation depends: libldap-2.3-0, libldap-2.3-0 (= 2.3.35-1)
-
 # The extended description is needed in slapd/backend. It explains a lot about
 # the different backends.
 slapd: too-long-extended-description-in-templates slapd/backend

Modified: openldap/trunk-2.3/debian/rules
===================================================================
--- openldap/trunk-2.3/debian/rules	2007-06-03 04:42:37 UTC (rev 834)
+++ openldap/trunk-2.3/debian/rules	2007-06-03 06:13:08 UTC (rev 835)
@@ -19,7 +19,7 @@
 CFLAGS += -O2
 endif
 
-CONFIG	      = $(shell grep -v "^\#" debian/configure.options)
+CONFIG		= $(shell grep -v "^\#" debian/configure.options)
 
 installdir	:= $(CURDIR)/debian/install
 tmpdir		:= $(CURDIR)/debian/tmp
@@ -142,7 +142,9 @@
 	dh_makeshlibs -plibldap-2.3-0
 	dh_installdeb -a
 	perl -w debian/dh_installscripts-common -p slapd
-	dh_shlibdeps -a -l$(installdir)/usr/lib
+	dh_shlibdeps -a -L libldap-2.3-0 -l $(installdir)/usr/lib
+	# Strip duplicate dependency out of substvars.
+	sed -i -e 's/ libldap-2.3-0,//' debian/*.substvars
 	dh_gencontrol -a
 	dh_md5sums -a
 	# Don't build the libldap2.3-dev package until after sarge release