[Pkg-openldap-devel] Bug#475856: NMU diff

[Bastian Blank]

I uploaded the following NMU.

Bastian

-- 
Earth -- mother of the most beautiful women in the universe.
		-- Apollo, "Who Mourns for Adonais?" stardate 3468.1
-------------- next part --------------
diff -u openldap2.3-2.4.7/debian/control openldap2.3-2.4.7/debian/control
--- openldap2.3-2.4.7/debian/control
+++ openldap2.3-2.4.7/debian/control
@@ -49,7 +49,7 @@
 Section: libs
 Priority: optional
 Architecture: any
-Conflicts: ldap-utils (<= 2.1.23-1)
+Conflicts: ldap-utils (<= 2.1.23-1), libldap2
 Depends: ${shlibs:Depends}
 Replaces: libldap2, libldap-2.3-0
 Description: OpenLDAP libraries 
diff -u openldap2.3-2.4.7/debian/slapd.manpages openldap2.3-2.4.7/debian/slapd.manpages
--- openldap2.3-2.4.7/debian/slapd.manpages
+++ openldap2.3-2.4.7/debian/slapd.manpages
@@ -1,39 +1,2 @@
-debian/tmp/usr/share/man/man5/slapd.access.5
-debian/tmp/usr/share/man/man5/slapd-hdb.5
-debian/tmp/usr/share/man/man5/slapd-meta.5
-debian/tmp/usr/share/man/man5/slapd-perl.5
-debian/tmp/usr/share/man/man5/slapd-shell.5
-debian/tmp/usr/share/man/man5/slapd-bdb.5
-debian/tmp/usr/share/man/man5/slapd-hdb.5
-debian/tmp/usr/share/man/man5/slapd-ldap.5
-debian/tmp/usr/share/man/man5/slapd-monitor.5
-debian/tmp/usr/share/man/man5/slapd.plugin.5
-debian/tmp/usr/share/man/man5/slapd-sql.5
-debian/tmp/usr/share/man/man5/slapd.conf.5
-debian/tmp/usr/share/man/man5/slapd-null.5
-debian/tmp/usr/share/man/man5/slapd-relay.5
-debian/tmp/usr/share/man/man5/slapd-dnssrv.5
-debian/tmp/usr/share/man/man5/slapd-ldif.5
-debian/tmp/usr/share/man/man5/slapd-passwd.5
-debian/tmp/usr/share/man/man5/slapo-accesslog.5
-debian/tmp/usr/share/man/man5/slapo-auditlog.5
-debian/tmp/usr/share/man/man5/slapo-chain.5
-debian/tmp/usr/share/man/man5/slapo-dynlist.5
-debian/tmp/usr/share/man/man5/slapo-pcache.5
-debian/tmp/usr/share/man/man5/slapo-ppolicy.5
-debian/tmp/usr/share/man/man5/slapo-refint.5
-debian/tmp/usr/share/man/man5/slapo-retcode.5
-debian/tmp/usr/share/man/man5/slapo-rwm.5
-debian/tmp/usr/share/man/man5/slapo-syncprov.5
-debian/tmp/usr/share/man/man5/slapo-translucent.5
-debian/tmp/usr/share/man/man5/slapo-unique.5
-debian/tmp/usr/share/man/man5/slapo-valsort.5
-debian/tmp/usr/share/man/man8/slapd.8
-debian/tmp/usr/share/man/man8/slapadd.8
-debian/tmp/usr/share/man/man8/slapcat.8
-debian/tmp/usr/share/man/man8/slapacl.8
-debian/tmp/usr/share/man/man8/slapauth.8
-debian/tmp/usr/share/man/man8/slapdn.8
-debian/tmp/usr/share/man/man8/slapindex.8
-debian/tmp/usr/share/man/man8/slappasswd.8
-debian/tmp/usr/share/man/man8/slaptest.8
+debian/tmp/usr/share/man/man5/slap*.5
+debian/tmp/usr/share/man/man8/slap*.8
diff -u openldap2.3-2.4.7/debian/changelog openldap2.3-2.4.7/debian/changelog
--- openldap2.3-2.4.7/debian/changelog
+++ openldap2.3-2.4.7/debian/changelog
@@ -1,3 +1,12 @@
+openldap2.3 (2.4.7-6.3) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Install all slapd relevant manpages into slapd package.
+    (closes: #474976)
+  * Make libldap-2.4-2 conflict against libldap2. (closes: #475856)
+
+ -- Bastian Blank <waldi at debian.org>  Tue, 29 Apr 2008 18:00:23 +0200
+
 openldap2.3 (2.4.7-6.2) unstable; urgency=low
 
    * Non-maintainer upload to solve release goal issues.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 197 bytes
Desc: Digital signature
Url : http://lists.alioth.debian.org/pipermail/pkg-openldap-devel/attachments/20080502/2ed3212c/attachment-0001.pgp