[Pkg-openldap-devel] r865 - in openldap/trunk-2.3/debian: . po

[Russ Allbery]

Author: rra
Date: 2007-11-12 03:50:37 +0000 (Mon, 12 Nov 2007)
New Revision: 865

Modified:
   openldap/trunk-2.3/debian/changelog
   openldap/trunk-2.3/debian/po/cs.po
   openldap/trunk-2.3/debian/po/da.po
   openldap/trunk-2.3/debian/po/de.po
   openldap/trunk-2.3/debian/po/es.po
   openldap/trunk-2.3/debian/po/fr.po
   openldap/trunk-2.3/debian/po/gl.po
   openldap/trunk-2.3/debian/po/ja.po
   openldap/trunk-2.3/debian/po/nl.po
   openldap/trunk-2.3/debian/po/pt.po
   openldap/trunk-2.3/debian/po/pt_BR.po
   openldap/trunk-2.3/debian/po/ru.po
   openldap/trunk-2.3/debian/po/templates.pot
   openldap/trunk-2.3/debian/po/vi.po
   openldap/trunk-2.3/debian/slapd.config
   openldap/trunk-2.3/debian/slapd.postinst
   openldap/trunk-2.3/debian/slapd.preinst
   openldap/trunk-2.3/debian/slapd.prerm
   openldap/trunk-2.3/debian/slapd.scripts-common
   openldap/trunk-2.3/debian/slapd.templates
Log:
Revert removal of ldbm upgrade code to support old Ubuntu releases that
didn't enforce no ldbm backends.


Modified: openldap/trunk-2.3/debian/changelog
===================================================================
--- openldap/trunk-2.3/debian/changelog	2007-11-12 02:55:59 UTC (rev 864)
+++ openldap/trunk-2.3/debian/changelog	2007-11-12 03:50:37 UTC (rev 865)
@@ -16,13 +16,10 @@
   * Drop debconf questions, warnings, and maintainer script functions
     dealing with upgrades from OpenLDAP 2.1, which is now too hold for
     supported direct upgrades.  (Closes: #444806)
-  * Drop the code to check for and upgrade ldbm databases.  The etch
-    release of slapd had already dropped support for them and direct
-    upgrades from sarge are not supported.
   * Add a watch file.  Thanks, Fernando Ribeiro.  (Closes: #435290)
   * Add Homepage, Vcs-Svn, and Vcs-Browser control fields.
 
- -- Russ Allbery <rra at debian.org>  Sun, 11 Nov 2007 18:53:48 -0800
+ -- Russ Allbery <rra at debian.org>  Sun, 11 Nov 2007 19:48:05 -0800
 
 openldap2.3 (2.3.38-1) unstable; urgency=low
 

Modified: openldap/trunk-2.3/debian/po/cs.po
===================================================================
--- openldap/trunk-2.3/debian/po/cs.po	2007-11-12 02:55:59 UTC (rev 864)
+++ openldap/trunk-2.3/debian/po/cs.po	2007-11-12 03:50:37 UTC (rev 865)
@@ -15,7 +15,7 @@
 msgstr ""
 "Project-Id-Version: openldap2.3\n"
 "Report-Msgid-Bugs-To: pkg-openldap-devel at lists.alioth.debian.org\n"
-"POT-Creation-Date: 2007-11-11 18:54-0800\n"
+"POT-Creation-Date: 2007-11-11 19:49-0800\n"
 "PO-Revision-Date: 2006-05-14 07:01+0200\n"
 "Last-Translator: Miroslav Kure <kurem at debian.cz>\n"
 "Language-Team: Czech <debian-l10n-czech at lists.debian.org>\n"
@@ -341,15 +341,52 @@
 "souboru. Pokud se jedná o chybu v LDIF souboru, můžete jej zkusit opravit a "
 "zkusit slapadd znovu."
 
+#. Type: boolean
+#. Description
+#: ../slapd.templates:17001
+msgid "Change backend type from LDBM to BDB?"
+msgstr "Změnit typ backendu z LDBM na BDB?"
+
+#. Type: boolean
+#. Description
+#: ../slapd.templates:17001
+msgid ""
+"The LDBM backend type has been deprecated in OpenLDAP 2.2 and has shown to "
+"not work well. BDB is the recommended choice of the OpenLDAP developers."
+msgstr ""
+"Backend LDBM se ukázal jako nevyhovující a byl v OpenLDAPu 2.2 překonán. "
+"Vývojáři OpenLDAPu nyní doporučují backend BDB."
+
+#. Type: boolean
+#. Description
+#: ../slapd.templates:17001
+msgid ""
+"When using the BDB backend make sure you configure BDB properly. For "
+"information to do so, see /usr/share/doc/slapd/README.DB_CONFIG.gz"
+msgstr ""
+"Při použití backendu BDB se ujistěte, že jste jej nastavili správně. Více "
+"informací o správném nastavení naleznete v souboru /usr/share/doc/slapd/"
+"README.DB_CONFIG.gz."
+
+#. Type: boolean
+#. Description
+#: ../slapd.templates:17001
+msgid ""
+"If you enable this option an attempt will be made to update your "
+"configuration to use BDB instead of LDBM and convert your databases."
+msgstr ""
+"Povolíte-li tuto možnost, systém se pokusí změnit konfiguraci, aby místo "
+"LDBM používala BDB a příslušně také převést databáze."
+
 #. Type: select
 #. Description
-#: ../slapd.templates:17001
+#: ../slapd.templates:18001
 msgid "Database backend to use:"
 msgstr "Databázový backend:"
 
 #. Type: select
 #. Description
-#: ../slapd.templates:17001
+#: ../slapd.templates:18001
 msgid ""
 "The BDB backend is the recommended choice of the OpenLDAP developers. When "
 "using the BDB backend make sure that you configure the underlying database "
@@ -362,7 +399,7 @@
 
 #. Type: select
 #. Description
-#: ../slapd.templates:17001
+#: ../slapd.templates:18001
 msgid ""
 "HDB is the next generation of BDB which might replace it sometime in the "
 "future. There are some problems still in the HDB code of the 2.2 series of "
@@ -374,7 +411,7 @@
 
 #. Type: select
 #. Description
-#: ../slapd.templates:17001
+#: ../slapd.templates:18001
 msgid ""
 "The BDB backend (back-bdb) and LDBM backend (back-ldbm) are comparable in "
 "purpose and back-bdb evolved from experience gained from back-ldbm, but the "
@@ -474,29 +511,3 @@
 #~ "Počínaje verzí 2.1.23 slapd vyžaduje, aby měly podřízené databáze "
 #~ "nastavenu volbu updateref. Měli byste zajistit nápravu svého "
 #~ "konfiguračního souboru slapd.conf co nejdříve."
-
-#~ msgid "Change backend type from LDBM to BDB?"
-#~ msgstr "Změnit typ backendu z LDBM na BDB?"
-
-#~ msgid ""
-#~ "The LDBM backend type has been deprecated in OpenLDAP 2.2 and has shown "
-#~ "to not work well. BDB is the recommended choice of the OpenLDAP "
-#~ "developers."
-#~ msgstr ""
-#~ "Backend LDBM se ukázal jako nevyhovující a byl v OpenLDAPu 2.2 překonán. "
-#~ "Vývojáři OpenLDAPu nyní doporučují backend BDB."
-
-#~ msgid ""
-#~ "When using the BDB backend make sure you configure BDB properly. For "
-#~ "information to do so, see /usr/share/doc/slapd/README.DB_CONFIG.gz"
-#~ msgstr ""
-#~ "Při použití backendu BDB se ujistěte, že jste jej nastavili správně. Více "
-#~ "informací o správném nastavení naleznete v souboru /usr/share/doc/slapd/"
-#~ "README.DB_CONFIG.gz."
-
-#~ msgid ""
-#~ "If you enable this option an attempt will be made to update your "
-#~ "configuration to use BDB instead of LDBM and convert your databases."
-#~ msgstr ""
-#~ "Povolíte-li tuto možnost, systém se pokusí změnit konfiguraci, aby místo "
-#~ "LDBM používala BDB a příslušně také převést databáze."

Modified: openldap/trunk-2.3/debian/po/da.po
===================================================================
--- openldap/trunk-2.3/debian/po/da.po	2007-11-12 02:55:59 UTC (rev 864)
+++ openldap/trunk-2.3/debian/po/da.po	2007-11-12 03:50:37 UTC (rev 865)
@@ -15,7 +15,7 @@
 msgstr ""
 "Project-Id-Version: openldap2 debconf\n"
 "Report-Msgid-Bugs-To: pkg-openldap-devel at lists.alioth.debian.org\n"
-"POT-Creation-Date: 2007-11-11 18:54-0800\n"
+"POT-Creation-Date: 2007-11-11 19:49-0800\n"
 "PO-Revision-Date: 2006-05-13 10:30+0200\n"
 "Last-Translator: Claus Hindsgaul <claus.hindsgaul at gmail.com>\n"
 "Language-Team: Danish\n"
@@ -341,15 +341,53 @@
 "i LDIF-filen. Hvis problemet var i LDIF-filen, kan du måske rette det og "
 "prøve at køre slapadd igen."
 
+#. Type: boolean
+#. Description
+#: ../slapd.templates:17001
+msgid "Change backend type from LDBM to BDB?"
+msgstr "Skift bagendetype fra LDBM til BDB?"
+
+#. Type: boolean
+#. Description
+#: ../slapd.templates:17001
+msgid ""
+"The LDBM backend type has been deprecated in OpenLDAP 2.2 and has shown to "
+"not work well. BDB is the recommended choice of the OpenLDAP developers."
+msgstr ""
+"Bagendetypen LDBM anbefales ikke længere i OpenLDAP 2.2, og har vist sig "
+"ikke at fungere så godt. BDB anbefales i stedet af OpenLDAP-udviklerne."
+
+#. Type: boolean
+#. Description
+#: ../slapd.templates:17001
+msgid ""
+"When using the BDB backend make sure you configure BDB properly. For "
+"information to do so, see /usr/share/doc/slapd/README.DB_CONFIG.gz"
+msgstr ""
+"Når du benytter BDB-bagenden, skal du sørge for at sætte BDB korrekt op. Du "
+"finder oplysninger om, hvordan du gør dette, i /usr/share/doc/slapd/README."
+"DB_CONFIG.gz"
+
+#. Type: boolean
+#. Description
+#: ../slapd.templates:17001
+msgid ""
+"If you enable this option an attempt will be made to update your "
+"configuration to use BDB instead of LDBM and convert your databases."
+msgstr ""
+"Hvis du aktiverer denne indstilling, vil der blive gjort et forsøg på at "
+"opdatere din opsætning til at benytte BDB i stedet for LDBM, og konvertere "
+"dine databaser."
+
 #. Type: select
 #. Description
-#: ../slapd.templates:17001
+#: ../slapd.templates:18001
 msgid "Database backend to use:"
 msgstr "Database-bagende, der skal benyttes:"
 
 #. Type: select
 #. Description
-#: ../slapd.templates:17001
+#: ../slapd.templates:18001
 msgid ""
 "The BDB backend is the recommended choice of the OpenLDAP developers. When "
 "using the BDB backend make sure that you configure the underlying database "
@@ -361,7 +399,7 @@
 
 #. Type: select
 #. Description
-#: ../slapd.templates:17001
+#: ../slapd.templates:18001
 msgid ""
 "HDB is the next generation of BDB which might replace it sometime in the "
 "future. There are some problems still in the HDB code of the 2.2 series of "
@@ -373,7 +411,7 @@
 
 #. Type: select
 #. Description
-#: ../slapd.templates:17001
+#: ../slapd.templates:18001
 msgid ""
 "The BDB backend (back-bdb) and LDBM backend (back-ldbm) are comparable in "
 "purpose and back-bdb evolved from experience gained from back-ldbm, but the "
@@ -476,33 +514,6 @@
 #~ "Fra og med version 2.1.23 kræver slapd at updateref-indstillingen er sat "
 #~ "på slaver. Du må sørge for at rette din slapd.conf-opsætningsfil."
 
-#~ msgid "Change backend type from LDBM to BDB?"
-#~ msgstr "Skift bagendetype fra LDBM til BDB?"
-
-#~ msgid ""
-#~ "The LDBM backend type has been deprecated in OpenLDAP 2.2 and has shown "
-#~ "to not work well. BDB is the recommended choice of the OpenLDAP "
-#~ "developers."
-#~ msgstr ""
-#~ "Bagendetypen LDBM anbefales ikke længere i OpenLDAP 2.2, og har vist sig "
-#~ "ikke at fungere så godt. BDB anbefales i stedet af OpenLDAP-udviklerne."
-
-#~ msgid ""
-#~ "When using the BDB backend make sure you configure BDB properly. For "
-#~ "information to do so, see /usr/share/doc/slapd/README.DB_CONFIG.gz"
-#~ msgstr ""
-#~ "Når du benytter BDB-bagenden, skal du sørge for at sætte BDB korrekt op. "
-#~ "Du finder oplysninger om, hvordan du gør dette, i /usr/share/doc/slapd/"
-#~ "README.DB_CONFIG.gz"
-
-#~ msgid ""
-#~ "If you enable this option an attempt will be made to update your "
-#~ "configuration to use BDB instead of LDBM and convert your databases."
-#~ msgstr ""
-#~ "Hvis du aktiverer denne indstilling, vil der blive gjort et forsøg på at "
-#~ "opdatere din opsætning til at benytte BDB i stedet for LDBM, og "
-#~ "konvertere dine databaser."
-
 #~ msgid "Admin entry"
 #~ msgstr "Administratoropslaget"
 

Modified: openldap/trunk-2.3/debian/po/de.po
===================================================================
--- openldap/trunk-2.3/debian/po/de.po	2007-11-12 02:55:59 UTC (rev 864)
+++ openldap/trunk-2.3/debian/po/de.po	2007-11-12 03:50:37 UTC (rev 865)
@@ -15,7 +15,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: pkg-openldap-devel at lists.alioth.debian.org\n"
-"POT-Creation-Date: 2007-11-11 18:54-0800\n"
+"POT-Creation-Date: 2007-11-11 19:49-0800\n"
 "PO-Revision-Date: 2006-10-29 20:42+0100\n"
 "Last-Translator: Helge Kreutzmann <debian at helgefjell.de>\n"
 "Language-Team: de <debian-l10n-german at lists.debian.org>\n"
@@ -355,15 +355,53 @@
 "Datei. Falls das Problem mit der LDIF-Datei zusammenhing, könnten Sie in der "
 "Lage sein, es zu korrigieren und slappadd erneut zu versuchen."
 
+#. Type: boolean
+#. Description
+#: ../slapd.templates:17001
+msgid "Change backend type from LDBM to BDB?"
+msgstr "Backendtyp von LDBM auf BDB ändern?"
+
+#. Type: boolean
+#. Description
+#: ../slapd.templates:17001
+msgid ""
+"The LDBM backend type has been deprecated in OpenLDAP 2.2 and has shown to "
+"not work well. BDB is the recommended choice of the OpenLDAP developers."
+msgstr ""
+"Der LDBM-Backend-Typ wurde in OpenLDAP 2.2 missbilligt und hat gezeigt, dass "
+"er nicht gut arbeitet. BDB ist die empfohlene Wahl der OpenLDAP-Entwickler."
+
+#. Type: boolean
+#. Description
+#: ../slapd.templates:17001
+msgid ""
+"When using the BDB backend make sure you configure BDB properly. For "
+"information to do so, see /usr/share/doc/slapd/README.DB_CONFIG.gz"
+msgstr ""
+"Stellen Sie bei der Benutzung des BDB-Backends sicher, dass Sie BDB "
+"vernünftig konfigurieren. Für Informationen hierzu lesen Sie /usr/share/doc/"
+"slapd/README.DB_CONFIG.gz."
+
+#. Type: boolean
+#. Description
+#: ../slapd.templates:17001
+msgid ""
+"If you enable this option an attempt will be made to update your "
+"configuration to use BDB instead of LDBM and convert your databases."
+msgstr ""
+"Falls Sie diese Option aktivieren, wird ein Versuch durchgeführt, Ihre "
+"Konfiguration zu aktualiseren, um BDB anstatt LDBM zu verwenden und Ihre "
+"Datenbank zu konvertieren."
+
 #. Type: select
 #. Description
-#: ../slapd.templates:17001
+#: ../slapd.templates:18001
 msgid "Database backend to use:"
 msgstr "Zu verwendendes Datenbank-Backend:"
 
 #. Type: select
 #. Description
-#: ../slapd.templates:17001
+#: ../slapd.templates:18001
 msgid ""
 "The BDB backend is the recommended choice of the OpenLDAP developers. When "
 "using the BDB backend make sure that you configure the underlying database "
@@ -376,7 +414,7 @@
 
 #. Type: select
 #. Description
-#: ../slapd.templates:17001
+#: ../slapd.templates:18001
 msgid ""
 "HDB is the next generation of BDB which might replace it sometime in the "
 "future. There are some problems still in the HDB code of the 2.2 series of "
@@ -389,7 +427,7 @@
 
 #. Type: select
 #. Description
-#: ../slapd.templates:17001
+#: ../slapd.templates:18001
 msgid ""
 "The BDB backend (back-bdb) and LDBM backend (back-ldbm) are comparable in "
 "purpose and back-bdb evolved from experience gained from back-ldbm, but the "
@@ -499,33 +537,5 @@
 #~ "für Slaves gesetzt ist. Sie sollten sicherstellen, dass Sie Ihre slapd."
 #~ "conf-Konfigurationsdatei korrigieren."
 
-#~ msgid "Change backend type from LDBM to BDB?"
-#~ msgstr "Backendtyp von LDBM auf BDB ändern?"
-
-#~ msgid ""
-#~ "The LDBM backend type has been deprecated in OpenLDAP 2.2 and has shown "
-#~ "to not work well. BDB is the recommended choice of the OpenLDAP "
-#~ "developers."
-#~ msgstr ""
-#~ "Der LDBM-Backend-Typ wurde in OpenLDAP 2.2 missbilligt und hat gezeigt, "
-#~ "dass er nicht gut arbeitet. BDB ist die empfohlene Wahl der OpenLDAP-"
-#~ "Entwickler."
-
-#~ msgid ""
-#~ "When using the BDB backend make sure you configure BDB properly. For "
-#~ "information to do so, see /usr/share/doc/slapd/README.DB_CONFIG.gz"
-#~ msgstr ""
-#~ "Stellen Sie bei der Benutzung des BDB-Backends sicher, dass Sie BDB "
-#~ "vernünftig konfigurieren. Für Informationen hierzu lesen Sie /usr/share/"
-#~ "doc/slapd/README.DB_CONFIG.gz."
-
-#~ msgid ""
-#~ "If you enable this option an attempt will be made to update your "
-#~ "configuration to use BDB instead of LDBM and convert your databases."
-#~ msgstr ""
-#~ "Falls Sie diese Option aktivieren, wird ein Versuch durchgeführt, Ihre "
-#~ "Konfiguration zu aktualiseren, um BDB anstatt LDBM zu verwenden und Ihre "
-#~ "Datenbank zu konvertieren."
-
 #~ msgid "Verify password"
 #~ msgstr "Passwort bestätigen:"

Modified: openldap/trunk-2.3/debian/po/es.po
===================================================================
--- openldap/trunk-2.3/debian/po/es.po	2007-11-12 02:55:59 UTC (rev 864)
+++ openldap/trunk-2.3/debian/po/es.po	2007-11-12 03:50:37 UTC (rev 865)
@@ -32,7 +32,7 @@
 msgstr ""
 "Project-Id-Version: openldap 2.3.30\n"
 "Report-Msgid-Bugs-To: pkg-openldap-devel at lists.alioth.debian.org\n"
-"POT-Creation-Date: 2007-11-11 18:54-0800\n"
+"POT-Creation-Date: 2007-11-11 19:49-0800\n"
 "PO-Revision-Date: 2006-12-22 14:01-0500\n"
 "Last-Translator: Rudy Godoy <rudy at kernel-panik.org>\n"
 "Language-Team: Debian l10n Spanish <debian-l10n-spanish at lists.debian.org>\n"
@@ -366,15 +366,52 @@
 "puede que sea capaz de arreglarlo y volver a intentar la ejecución de "
 "slapadd."
 
+#. Type: boolean
+#. Description
+#: ../slapd.templates:17001
+msgid "Change backend type from LDBM to BDB?"
+msgstr "¿Desea cambiar el tipo de motor de LDBM a BDB?"
+
+#. Type: boolean
+#. Description
+#: ../slapd.templates:17001
+msgid ""
+"The LDBM backend type has been deprecated in OpenLDAP 2.2 and has shown to "
+"not work well. BDB is the recommended choice of the OpenLDAP developers."
+msgstr ""
+"El motor de tipo LDBM ha quedado obsoleto en OpenLDAP 2.2 y se ha demostrado "
+"de que mo funciona bien. BDB es la opción recomendada por los "
+"desarrolladores de OpenLDAP."
+
+#. Type: boolean
+#. Description
+#: ../slapd.templates:17001
+msgid ""
+"When using the BDB backend make sure you configure BDB properly. For "
+"information to do so, see /usr/share/doc/slapd/README.DB_CONFIG.gz"
+msgstr ""
+"Cuando use el motor BDB asegúrese de configurar BDB adecuadamente. Véase /"
+"usr/share/doc/slapd/README.DB_CONFIG.gz para información sobre como hacerlo."
+
+#. Type: boolean
+#. Description
+#: ../slapd.templates:17001
+msgid ""
+"If you enable this option an attempt will be made to update your "
+"configuration to use BDB instead of LDBM and convert your databases."
+msgstr ""
+"Si habilita esta opción se intentará actualizar su configuración para "
+"utilizar BDB en lugar de LDBM y convertir sus bases de datos."
+
 #. Type: select
 #. Description
-#: ../slapd.templates:17001
+#: ../slapd.templates:18001
 msgid "Database backend to use:"
 msgstr "Motor de base de datos a utilizar:"
 
 #. Type: select
 #. Description
-#: ../slapd.templates:17001
+#: ../slapd.templates:18001
 msgid ""
 "The BDB backend is the recommended choice of the OpenLDAP developers. When "
 "using the BDB backend make sure that you configure the underlying database "
@@ -387,7 +424,7 @@
 
 #. Type: select
 #. Description
-#: ../slapd.templates:17001
+#: ../slapd.templates:18001
 msgid ""
 "HDB is the next generation of BDB which might replace it sometime in the "
 "future. There are some problems still in the HDB code of the 2.2 series of "
@@ -400,7 +437,7 @@
 
 #. Type: select
 #. Description
-#: ../slapd.templates:17001
+#: ../slapd.templates:18001
 msgid ""
 "The BDB backend (back-bdb) and LDBM backend (back-ldbm) are comparable in "
 "purpose and back-bdb evolved from experience gained from back-ldbm, but the "
@@ -509,30 +546,3 @@
 #~ "A partir de la versión 2.1.23 es necesario definir la opción «updateref» "
 #~ "en los directorios de réplica. Debe asegurarse de corregir su fichero de "
 #~ "configuración slapd.conf."
-
-#~ msgid "Change backend type from LDBM to BDB?"
-#~ msgstr "¿Desea cambiar el tipo de motor de LDBM a BDB?"
-
-#~ msgid ""
-#~ "The LDBM backend type has been deprecated in OpenLDAP 2.2 and has shown "
-#~ "to not work well. BDB is the recommended choice of the OpenLDAP "
-#~ "developers."
-#~ msgstr ""
-#~ "El motor de tipo LDBM ha quedado obsoleto en OpenLDAP 2.2 y se ha "
-#~ "demostrado de que mo funciona bien. BDB es la opción recomendada por los "
-#~ "desarrolladores de OpenLDAP."
-
-#~ msgid ""
-#~ "When using the BDB backend make sure you configure BDB properly. For "
-#~ "information to do so, see /usr/share/doc/slapd/README.DB_CONFIG.gz"
-#~ msgstr ""
-#~ "Cuando use el motor BDB asegúrese de configurar BDB adecuadamente. Véase /"
-#~ "usr/share/doc/slapd/README.DB_CONFIG.gz para información sobre como "
-#~ "hacerlo."
-
-#~ msgid ""
-#~ "If you enable this option an attempt will be made to update your "
-#~ "configuration to use BDB instead of LDBM and convert your databases."
-#~ msgstr ""
-#~ "Si habilita esta opción se intentará actualizar su configuración para "
-#~ "utilizar BDB en lugar de LDBM y convertir sus bases de datos."

Modified: openldap/trunk-2.3/debian/po/fr.po
===================================================================
--- openldap/trunk-2.3/debian/po/fr.po	2007-11-12 02:55:59 UTC (rev 864)
+++ openldap/trunk-2.3/debian/po/fr.po	2007-11-12 03:50:37 UTC (rev 865)
@@ -17,7 +17,7 @@
 msgstr ""
 "Project-Id-Version: fr\n"
 "Report-Msgid-Bugs-To: pkg-openldap-devel at lists.alioth.debian.org\n"
-"POT-Creation-Date: 2007-11-11 18:54-0800\n"
+"POT-Creation-Date: 2007-11-11 19:49-0800\n"
 "PO-Revision-Date: 2006-05-12 22:28+0200\n"
 "Last-Translator: Christian Perrier <bubulle at debian.org>\n"
 "Language-Team: French <debian-l10n-french at lists.debian.org>\n"
@@ -353,15 +353,54 @@
 "LDIF. Dans ce dernier cas, il est possible de corriger ce fichier et tenter "
 "l'opération à nouveau."
 
+#. Type: boolean
+#. Description
+#: ../slapd.templates:17001
+msgid "Change backend type from LDBM to BDB?"
+msgstr "Faut-il remplacer LDBM par BDB comme module de base de données ?"
+
+#. Type: boolean
+#. Description
+#: ../slapd.templates:17001
+msgid ""
+"The LDBM backend type has been deprecated in OpenLDAP 2.2 and has shown to "
+"not work well. BDB is the recommended choice of the OpenLDAP developers."
+msgstr ""
+"Le module de base de données LDBM est considéré comme obsolète dans OpenLDAP "
+"2.2. Il a été confirmé qu'il ne fonctionne pas toujours correctement. Pour "
+"cette raison, BDB est le module recommandé par les développeurs d'OpenLDAP."
+
+#. Type: boolean
+#. Description
+#: ../slapd.templates:17001
+msgid ""
+"When using the BDB backend make sure you configure BDB properly. For "
+"information to do so, see /usr/share/doc/slapd/README.DB_CONFIG.gz"
+msgstr ""
+"Si vous utilisez le module BDB, veillez à ce qu'il soit configuré "
+"correctement. Pour plus d'informations, veuillez consulter le fichier /usr/"
+"share/doc/slapd/README.DB_CONFIG.gz."
+
+#. Type: boolean
+#. Description
+#: ../slapd.templates:17001
+msgid ""
+"If you enable this option an attempt will be made to update your "
+"configuration to use BDB instead of LDBM and convert your databases."
+msgstr ""
+"Si vous choisissez cette option, les scripts d'installation tenteront de "
+"mettre à jour votre configuration et de convertir vos bases de données pour "
+"qu'elles utilisent BDB à la place de LDBM."
+
 #. Type: select
 #. Description
-#: ../slapd.templates:17001
+#: ../slapd.templates:18001
 msgid "Database backend to use:"
 msgstr "Module de base de données à utiliser :"
 
 #. Type: select
 #. Description
-#: ../slapd.templates:17001
+#: ../slapd.templates:18001
 msgid ""
 "The BDB backend is the recommended choice of the OpenLDAP developers. When "
 "using the BDB backend make sure that you configure the underlying database "
@@ -373,7 +412,7 @@
 
 #. Type: select
 #. Description
-#: ../slapd.templates:17001
+#: ../slapd.templates:18001
 msgid ""
 "HDB is the next generation of BDB which might replace it sometime in the "
 "future. There are some problems still in the HDB code of the 2.2 series of "
@@ -385,7 +424,7 @@
 
 #. Type: select
 #. Description
-#: ../slapd.templates:17001
+#: ../slapd.templates:18001
 msgid ""
 "The BDB backend (back-bdb) and LDBM backend (back-ldbm) are comparable in "
 "purpose and back-bdb evolved from experience gained from back-ldbm, but the "
@@ -498,32 +537,3 @@
 #~ "À partir de la version 2.1.23, splad a besoin de cette option sur les "
 #~ "serveurs esclaves. Veuillez adapter en conséquence votre fichier de "
 #~ "configuration."
-
-#~ msgid "Change backend type from LDBM to BDB?"
-#~ msgstr "Faut-il remplacer LDBM par BDB comme module de base de données ?"
-
-#~ msgid ""
-#~ "The LDBM backend type has been deprecated in OpenLDAP 2.2 and has shown "
-#~ "to not work well. BDB is the recommended choice of the OpenLDAP "
-#~ "developers."
-#~ msgstr ""
-#~ "Le module de base de données LDBM est considéré comme obsolète dans "
-#~ "OpenLDAP 2.2. Il a été confirmé qu'il ne fonctionne pas toujours "
-#~ "correctement. Pour cette raison, BDB est le module recommandé par les "
-#~ "développeurs d'OpenLDAP."
-
-#~ msgid ""
-#~ "When using the BDB backend make sure you configure BDB properly. For "
-#~ "information to do so, see /usr/share/doc/slapd/README.DB_CONFIG.gz"
-#~ msgstr ""
-#~ "Si vous utilisez le module BDB, veillez à ce qu'il soit configuré "
-#~ "correctement. Pour plus d'informations, veuillez consulter le fichier /"
-#~ "usr/share/doc/slapd/README.DB_CONFIG.gz."
-
-#~ msgid ""
-#~ "If you enable this option an attempt will be made to update your "
-#~ "configuration to use BDB instead of LDBM and convert your databases."
-#~ msgstr ""
-#~ "Si vous choisissez cette option, les scripts d'installation tenteront de "
-#~ "mettre à jour votre configuration et de convertir vos bases de données "
-#~ "pour qu'elles utilisent BDB à la place de LDBM."

Modified: openldap/trunk-2.3/debian/po/gl.po
===================================================================
--- openldap/trunk-2.3/debian/po/gl.po	2007-11-12 02:55:59 UTC (rev 864)
+++ openldap/trunk-2.3/debian/po/gl.po	2007-11-12 03:50:37 UTC (rev 865)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: openldap2.3\n"
 "Report-Msgid-Bugs-To: pkg-openldap-devel at lists.alioth.debian.org\n"
-"POT-Creation-Date: 2007-11-11 18:54-0800\n"
+"POT-Creation-Date: 2007-11-11 19:49-0800\n"
 "PO-Revision-Date: 2007-01-17 10:34+0100\n"
 "Last-Translator: Jacobo Tarrio <jtarrio at debian.org>\n"
 "Language-Team: Galician <proxecto at trasno.net>\n"
@@ -334,15 +334,53 @@
 "slapcat) ou debido a un problema no ficheiro LDIF. Se o problema está no "
 "ficheiro LDIF podería arranxarse e tentar outra vez a execución de slapadd."
 
+#. Type: boolean
+#. Description
+#: ../slapd.templates:17001
+msgid "Change backend type from LDBM to BDB?"
+msgstr "¿Cambiar o tipo de motor de LDBM a BDB?"
+
+#. Type: boolean
+#. Description
+#: ../slapd.templates:17001
+msgid ""
+"The LDBM backend type has been deprecated in OpenLDAP 2.2 and has shown to "
+"not work well. BDB is the recommended choice of the OpenLDAP developers."
+msgstr ""
+"O tipo de motor LDBM marcouse a extinguir en OpenLDAP 2.2 e comprobouse que "
+"non funciona ben. BDB é a opción recomendada polos desenvolvedores de "
+"OpenLDAP."
+
+#. Type: boolean
+#. Description
+#: ../slapd.templates:17001
+msgid ""
+"When using the BDB backend make sure you configure BDB properly. For "
+"information to do so, see /usr/share/doc/slapd/README.DB_CONFIG.gz"
+msgstr ""
+"Se emprega o motor BDB asegúrese de configurar BDB correctamente. Para máis "
+"información sobre como o facer, consulte /usr/share/doc/slapd/README."
+"DB_CONFIG.gz"
+
+#. Type: boolean
+#. Description
+#: ../slapd.templates:17001
+msgid ""
+"If you enable this option an attempt will be made to update your "
+"configuration to use BDB instead of LDBM and convert your databases."
+msgstr ""
+"Se activa esta opción hase tentar actualizar a súa configuración para "
+"empregar BDB no canto de LDBM e converter as bases de datos."
+
 #. Type: select
 #. Description
-#: ../slapd.templates:17001
+#: ../slapd.templates:18001
 msgid "Database backend to use:"
 msgstr "Motor de base de datos a empregar:"
 
 #. Type: select
 #. Description
-#: ../slapd.templates:17001
+#: ../slapd.templates:18001
 msgid ""
 "The BDB backend is the recommended choice of the OpenLDAP developers. When "
 "using the BDB backend make sure that you configure the underlying database "
@@ -354,7 +392,7 @@
 
 #. Type: select
 #. Description
-#: ../slapd.templates:17001
+#: ../slapd.templates:18001
 msgid ""
 "HDB is the next generation of BDB which might replace it sometime in the "
 "future. There are some problems still in the HDB code of the 2.2 series of "
@@ -366,7 +404,7 @@
 
 #. Type: select
 #. Description
-#: ../slapd.templates:17001
+#: ../slapd.templates:18001
 msgid ""
 "The BDB backend (back-bdb) and LDBM backend (back-ldbm) are comparable in "
 "purpose and back-bdb evolved from experience gained from back-ldbm, but the "
@@ -470,30 +508,3 @@
 #~ "A partires da versión 2.1.23, slapd precisa de que se especifique a "
 #~ "opción updateref nos escravos. Debería asegurarse de arranxar o ficheiro "
 #~ "de configuración slapd.conf."
-
-#~ msgid "Change backend type from LDBM to BDB?"
-#~ msgstr "¿Cambiar o tipo de motor de LDBM a BDB?"
-
-#~ msgid ""
-#~ "The LDBM backend type has been deprecated in OpenLDAP 2.2 and has shown "
-#~ "to not work well. BDB is the recommended choice of the OpenLDAP "
-#~ "developers."
-#~ msgstr ""
-#~ "O tipo de motor LDBM marcouse a extinguir en OpenLDAP 2.2 e comprobouse "
-#~ "que non funciona ben. BDB é a opción recomendada polos desenvolvedores de "
-#~ "OpenLDAP."
-
-#~ msgid ""
-#~ "When using the BDB backend make sure you configure BDB properly. For "
-#~ "information to do so, see /usr/share/doc/slapd/README.DB_CONFIG.gz"
-#~ msgstr ""
-#~ "Se emprega o motor BDB asegúrese de configurar BDB correctamente. Para "
-#~ "máis información sobre como o facer, consulte /usr/share/doc/slapd/README."
-#~ "DB_CONFIG.gz"
-
-#~ msgid ""
-#~ "If you enable this option an attempt will be made to update your "
-#~ "configuration to use BDB instead of LDBM and convert your databases."
-#~ msgstr ""
-#~ "Se activa esta opción hase tentar actualizar a súa configuración para "
-#~ "empregar BDB no canto de LDBM e converter as bases de datos."

Modified: openldap/trunk-2.3/debian/po/ja.po
===================================================================
--- openldap/trunk-2.3/debian/po/ja.po	2007-11-12 02:55:59 UTC (rev 864)
+++ openldap/trunk-2.3/debian/po/ja.po	2007-11-12 03:50:37 UTC (rev 865)
@@ -15,7 +15,7 @@
 msgstr ""
 "Project-Id-Version: openldap2.3\n"
 "Report-Msgid-Bugs-To: pkg-openldap-devel at lists.alioth.debian.org\n"
-"POT-Creation-Date: 2007-11-11 18:54-0800\n"
+"POT-Creation-Date: 2007-11-11 19:49-0800\n"
 "PO-Revision-Date: 2006-07-17 22:38+0900\n"
 "Last-Translator: Kenshi Muto <kmuto at debian.org>\n"
 "Language-Team: Japanese <debian-japanese at lists.debian.org>\n"
@@ -340,15 +340,52 @@
 "す。もし LDIF ファイルに問題があるなら、それを修正して slapadd を再び試みるこ"
 "とができます。"
 
+#. Type: boolean
+#. Description
+#: ../slapd.templates:17001
+msgid "Change backend type from LDBM to BDB?"
+msgstr "バックエンドの形式を LDBM から BDB に変更しますか?"
+
+#. Type: boolean
+#. Description
+#: ../slapd.templates:17001
+msgid ""
+"The LDBM backend type has been deprecated in OpenLDAP 2.2 and has shown to "
+"not work well. BDB is the recommended choice of the OpenLDAP developers."
+msgstr ""
+"LDBM バックエンド形式は OpenLDAP 2.2 で時代遅れのものとなり、うまく動かなく"
+"なっています。BDB が OpenLDAP 開発者の推奨する選択肢です。"
+
+#. Type: boolean
+#. Description
+#: ../slapd.templates:17001
+msgid ""
+"When using the BDB backend make sure you configure BDB properly. For "
+"information to do so, see /usr/share/doc/slapd/README.DB_CONFIG.gz"
+msgstr ""
+"BDB バックエンドを利用するときには、BDB を正しく設定する必要があることに注意"
+"ã—ã¦ãã ã•ã„ã€‚æ–¹æ³•ã®è©³ç´°ãªæƒ…å ±ã«ã¤ã„ã¦ã¯ã€/usr/share/doc/slapd/README."
+"DB_CONFIG.gz を参照してください。"
+
+#. Type: boolean
+#. Description
+#: ../slapd.templates:17001
+msgid ""
+"If you enable this option an attempt will be made to update your "
+"configuration to use BDB instead of LDBM and convert your databases."
+msgstr ""
+"この選択肢に「はい」と答えると、LDBM の代わりに BDB を使うように設定を更新し"
+"てデータベースを変換することが試みられます。"
+
 #. Type: select
 #. Description
-#: ../slapd.templates:17001
+#: ../slapd.templates:18001
 msgid "Database backend to use:"
 msgstr "利用するデータベースバックエンド:"
 
 #. Type: select
 #. Description
-#: ../slapd.templates:17001
+#: ../slapd.templates:18001
 msgid ""
 "The BDB backend is the recommended choice of the OpenLDAP developers. When "
 "using the BDB backend make sure that you configure the underlying database "
@@ -360,7 +397,7 @@
 
 #. Type: select
 #. Description
-#: ../slapd.templates:17001
+#: ../slapd.templates:18001
 msgid ""
 "HDB is the next generation of BDB which might replace it sometime in the "
 "future. There are some problems still in the HDB code of the 2.2 series of "
@@ -372,7 +409,7 @@
 
 #. Type: select
 #. Description
-#: ../slapd.templates:17001
+#: ../slapd.templates:18001
 msgid ""
 "The BDB backend (back-bdb) and LDBM backend (back-ldbm) are comparable in "
 "purpose and back-bdb evolved from experience gained from back-ldbm, but the "
@@ -470,29 +507,3 @@
 #~ msgstr ""
 #~ "バージョン 2.1.23 から、slapd は updateref オプションをスレーブに設定する"
 #~ "必要があります。あなたの slapd.conf 設定ファイルの修正を確認してください。"
-
-#~ msgid "Change backend type from LDBM to BDB?"
-#~ msgstr "バックエンドの形式を LDBM から BDB に変更しますか?"
-
-#~ msgid ""
-#~ "The LDBM backend type has been deprecated in OpenLDAP 2.2 and has shown "
-#~ "to not work well. BDB is the recommended choice of the OpenLDAP "
-#~ "developers."
-#~ msgstr ""
-#~ "LDBM バックエンド形式は OpenLDAP 2.2 で時代遅れのものとなり、うまく動かな"
-#~ "くなっています。BDB が OpenLDAP 開発者の推奨する選択肢です。"
-
-#~ msgid ""
-#~ "When using the BDB backend make sure you configure BDB properly. For "
-#~ "information to do so, see /usr/share/doc/slapd/README.DB_CONFIG.gz"
-#~ msgstr ""
-#~ "BDB バックエンドを利用するときには、BDB を正しく設定する必要があることに注"
-#~ "æ„ã—ã¦ãã ã•ã„ã€‚æ–¹æ³•ã®è©³ç´°ãªæƒ…å ±ã«ã¤ã„ã¦ã¯ã€/usr/share/doc/slapd/README."
-#~ "DB_CONFIG.gz を参照してください。"
-
-#~ msgid ""
-#~ "If you enable this option an attempt will be made to update your "
-#~ "configuration to use BDB instead of LDBM and convert your databases."
-#~ msgstr ""
-#~ "この選択肢に「はい」と答えると、LDBM の代わりに BDB を使うように設定を更新"
-#~ "してデータベースを変換することが試みられます。"

Modified: openldap/trunk-2.3/debian/po/nl.po
===================================================================
--- openldap/trunk-2.3/debian/po/nl.po	2007-11-12 02:55:59 UTC (rev 864)
+++ openldap/trunk-2.3/debian/po/nl.po	2007-11-12 03:50:37 UTC (rev 865)
@@ -15,7 +15,7 @@
 msgstr ""
 "Project-Id-Version: openldap2\n"
 "Report-Msgid-Bugs-To: pkg-openldap-devel at lists.alioth.debian.org\n"
-"POT-Creation-Date: 2007-11-11 18:54-0800\n"
+"POT-Creation-Date: 2007-11-11 19:49-0800\n"
 "PO-Revision-Date: 2006-07-18 12:24+0100\n"
 "Last-Translator: Bart Cornelis <cobaco at skolelinux.no>\n"
 "Language-Team: debian-l10n-dutch <debian-l10n-dutch at lists.debian.org>\n"
@@ -347,15 +347,54 @@
 "een probleem in het LDIF-bestand. Als het probleem in het LDIF-bestand zit "
 "kunt u dit misschien repareren en daarna slapadd nogmaals proberen uitvoeren."
 
+#. Type: boolean
+#. Description
+#: ../slapd.templates:17001
+msgid "Change backend type from LDBM to BDB?"
+msgstr "Wilt u het backendtype veranderen van LDBM naar BDB?"
+
+#. Type: boolean
+#. Description
+#: ../slapd.templates:17001
+msgid ""
+"The LDBM backend type has been deprecated in OpenLDAP 2.2 and has shown to "
+"not work well. BDB is the recommended choice of the OpenLDAP developers."
+msgstr ""
+"Het LDBM-backendtype is verouderd voor OpenLDAP 2.2 en werkt aantoonbaar "
+"niet goed. BDB is de keuze die door de OpenLDAP-ontwikkelaars aangeraden "
+"wordt."
+
+#. Type: boolean
+#. Description
+#: ../slapd.templates:17001
+msgid ""
+"When using the BDB backend make sure you configure BDB properly. For "
+"information to do so, see /usr/share/doc/slapd/README.DB_CONFIG.gz"
+msgstr ""
+"Wanneer u gebruik maakt van de BDB-backend dient u ervoor te zorgen dat BDB "
+"juist ingesteld is. Meer informatie hierover vindt u in /usr/share/doc/slapd/"
+"README.DB_CONFIG.gz"
+
+#. Type: boolean
+#. Description
+#: ../slapd.templates:17001
+msgid ""
+"If you enable this option an attempt will be made to update your "
+"configuration to use BDB instead of LDBM and convert your databases."
+msgstr ""
+"Wanneer u deze optie kiest zal er een poging gewaagd worden om uw "
+"configuratie aan te passen om BDB te gebruiken i.p.v. LDBM, en om uw "
+"databases te converteren."
+
 #. Type: select
 #. Description
-#: ../slapd.templates:17001
+#: ../slapd.templates:18001
 msgid "Database backend to use:"
 msgstr "Welk database-backend wilt u gebruiken?"
 
 #. Type: select
 #. Description
-#: ../slapd.templates:17001
+#: ../slapd.templates:18001
 msgid ""
 "The BDB backend is the recommended choice of the OpenLDAP developers. When "
 "using the BDB backend make sure that you configure the underlying database "
@@ -368,7 +407,7 @@
 
 #. Type: select
 #. Description
-#: ../slapd.templates:17001
+#: ../slapd.templates:18001
 msgid ""
 "HDB is the next generation of BDB which might replace it sometime in the "
 "future. There are some problems still in the HDB code of the 2.2 series of "
@@ -381,7 +420,7 @@
 
 #. Type: select
 #. Description
-#: ../slapd.templates:17001
+#: ../slapd.templates:18001
 msgid ""
 "The BDB backend (back-bdb) and LDBM backend (back-ldbm) are comparable in "
 "purpose and back-bdb evolved from experience gained from back-ldbm, but the "
@@ -488,31 +527,3 @@
 #~ "Vanaf versie 2.1.23 vereist slapd dat de 'updateref'-optie geactiveerd is "
 #~ "voor slaaf-databases. U dient dit aan te passen in uw slapd.conf "
 #~ "configuratiebestand."
-
-#~ msgid "Change backend type from LDBM to BDB?"
-#~ msgstr "Wilt u het backendtype veranderen van LDBM naar BDB?"
-
-#~ msgid ""
-#~ "The LDBM backend type has been deprecated in OpenLDAP 2.2 and has shown "
-#~ "to not work well. BDB is the recommended choice of the OpenLDAP "
-#~ "developers."
-#~ msgstr ""
-#~ "Het LDBM-backendtype is verouderd voor OpenLDAP 2.2 en werkt aantoonbaar "
-#~ "niet goed. BDB is de keuze die door de OpenLDAP-ontwikkelaars aangeraden "
-#~ "wordt."
-
-#~ msgid ""
-#~ "When using the BDB backend make sure you configure BDB properly. For "
-#~ "information to do so, see /usr/share/doc/slapd/README.DB_CONFIG.gz"
-#~ msgstr ""
-#~ "Wanneer u gebruik maakt van de BDB-backend dient u ervoor te zorgen dat "
-#~ "BDB juist ingesteld is. Meer informatie hierover vindt u in /usr/share/"
-#~ "doc/slapd/README.DB_CONFIG.gz"
-
-#~ msgid ""
-#~ "If you enable this option an attempt will be made to update your "
-#~ "configuration to use BDB instead of LDBM and convert your databases."
-#~ msgstr ""
-#~ "Wanneer u deze optie kiest zal er een poging gewaagd worden om uw "
-#~ "configuratie aan te passen om BDB te gebruiken i.p.v. LDBM, en om uw "
-#~ "databases te converteren."

Modified: openldap/trunk-2.3/debian/po/pt.po
===================================================================
--- openldap/trunk-2.3/debian/po/pt.po	2007-11-12 02:55:59 UTC (rev 864)
+++ openldap/trunk-2.3/debian/po/pt.po	2007-11-12 03:50:37 UTC (rev 865)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: openldap2.3 2.3.30-2\n"
 "Report-Msgid-Bugs-To: pkg-openldap-devel at lists.alioth.debian.org\n"
-"POT-Creation-Date: 2007-11-11 18:54-0800\n"
+"POT-Creation-Date: 2007-11-11 19:49-0800\n"
 "PO-Revision-Date: 2007-02-19 15:27+0000\n"
 "Last-Translator: Tiago Fernandes <tjg.fernandes at gmail.com>\n"
 "Language-Team: Portuguese <traduz at debianpt.org>\n"
@@ -340,15 +340,52 @@
 "slapcat também falharia) ou devido a um problema no ficheiro LDIF. Se o "
 "problema foi com o ficheiro LDIF, pode corrigi-lo e tentar o slapadd de novo."
 
+#. Type: boolean
+#. Description
+#: ../slapd.templates:17001
+msgid "Change backend type from LDBM to BDB?"
+msgstr "Mudar o tipo de backend de LDBM para BDB?"
+
+#. Type: boolean
+#. Description
+#: ../slapd.templates:17001
+msgid ""
+"The LDBM backend type has been deprecated in OpenLDAP 2.2 and has shown to "
+"not work well. BDB is the recommended choice of the OpenLDAP developers."
+msgstr ""
+"O tipo de backend LDBM deixou de ser usado no OpenLDAP 2.2 e demonstrou que "
+"não funciona bem. BDB é a escolha recomendada dos developers do OpenLDAP."
+
+#. Type: boolean
+#. Description
+#: ../slapd.templates:17001
+msgid ""
+"When using the BDB backend make sure you configure BDB properly. For "
+"information to do so, see /usr/share/doc/slapd/README.DB_CONFIG.gz"
+msgstr ""
+"Quando utilizar o backend BDB, tenha certeza que configura correctamente o "
+"BDB. Para informação acerca de como o fazer, veja em /usr/share/doc/slap/"
+"README.DB_CONFIG.gz"
+
+#. Type: boolean
+#. Description
+#: ../slapd.templates:17001
+msgid ""
+"If you enable this option an attempt will be made to update your "
+"configuration to use BDB instead of LDBM and convert your databases."
+msgstr ""
+"Se activar esta opção será feita uma tentativa para actualizar a sua "
+"configuração para usar BDB em vez de LDBM e converter as suas bases de dados."
+
 #. Type: select
 #. Description
-#: ../slapd.templates:17001
+#: ../slapd.templates:18001
 msgid "Database backend to use:"
 msgstr "Backend a usar para a base de dados:"
 
 #. Type: select
 #. Description
-#: ../slapd.templates:17001
+#: ../slapd.templates:18001
 msgid ""
 "The BDB backend is the recommended choice of the OpenLDAP developers. When "
 "using the BDB backend make sure that you configure the underlying database "
@@ -361,7 +398,7 @@
 
 #. Type: select
 #. Description
-#: ../slapd.templates:17001
+#: ../slapd.templates:18001
 msgid ""
 "HDB is the next generation of BDB which might replace it sometime in the "
 "future. There are some problems still in the HDB code of the 2.2 series of "
@@ -373,7 +410,7 @@
 
 #. Type: select
 #. Description
-#: ../slapd.templates:17001
+#: ../slapd.templates:18001
 msgid ""
 "The BDB backend (back-bdb) and LDBM backend (back-ldbm) are comparable in "
 "purpose and back-bdb evolved from experience gained from back-ldbm, but the "
@@ -478,31 +515,3 @@
 #~ "A partir da versão 2.1.23, o slapd requer que a opção updateref esteja "
 #~ "presente nos escravos. Deve assegurar-se que corrige o ficheiro de "
 #~ "configuração slapd.conf."
-
-#~ msgid "Change backend type from LDBM to BDB?"
-#~ msgstr "Mudar o tipo de backend de LDBM para BDB?"
-
-#~ msgid ""
-#~ "The LDBM backend type has been deprecated in OpenLDAP 2.2 and has shown "
-#~ "to not work well. BDB is the recommended choice of the OpenLDAP "
-#~ "developers."
-#~ msgstr ""
-#~ "O tipo de backend LDBM deixou de ser usado no OpenLDAP 2.2 e demonstrou "
-#~ "que não funciona bem. BDB é a escolha recomendada dos developers do "
-#~ "OpenLDAP."
-
-#~ msgid ""
-#~ "When using the BDB backend make sure you configure BDB properly. For "
-#~ "information to do so, see /usr/share/doc/slapd/README.DB_CONFIG.gz"
-#~ msgstr ""
-#~ "Quando utilizar o backend BDB, tenha certeza que configura correctamente "
-#~ "o BDB. Para informação acerca de como o fazer, veja em /usr/share/doc/"
-#~ "slap/README.DB_CONFIG.gz"
-
-#~ msgid ""
-#~ "If you enable this option an attempt will be made to update your "
-#~ "configuration to use BDB instead of LDBM and convert your databases."
-#~ msgstr ""
-#~ "Se activar esta opção será feita uma tentativa para actualizar a sua "
-#~ "configuração para usar BDB em vez de LDBM e converter as suas bases de "
-#~ "dados."

Modified: openldap/trunk-2.3/debian/po/pt_BR.po
===================================================================
--- openldap/trunk-2.3/debian/po/pt_BR.po	2007-11-12 02:55:59 UTC (rev 864)
+++ openldap/trunk-2.3/debian/po/pt_BR.po	2007-11-12 03:50:37 UTC (rev 865)
@@ -10,7 +10,7 @@
 msgstr ""
 "Project-Id-Version: openldap2_2.1.17-1\n"
 "Report-Msgid-Bugs-To: pkg-openldap-devel at lists.alioth.debian.org\n"
-"POT-Creation-Date: 2007-11-11 18:54-0800\n"
+"POT-Creation-Date: 2007-11-11 19:49-0800\n"
 "PO-Revision-Date: 2007-03-08 01:40-0300\n"
 "Last-Translator: Felipe Augusto van de Wiel (faw) <faw at cathedrallabs.org>\n"
 "Language-Team: l10n portuguese <debian-l10n-portuguese at lists.debian.org>\n"
@@ -346,15 +346,52 @@
 "arquivo LDIF. Se o problema for com o arquivo LDIF, você pode ser capaz de "
 "corrigí-lo e tentar o slapadd novamente."
 
+#. Type: boolean
+#. Description
+#: ../slapd.templates:17001
+msgid "Change backend type from LDBM to BDB?"
+msgstr "Mudar o tipo do \"backend\" de LDBM para BDB?"
+
+#. Type: boolean
+#. Description
+#: ../slapd.templates:17001
+msgid ""
+"The LDBM backend type has been deprecated in OpenLDAP 2.2 and has shown to "
+"not work well. BDB is the recommended choice of the OpenLDAP developers."
+msgstr ""
+"O \"backend\" tipo LDBM tornou-se obsoleto no OpenLDAP 2.2 e mostrou não "
+"trabalhar bem. BDB é a escolha recomendada dos desenvolvedores OpenLDAP."
+
+#. Type: boolean
+#. Description
+#: ../slapd.templates:17001
+msgid ""
+"When using the BDB backend make sure you configure BDB properly. For "
+"information to do so, see /usr/share/doc/slapd/README.DB_CONFIG.gz"
+msgstr ""
+"Quando usando o \"backend\" BDB tenha certeza que você configurou o BDB "
+"apropriadamente. Para informação de como fazê-lo, veja /usr/share/doc/slapd/"
+"README.DB_CONFIG.gz"
+
+#. Type: boolean
+#. Description
+#: ../slapd.templates:17001
+msgid ""
+"If you enable this option an attempt will be made to update your "
+"configuration to use BDB instead of LDBM and convert your databases."
+msgstr ""
+"Se você habilitar esta opção uma tentativa será feita para atualizar sua "
+"configuração para usar BDB ao invés de LDBM e converter suas bases de dados."
+
 #. Type: select
 #. Description
-#: ../slapd.templates:17001
+#: ../slapd.templates:18001
 msgid "Database backend to use:"
 msgstr "\"Backend\" de base de dados a ser usado:"
 
 #. Type: select
 #. Description
-#: ../slapd.templates:17001
+#: ../slapd.templates:18001
 msgid ""
 "The BDB backend is the recommended choice of the OpenLDAP developers. When "
 "using the BDB backend make sure that you configure the underlying database "
@@ -367,7 +404,7 @@
 
 #. Type: select
 #. Description
-#: ../slapd.templates:17001
+#: ../slapd.templates:18001
 msgid ""
 "HDB is the next generation of BDB which might replace it sometime in the "
 "future. There are some problems still in the HDB code of the 2.2 series of "
@@ -379,7 +416,7 @@
 
 #. Type: select
 #. Description
-#: ../slapd.templates:17001
+#: ../slapd.templates:18001
 msgid ""
 "The BDB backend (back-bdb) and LDBM backend (back-ldbm) are comparable in "
 "purpose and back-bdb evolved from experience gained from back-ldbm, but the "
@@ -486,33 +523,6 @@
 #~ "definida em escravos (\"slaves\"). Você deveria ter certeza que corrigiu "
 #~ "seu arquivo de configuração slapd.conf."
 
-#~ msgid "Change backend type from LDBM to BDB?"
-#~ msgstr "Mudar o tipo do \"backend\" de LDBM para BDB?"
-
-#~ msgid ""
-#~ "The LDBM backend type has been deprecated in OpenLDAP 2.2 and has shown "
-#~ "to not work well. BDB is the recommended choice of the OpenLDAP "
-#~ "developers."
-#~ msgstr ""
-#~ "O \"backend\" tipo LDBM tornou-se obsoleto no OpenLDAP 2.2 e mostrou não "
-#~ "trabalhar bem. BDB é a escolha recomendada dos desenvolvedores OpenLDAP."
-
-#~ msgid ""
-#~ "When using the BDB backend make sure you configure BDB properly. For "
-#~ "information to do so, see /usr/share/doc/slapd/README.DB_CONFIG.gz"
-#~ msgstr ""
-#~ "Quando usando o \"backend\" BDB tenha certeza que você configurou o BDB "
-#~ "apropriadamente. Para informação de como fazê-lo, veja /usr/share/doc/"
-#~ "slapd/README.DB_CONFIG.gz"
-
-#~ msgid ""
-#~ "If you enable this option an attempt will be made to update your "
-#~ "configuration to use BDB instead of LDBM and convert your databases."
-#~ msgstr ""
-#~ "Se você habilitar esta opção uma tentativa será feita para atualizar sua "
-#~ "configuração para usar BDB ao invés de LDBM e converter suas bases de "
-#~ "dados."
-
 #~ msgid "Admin entry"
 #~ msgstr "Entrada administrativa"
 

Modified: openldap/trunk-2.3/debian/po/ru.po
===================================================================
--- openldap/trunk-2.3/debian/po/ru.po	2007-11-12 02:55:59 UTC (rev 864)
+++ openldap/trunk-2.3/debian/po/ru.po	2007-11-12 03:50:37 UTC (rev 865)
@@ -15,7 +15,7 @@
 msgstr ""
 "Project-Id-Version: 2.1.30-13.2\n"
 "Report-Msgid-Bugs-To: pkg-openldap-devel at lists.alioth.debian.org\n"
-"POT-Creation-Date: 2007-11-11 18:54-0800\n"
+"POT-Creation-Date: 2007-11-11 19:49-0800\n"
 "PO-Revision-Date: 2007-01-05 20:38+0300\n"
 "Last-Translator: Yuri Kozlov <kozlov.y at gmail.com>\n"
 "Language-Team: Russian <debian-l10n-russian at lists.debian.org>\n"
@@ -341,15 +341,51 @@
 "Если проблема была с файлом LDIF, то вы можете попробовать с ней разобраться "
 "и попытаться выполнить slapadd ещё раз."
 
+#. Type: boolean
+#. Description
+#: ../slapd.templates:17001
+msgid "Change backend type from LDBM to BDB?"
+msgstr "Изменить тип сервера с LDBM на BDB?"
+
+#. Type: boolean
+#. Description
+#: ../slapd.templates:17001
+msgid ""
+"The LDBM backend type has been deprecated in OpenLDAP 2.2 and has shown to "
+"not work well. BDB is the recommended choice of the OpenLDAP developers."
+msgstr ""
+"Тип сервера LDBM плохо поддерживается в OpenLDAP 2.2 и иногда не работает "
+"совсем. Разработчики OpenLDAP рекомендуют использовать BDB."
+
+#. Type: boolean
+#. Description
+#: ../slapd.templates:17001
+msgid ""
+"When using the BDB backend make sure you configure BDB properly. For "
+"information to do so, see /usr/share/doc/slapd/README.DB_CONFIG.gz"
+msgstr ""
+"При использовании сервера BDB, убедитесь, что он правильно настроен. "
+"Подробней о настройке BDB смотрите /usr/share/doc/slapd/README.DB_CONFIG.gz"
+
+#. Type: boolean
+#. Description
+#: ../slapd.templates:17001
+msgid ""
+"If you enable this option an attempt will be made to update your "
+"configuration to use BDB instead of LDBM and convert your databases."
+msgstr ""
+"Если вы ответите утвердительно, то будет сделана попытка обновления вашей "
+"конфигурации для использования BDB вместо LDBM и преобразование баз данных."
+
 #. Type: select
 #. Description
-#: ../slapd.templates:17001
+#: ../slapd.templates:18001
 msgid "Database backend to use:"
 msgstr "Используемые серверы баз данных:"
 
 #. Type: select
 #. Description
-#: ../slapd.templates:17001
+#: ../slapd.templates:18001
 msgid ""
 "The BDB backend is the recommended choice of the OpenLDAP developers. When "
 "using the BDB backend make sure that you configure the underlying database "
@@ -361,7 +397,7 @@
 
 #. Type: select
 #. Description
-#: ../slapd.templates:17001
+#: ../slapd.templates:18001
 msgid ""
 "HDB is the next generation of BDB which might replace it sometime in the "
 "future. There are some problems still in the HDB code of the 2.2 series of "
@@ -373,7 +409,7 @@
 
 #. Type: select
 #. Description
-#: ../slapd.templates:17001
+#: ../slapd.templates:18001
 msgid ""
 "The BDB backend (back-bdb) and LDBM backend (back-ldbm) are comparable in "
 "purpose and back-bdb evolved from experience gained from back-ldbm, but the "
@@ -476,30 +512,3 @@
 #~ "Начиная с версии 2.1.23, для slapd требуется устанавливать параметр "
 #~ "updateref для вспомогательных баз. Убедитесь, что файл конфигурации slapd."
 #~ "conf был исправлен."
-
-#~ msgid "Change backend type from LDBM to BDB?"
-#~ msgstr "Изменить тип сервера с LDBM на BDB?"
-
-#~ msgid ""
-#~ "The LDBM backend type has been deprecated in OpenLDAP 2.2 and has shown "
-#~ "to not work well. BDB is the recommended choice of the OpenLDAP "
-#~ "developers."
-#~ msgstr ""
-#~ "Тип сервера LDBM плохо поддерживается в OpenLDAP 2.2 и иногда не работает "
-#~ "совсем. Разработчики OpenLDAP рекомендуют использовать BDB."
-
-#~ msgid ""
-#~ "When using the BDB backend make sure you configure BDB properly. For "
-#~ "information to do so, see /usr/share/doc/slapd/README.DB_CONFIG.gz"
-#~ msgstr ""
-#~ "При использовании сервера BDB, убедитесь, что он правильно настроен. "
-#~ "Подробней о настройке BDB смотрите /usr/share/doc/slapd/README.DB_CONFIG."
-#~ "gz"
-
-#~ msgid ""
-#~ "If you enable this option an attempt will be made to update your "
-#~ "configuration to use BDB instead of LDBM and convert your databases."
-#~ msgstr ""
-#~ "Если вы ответите утвердительно, то будет сделана попытка обновления вашей "
-#~ "конфигурации для использования BDB вместо LDBM и преобразование баз "
-#~ "данных."

Modified: openldap/trunk-2.3/debian/po/templates.pot
===================================================================
--- openldap/trunk-2.3/debian/po/templates.pot	2007-11-12 02:55:59 UTC (rev 864)
+++ openldap/trunk-2.3/debian/po/templates.pot	2007-11-12 03:50:37 UTC (rev 865)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: pkg-openldap-devel at lists.alioth.debian.org\n"
-"POT-Creation-Date: 2007-11-11 18:54-0800\n"
+"POT-Creation-Date: 2007-11-11 19:49-0800\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -271,15 +271,45 @@
 "the slapadd again."
 msgstr ""
 
+#. Type: boolean
+#. Description
+#: ../slapd.templates:17001
+msgid "Change backend type from LDBM to BDB?"
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../slapd.templates:17001
+msgid ""
+"The LDBM backend type has been deprecated in OpenLDAP 2.2 and has shown to "
+"not work well. BDB is the recommended choice of the OpenLDAP developers."
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../slapd.templates:17001
+msgid ""
+"When using the BDB backend make sure you configure BDB properly. For "
+"information to do so, see /usr/share/doc/slapd/README.DB_CONFIG.gz"
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../slapd.templates:17001
+msgid ""
+"If you enable this option an attempt will be made to update your "
+"configuration to use BDB instead of LDBM and convert your databases."
+msgstr ""
+
 #. Type: select
 #. Description
-#: ../slapd.templates:17001
+#: ../slapd.templates:18001
 msgid "Database backend to use:"
 msgstr ""
 
 #. Type: select
 #. Description
-#: ../slapd.templates:17001
+#: ../slapd.templates:18001
 msgid ""
 "The BDB backend is the recommended choice of the OpenLDAP developers. When "
 "using the BDB backend make sure that you configure the underlying database "
@@ -288,7 +318,7 @@
 
 #. Type: select
 #. Description
-#: ../slapd.templates:17001
+#: ../slapd.templates:18001
 msgid ""
 "HDB is the next generation of BDB which might replace it sometime in the "
 "future. There are some problems still in the HDB code of the 2.2 series of "
@@ -297,7 +327,7 @@
 
 #. Type: select
 #. Description
-#: ../slapd.templates:17001
+#: ../slapd.templates:18001
 msgid ""
 "The BDB backend (back-bdb) and LDBM backend (back-ldbm) are comparable in "
 "purpose and back-bdb evolved from experience gained from back-ldbm, but the "

Modified: openldap/trunk-2.3/debian/po/vi.po
===================================================================
--- openldap/trunk-2.3/debian/po/vi.po	2007-11-12 02:55:59 UTC (rev 864)
+++ openldap/trunk-2.3/debian/po/vi.po	2007-11-12 03:50:37 UTC (rev 865)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: openldap2.3\n"
 "Report-Msgid-Bugs-To: pkg-openldap-devel at lists.alioth.debian.org\n"
-"POT-Creation-Date: 2007-11-11 18:54-0800\n"
+"POT-Creation-Date: 2007-11-11 19:49-0800\n"
 "PO-Revision-Date: 2006-05-13 13:31+0930\n"
 "Last-Translator: Clytie Siddall <clytie at riverland.net.au>\n"
 "Language-Team: Vietnamese <gnomevi-list at lists.sourceforge.net>\n"
@@ -335,15 +335,52 @@
 "vấn đề trong tập tin LDIF. Nếu gặp vấn đề trong tập tin LDIF, có lẽ bạn có "
 "khả năng sửa chữa nó, rồi thử lại chạy tiến trình slapadd."
 
+#. Type: boolean
+#. Description
+#: ../slapd.templates:17001
+msgid "Change backend type from LDBM to BDB?"
+msgstr "Thay đổi kiểu hậu phương từ LDBM thà nh BDB không?"
+
+#. Type: boolean
+#. Description
+#: ../slapd.templates:17001
+msgid ""
+"The LDBM backend type has been deprecated in OpenLDAP 2.2 and has shown to "
+"not work well. BDB is the recommended choice of the OpenLDAP developers."
+msgstr ""
+"Kiểu hậu phương LDBM bị phản đối trong OpenLDAP phiên bản 2.2, và không là m "
+"việc khá. Các nhà phát triển OpenLDAP khuyến khích bạn sử dụng BDB."
+
+#. Type: boolean
+#. Description
+#: ../slapd.templates:17001
+msgid ""
+"When using the BDB backend make sure you configure BDB properly. For "
+"information to do so, see /usr/share/doc/slapd/README.DB_CONFIG.gz"
+msgstr ""
+"Khi sử dụng hậu phương BDB, bạn hãy kiểm tra xem đã cấu hình BDB cho đúng. "
+"Để tìm thông tin về tiến trình nà y, hãy xem tập tin Đọc Đi </usr/share/doc/"
+"slapd/README.DB_CONFIG.gz> (cần giải nén trước)."
+
+#. Type: boolean
+#. Description
+#: ../slapd.templates:17001
+msgid ""
+"If you enable this option an attempt will be made to update your "
+"configuration to use BDB instead of LDBM and convert your databases."
+msgstr ""
+"Nếu bạn hiệu lực tùy chọn nà y, trình nà y sẽ cố gắng nâng cấp cấu hình của "
+"bạn để dùng BDB thay và o LDBM, và để chuyển đổi các cơ sở dữ liệu của bạn."
+
 #. Type: select
 #. Description
-#: ../slapd.templates:17001
+#: ../slapd.templates:18001
 msgid "Database backend to use:"
 msgstr "Hậu phương cơ sở dữ liệu cần dùng:"
 
 #. Type: select
 #. Description
-#: ../slapd.templates:17001
+#: ../slapd.templates:18001
 msgid ""
 "The BDB backend is the recommended choice of the OpenLDAP developers. When "
 "using the BDB backend make sure that you configure the underlying database "
@@ -356,7 +393,7 @@
 
 #. Type: select
 #. Description
-#: ../slapd.templates:17001
+#: ../slapd.templates:18001
 msgid ""
 "HDB is the next generation of BDB which might replace it sometime in the "
 "future. There are some problems still in the HDB code of the 2.2 series of "
@@ -368,7 +405,7 @@
 
 #. Type: select
 #. Description
-#: ../slapd.templates:17001
+#: ../slapd.templates:18001
 msgid ""
 "The BDB backend (back-bdb) and LDBM backend (back-ldbm) are comparable in "
 "purpose and back-bdb evolved from experience gained from back-ldbm, but the "
@@ -470,29 +507,3 @@
 #~ "Kể từ phiên bản 2.1.23, trình nền slapd cần thiết tùy chọn « updateref » "
 #~ "được đặt trên mọi điều phụ. Bạn nên kiểm tra xem đã sửa chữa tập tin cấu "
 #~ "hình <slapd.conf> của mình."
-
-#~ msgid "Change backend type from LDBM to BDB?"
-#~ msgstr "Thay đổi kiểu hậu phương từ LDBM thà nh BDB không?"
-
-#~ msgid ""
-#~ "The LDBM backend type has been deprecated in OpenLDAP 2.2 and has shown "
-#~ "to not work well. BDB is the recommended choice of the OpenLDAP "
-#~ "developers."
-#~ msgstr ""
-#~ "Kiểu hậu phương LDBM bị phản đối trong OpenLDAP phiên bản 2.2, và không "
-#~ "là m việc khá. Các nhà phát triển OpenLDAP khuyến khích bạn sử dụng BDB."
-
-#~ msgid ""
-#~ "When using the BDB backend make sure you configure BDB properly. For "
-#~ "information to do so, see /usr/share/doc/slapd/README.DB_CONFIG.gz"
-#~ msgstr ""
-#~ "Khi sử dụng hậu phương BDB, bạn hãy kiểm tra xem đã cấu hình BDB cho "
-#~ "đúng. Để tìm thông tin về tiến trình nà y, hãy xem tập tin Đọc Đi </usr/"
-#~ "share/doc/slapd/README.DB_CONFIG.gz> (cần giải nén trước)."
-
-#~ msgid ""
-#~ "If you enable this option an attempt will be made to update your "
-#~ "configuration to use BDB instead of LDBM and convert your databases."
-#~ msgstr ""
-#~ "Nếu bạn hiệu lực tùy chọn nà y, trình nà y sẽ cố gắng nâng cấp cấu hình của "
-#~ "bạn để dùng BDB thay và o LDBM, và để chuyển đổi các cơ sở dữ liệu của bạn."

Modified: openldap/trunk-2.3/debian/slapd.config
===================================================================
--- openldap/trunk-2.3/debian/slapd.config	2007-11-12 02:55:59 UTC (rev 864)
+++ openldap/trunk-2.3/debian/slapd.config	2007-11-12 03:50:37 UTC (rev 865)
@@ -19,9 +19,9 @@
 	fi
 fi
 
-# Configure the dumping and v2 binds components if we are upgrading some older
-# version.
+# Configure the dumping component if we are upgrading some older version
 if [ "$1" = configure ] && [ -n "$2" ]; then
+	configure_ldbm_to_bdb_migration
 	configure_dumping
 	configure_allow_v2_binds
 fi

Modified: openldap/trunk-2.3/debian/slapd.postinst
===================================================================
--- openldap/trunk-2.3/debian/slapd.postinst	2007-11-12 02:55:59 UTC (rev 864)
+++ openldap/trunk-2.3/debian/slapd.postinst	2007-11-12 03:50:37 UTC (rev 865)
@@ -36,9 +36,8 @@
 	if previous_version_older 2.3.25-1; then
 		update_path_argsfile_pidfile
 
-		# Directory /var/run/slapd is suddenly gone, dpkg removes it
-		# because it's now generated from the postinst scripts. See
-		# create_ldap_directories.
+		# Directory /var/run/slapd is suddenly gone, dpkg removes it because it's
+		# now generated from the postinst scripts. See create_ldap_directories.
 		if [ ! -d "/var/run/slapd" ]; then
 			mkdir -m 0755 /var/run/slapd
 		fi
@@ -47,6 +46,14 @@
 	if database_format_changed; then
 		# During upgrading we have to load the old data
 		move_incompatible_databases_away
+		# Change the configuration if we want to migrate DBs
+		db_get slapd/migrate_ldbm_to_bdb
+		if [ "$RET" = "true" ]; then
+			config_migrate_backend ldbm bdb
+			# Make sure we don't dump the DB for migration 
+			# again...
+			db_set slapd/migrate_ldbm_to_bdb false
+		fi
 		load_databases
 	fi
 

Modified: openldap/trunk-2.3/debian/slapd.preinst
===================================================================
--- openldap/trunk-2.3/debian/slapd.preinst	2007-11-12 02:55:59 UTC (rev 864)
+++ openldap/trunk-2.3/debian/slapd.preinst	2007-11-12 03:50:37 UTC (rev 865)
@@ -12,6 +12,7 @@
 # slapcat out the data so we can use it in postinst to do the upgrade
 
 if [ "$MODE" = upgrade ]; then
+	break_on_ldbm_to_bdb_migration_disagree
 	stop_slapd
 	dump_databases
 fi

Modified: openldap/trunk-2.3/debian/slapd.prerm
===================================================================
--- openldap/trunk-2.3/debian/slapd.prerm	2007-11-12 02:55:59 UTC (rev 864)
+++ openldap/trunk-2.3/debian/slapd.prerm	2007-11-12 03:50:37 UTC (rev 865)
@@ -60,6 +60,10 @@
 fi
 # }}}
 
+# Set seen flag of this question to false to get it asked if someone disagrees
+# with the upgrade from ldbm to bdb backend.
+db_fset slapd/migrate_ldbm_to_bdb seen false
+
 #DEBHELPER#
 
 exit 0

Modified: openldap/trunk-2.3/debian/slapd.scripts-common
===================================================================
--- openldap/trunk-2.3/debian/slapd.scripts-common	2007-11-12 02:55:59 UTC (rev 864)
+++ openldap/trunk-2.3/debian/slapd.scripts-common	2007-11-12 03:50:37 UTC (rev 865)
@@ -46,6 +46,23 @@
 }
 
 # }}}
+configure_ldbm_to_bdb_migration() {					# {{{
+# If there are any LDBM databases in use we suggest to the user to migrate
+# to the more stable and better maintained BDB backend.
+# Usage: configure_ldbm_to_bdb_migration
+
+	if [ -e "$SLAPD_CONF" ] && grep -qE \
+			-e '^moduleload[[:space:]]+back_ldbm' \
+			-e '^(database|backend)[[:space:]]+ldbm' \
+			"$SLAPD_CONF"; then
+		db_input critical slapd/migrate_ldbm_to_bdb || true
+		db_go || true
+	else
+		# Nothing to migrate
+		db_set slapd/migrate_ldbm_to_bdb false
+	fi
+}
+# }}}
 configure_allow_v2_binds() {                        # {{{
 # Ask if the user would like their package to support LDAPv2..
 # This was the default in older versions but we want to ask
@@ -54,6 +71,20 @@
     db_input medium slapd/allow_ldap_v2 || true
 }
 # }}}
+break_on_ldbm_to_bdb_migration_disagree() { # {{{
+  if [ -e "$SLAPD_CONF" ] && grep -qE \
+      -e '^moduleload[[:space:]]+back_ldbm' \
+      -e '^(database|backend)[[:space:]]+ldbm' \
+      "$SLAPD_CONF"; then
+    db_get slapd/migrate_ldbm_to_bdb
+    if [ "$RET" = "false" ]; then
+      db_fset slapd/migrate_ldbm_to_bdb seen false
+      return 1
+    fi
+    return 0
+  fi
+  return 0
+} # }}}
 database_dumping_enabled() {						# {{{
 # Check if the user has enabled database dumping for the current situation.
 # Return success if yes.
@@ -83,7 +114,9 @@
 # Return success if yes.
 # Usage: if database_format_changed; then
 
-	if previous_version_older 2.3.19; then
+	db_get slapd/migrate_ldbm_to_bdb
+	if [ "$RET" = "true" ] || dpkg --compare-versions \
+			"$OLD_VERSION" lt-nl "2.3.19"; then
 		return 0
 	else
 		return 1
@@ -104,6 +137,22 @@
 }
 
 # }}}
+configure_ldbm_to_bdb_transition() {					# {{{
+# The LDBM backend seems to be quite unusable with OpenLDAP 2.2. Therefore
+# we ask the user if he wants to switch to BDB which is the recommended
+# backend for 2.2.
+
+	if grep -q '^moduleload[[:space:]]\+back_ldbm' $SLAPD_CONF ||
+			grep -q '^database[[:space:]]\+ldbm' $SLAPD_CONF ||
+			grep -q '^backend[[:space:]]\+ldbm' $SLAPD_CONF; then
+		db_input critical slapd/convert_ldbm_to_bdb || true
+		db_go || true
+	else
+		db_set slapd/convert_ldbm_to_bdb false
+	fi
+}
+
+# }}}
 create_new_user() { # {{{
 	if [ -z "`getent group openldap`" ]; then
 		addgroup --quiet --system openldap
@@ -706,7 +755,7 @@
 config_migrate_backend() {						# {{{
 # Changes all uses of one backend to another (like ldbm to bdb) in the 
 # configuration file. This includes the moduleload, backend and database
-# directives.  This function is currently unused.
+# directives.  
 # Usage: migrate_databases <old-backend> <new-backend>
 
 	local old new
@@ -1096,7 +1145,7 @@
 # our scripts.
 # Usage: if upgrade_supported_from_backend "backend"; then ... fi
 
-	case "$1" in bdb|hdb) return 0; esac
+	case "$1" in ldbm|bdb|hdb) return 0; esac
 	return 1
 }
 

Modified: openldap/trunk-2.3/debian/slapd.templates
===================================================================
--- openldap/trunk-2.3/debian/slapd.templates	2007-11-12 02:55:59 UTC (rev 864)
+++ openldap/trunk-2.3/debian/slapd.templates	2007-11-12 03:50:37 UTC (rev 865)
@@ -139,6 +139,19 @@
  too) or due to a problem in the LDIF file.  If the problem was with the
  LDIF file, you may be able to fix it and attempt the slapadd again.
 
+Template: slapd/migrate_ldbm_to_bdb
+Type: boolean
+Default: true
+_Description: Change backend type from LDBM to BDB?
+ The LDBM backend type has been deprecated in OpenLDAP 2.2 and has shown to not
+ work well. BDB is the recommended choice of the OpenLDAP developers.
+ .
+ When using the BDB backend make sure you configure BDB properly. For
+ information to do so, see /usr/share/doc/slapd/README.DB_CONFIG.gz
+ .
+ If you enable this option an attempt will be made to update your
+ configuration to use BDB instead of LDBM and convert your databases.
+
 Template: slapd/backend
 Type: select
 Choices: BDB, HDB