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

[vorlon at alioth.debian.org]

tags 596343 pending
thanks

Author: vorlon
Date: 2011-08-15 05:35:20 +0000 (Mon, 15 Aug 2011)
New Revision: 1367

Modified:
   openldap/trunk/debian/changelog
   openldap/trunk/debian/slapd.scripts-common
Log:
* Acknowledge NMU for bug #596343; thanks to Thijs Kinkhorst for the fix!
* Non-maintainer upload to fix RC bug.
* Fix "dpkg-reconfigure slapd". Closes: #596343

Modified: openldap/trunk/debian/changelog
===================================================================
--- openldap/trunk/debian/changelog	2011-04-16 18:13:09 UTC (rev 1366)
+++ openldap/trunk/debian/changelog	2011-08-15 05:35:20 UTC (rev 1367)
@@ -1,11 +1,19 @@
-openldap (2.4.25-2) unstable; urgency=low
+openldap (2.4.25-2) UNRELEASED; urgency=low
 
   * Change to bdb 5.1 (Closes: #621403)
   * Add note to ldap-utils package how to unfold lines. (Closes: #530519)
     (Thanks to Peter Marschall and Javier Barroso)
+  * Acknowledge NMU for bug #596343; thanks to Thijs Kinkhorst for the fix!
 
  -- Matthijs Möhlmann <matthijs at cacholong.nl>  Sat, 16 Apr 2011 14:40:51 +0200
 
+openldap (2.4.25-1.1) unstable; urgency=low
+
+  * Non-maintainer upload to fix RC bug.
+  * Fix "dpkg-reconfigure slapd". Closes: #596343
+
+ -- Thijs Kinkhorst <thijs at debian.org>  Tue, 31 May 2011 11:57:29 +0200
+
 openldap (2.4.25-1) unstable; urgency=low
 
   * New upstream version (Closes: #617606, #618904, #606815, #608813)

Modified: openldap/trunk/debian/slapd.scripts-common
===================================================================
--- openldap/trunk/debian/slapd.scripts-common	2011-04-16 18:13:09 UTC (rev 1366)
+++ openldap/trunk/debian/slapd.scripts-common	2011-08-15 05:35:20 UTC (rev 1367)
@@ -476,7 +476,8 @@
 	echo -n "  Creating initial configuration... " >&2
 
 	# Create the slapd.d directory.
-	mkdir ${SLAPD_CONF}
+	rm -rf ${SLAPD_CONF}/cn=config ${SLAPD_CONF}/cn=config.ldif
+	mkdir -p ${SLAPD_CONF}
 	initldif=`mktemp -t slapadd.XXXXXX`
 	cat /usr/share/slapd/slapd.init.ldif > ${initldif}