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

[matthijs at alioth.debian.org]

tags 452834 pending
tags 518660 pending
tags 518657 pending
thanks

Author: matthijs
Date: 2010-04-10 21:30:24 +0000 (Sat, 10 Apr 2010)
New Revision: 1250

Modified:
   openldap/trunk/debian/changelog
   openldap/trunk/debian/control
   openldap/trunk/debian/libldap-2.4-2.postinst
   openldap/trunk/debian/slapd.NEWS
   openldap/trunk/debian/slapd.scripts-common
   openldap/trunk/debian/slapd.templates
Log:
 * Update to 3.8.4 Standards-Version
 * Use the correct entry in the NEWS file.
 * Reword the template a bit.
 * Fix bashisms
 * Bail out on errors in postinst of libldap-2.4-2


Modified: openldap/trunk/debian/changelog
===================================================================
--- openldap/trunk/debian/changelog	2010-04-10 16:31:55 UTC (rev 1249)
+++ openldap/trunk/debian/changelog	2010-04-10 21:30:24 UTC (rev 1250)
@@ -7,8 +7,13 @@
 
   [ Matthijs Mohlmann ]
   * Ack NMU (Closes: #553432)
+  * Update Standards-Version to 3.8.4
+  * Fix NEWS entry to have the correct version number
+  * Improve the wording for the slapd/invalid_config question (Closes: #452834)
+  * Make lintian a bit more happy (Closes: #518660)
+  * Fix bashism (Closes: #518657)
 
- -- Matthijs Mohlmann <matthijs at cacholong.nl>  Sat, 10 Apr 2010 18:27:44 +0200
+ -- Matthijs Mohlmann <matthijs at cacholong.nl>  Sat, 10 Apr 2010 23:28:05 +0200
 
 openldap (2.4.17-2.1) unstable; urgency=high
 

Modified: openldap/trunk/debian/control
===================================================================
--- openldap/trunk/debian/control	2010-04-10 16:31:55 UTC (rev 1249)
+++ openldap/trunk/debian/control	2010-04-10 21:30:24 UTC (rev 1250)
@@ -14,7 +14,7 @@
  libwrap0-dev, perl, debconf-utils, po-debconf, quilt (>= 0.40),
  autotools-dev, libtool, automake, autoconf, groff-base, time
 Build-Conflicts: libbind-dev, bind-dev, libicu-dev
-Standards-Version: 3.8.2
+Standards-Version: 3.8.4
 Homepage: http://www.openldap.org/
 Vcs-Svn: svn://svn.debian.org/pkg-openldap/openldap/trunk
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-openldap/openldap/trunk

Modified: openldap/trunk/debian/libldap-2.4-2.postinst
===================================================================
--- openldap/trunk/debian/libldap-2.4-2.postinst	2010-04-10 16:31:55 UTC (rev 1249)
+++ openldap/trunk/debian/libldap-2.4-2.postinst	2010-04-10 21:30:24 UTC (rev 1250)
@@ -4,6 +4,8 @@
 # manually rather than letting dh_makeshlibs deal with it because
 # dh_makeshlibs can't cope with the trick we're pulling with libldap_r.
 
+set -e
+
 if [ "$1" = "configure" ]; then
     ldconfig
 fi

Modified: openldap/trunk/debian/slapd.NEWS
===================================================================
--- openldap/trunk/debian/slapd.NEWS	2010-04-10 16:31:55 UTC (rev 1249)
+++ openldap/trunk/debian/slapd.NEWS	2010-04-10 21:30:24 UTC (rev 1250)
@@ -1,4 +1,4 @@
-openldap2.3 (2.3.20-1) unstable; urgency=low
+openldap2.3 (2.3.23-1) unstable; urgency=low
 
    The Debian slapd package no longer includes support for the LDBM backend.
    It has been disabled as a result of concerns over data loss and lack of

Modified: openldap/trunk/debian/slapd.scripts-common
===================================================================
--- openldap/trunk/debian/slapd.scripts-common	2010-04-10 16:31:55 UTC (rev 1249)
+++ openldap/trunk/debian/slapd.scripts-common	2010-04-10 21:30:24 UTC (rev 1250)
@@ -642,7 +642,7 @@
 	# For the domain really.argh.org we create the basedn 
 	# dc=really,dc=argh,dc=org with the dc entry dc: really
 	db_get slapd/domain
-	local basedn="dc=`echo $RET | sed 's/^\.//; s/\./,dc=/g'`"
+	basedn="dc=`echo $RET | sed 's/^\.//; s/\./,dc=/g'`"
 	dc="`echo $RET | sed 's/^\.//; s/\..*$//'`"
 
 	db_get slapd/backend

Modified: openldap/trunk/debian/slapd.templates
===================================================================
--- openldap/trunk/debian/slapd.templates	2010-04-10 16:31:55 UTC (rev 1249)
+++ openldap/trunk/debian/slapd.templates	2010-04-10 21:30:24 UTC (rev 1250)
@@ -45,9 +45,10 @@
 Default: true
 _Description: Retry configuration?
  The configuration you entered is invalid. Make sure that the DNS domain name
- is syntactically valid, the organization is not left empty and the admin
- passwords match. If you decide not to retry the configuration the LDAP server
- will not be set up. Run 'dpkg-reconfigure slapd' if you want to retry later.
+ is syntactically valid, the field for the organization is not left empty and
+ the admin passwords match. If you decide not to retry the configuration the
+ LDAP server will not be set up. Run 'dpkg-reconfigure slapd' if you want to
+ retry later.
 
 Template: slapd/domain
 Type: string