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

Sun Jul 20 02:30:19 UTC 2008

Author: vorlon
Date: 2008-07-20 02:30:18 +0000 (Sun, 20 Jul 2008)
New Revision: 1179

Modified:
   openldap/trunk/debian/changelog
   openldap/trunk/debian/po/cs.po
   openldap/trunk/debian/po/da.po
   openldap/trunk/debian/po/de.po
   openldap/trunk/debian/po/es.po
   openldap/trunk/debian/po/eu.po
   openldap/trunk/debian/po/fi.po
   openldap/trunk/debian/po/fr.po
   openldap/trunk/debian/po/gl.po
   openldap/trunk/debian/po/it.po
   openldap/trunk/debian/po/ja.po
   openldap/trunk/debian/po/nl.po
   openldap/trunk/debian/po/pt.po
   openldap/trunk/debian/po/pt_BR.po
   openldap/trunk/debian/po/ru.po
   openldap/trunk/debian/po/templates.pot
   openldap/trunk/debian/po/vi.po
   openldap/trunk/debian/slapd.config
   openldap/trunk/debian/slapd.postinst
   openldap/trunk/debian/slapd.preinst
   openldap/trunk/debian/slapd.prerm
   openldap/trunk/debian/slapd.scripts-common
   openldap/trunk/debian/slapd.templates
Log:
* 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.

Modified: openldap/trunk/debian/changelog
===================================================================

--- openldap/trunk/debian/changelog	2008-07-15 15:26:26 UTC (rev 1178)
+++ openldap/trunk/debian/changelog	2008-07-20 02:30:18 UTC (rev 1179)
@@ -7,6 +7,9 @@
   * debian/slapd.scripts-common, debian/slapd.postinst: drop
     update_path_argsfile_pidfile function, not needed for updates from etch
     or newer.
+  * 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.
 
   [ Russ Allbery ]
   * Apply upstream patch to convert GnuTLS cipher strength from bytes to

Modified: openldap/trunk/debian/po/cs.po
===================================================================
--- openldap/trunk/debian/po/cs.po	2008-07-15 15:26:26 UTC (rev 1178)
+++ openldap/trunk/debian/po/cs.po	2008-07-20 02:30:18 UTC (rev 1179)
@@ -15,7 +15,7 @@
 msgstr ""
 "Project-Id-Version: openldap\n"
 "Report-Msgid-Bugs-To: openldap at packages.debian.org\n"
-"POT-Creation-Date: 2008-02-09 10:32-0800\n"
+"POT-Creation-Date: 2008-07-19 19:11-0700\n"
 "PO-Revision-Date: 2008-05-08 11:22+0200\n"
 "Last-Translator: Miroslav Kure <kurem at debian.cz>\n"
 "Language-Team: Czech <debian-l10n-czech at lists.debian.org>\n"
@@ -326,53 +326,15 @@
 "PotÃ© pÅ™esuÅˆte databÃ¡zovÃ© soubory zpÄ›t mezi zÃ¡lohy a zkuste spustit slapadd z "
 "$location."
 
-#. Type: boolean
-#. Description
-#: ../slapd.templates:16001
-msgid "Change backend type from LDBM to BDB?"
-msgstr "ZmÄ›nit typ backendu z LDBM na BDB?"
-
-#. Type: boolean
-#. Description
-#: ../slapd.templates:16001
-msgid ""
-"The LDBM backend type has serious stability problems and has been deprecated "
-"by OpenLDAP as of 2.2. It is no longer supported by the OpenLDAP packages."
-msgstr ""
-"Backend LDBM mÃ¡ vÃ¡Å¾nÃ© problÃ©my se stabilitou a proto byl v OpenLDAPu od "
-"verze 2.2 zavrhnut. BalÃky OpenLDAPu tento backend jiÅ¾ dÃ¡le nepodporujÃ."
-
-#. Type: boolean
-#. Description
-#: ../slapd.templates:16001
-msgid ""
-"When the BDB backend is used, it must be configured properly. For more "
-"information, see /usr/share/doc/slapd/README.DB_CONFIG.gz."
-msgstr ""
-"PÅ™i pouÅ¾itÃ backendu BDB se ujistÄ›te, Å¾e je nastaven sprÃ¡vnÄ›. VÃce informacÃ "
-"naleznete v souboru /usr/share/doc/slapd/README.DB_CONFIG.gz."
-
-#. Type: boolean
-#. Description
-#: ../slapd.templates:16001
-msgid ""
-"If you enable this option, an attempt will be made to update the "
-"configuration to use BDB instead of LDBM and convert the databases. If you "
-"do not enable this option, the upgrade will be aborted."
-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. V opaÄnÃ©m pÅ™ÃpadÄ› se "
-"aktualizace pÅ™eruÅ¡Ã."
-
 #. Type: select
 #. Description
-#: ../slapd.templates:17001
+#: ../slapd.templates:16001
 msgid "Database backend to use:"
 msgstr "DatabÃ¡zovÃ½ backend:"
 
 #. Type: select
 #. Description
-#: ../slapd.templates:17001
+#: ../slapd.templates:16001
 msgid ""
 "The HDB backend is recommended. HDB and BDB use similar storage formats, but "
 "HDB adds support for subtree renames. Both support the same configuration "
@@ -384,7 +346,7 @@
 
 #. Type: select
 #. Description
-#: ../slapd.templates:17001
+#: ../slapd.templates:16001
 msgid ""
 "In either case, you should review the resulting database configuration for "
 "your needs. See /usr/share/doc/slapd/README.DB_CONFIG.gz for more details."
@@ -395,13 +357,13 @@
 
 #. Type: error
 #. Description
-#: ../slapd.templates:18001
+#: ../slapd.templates:17001
 msgid "slurpd is obsolete; replicas must be reconfigured by hand"
 msgstr "slurpd je zastaralÃ½, repliky se musÃ znovu nastavit ruÄnÄ›"
 
 #. Type: error
 #. Description
-#: ../slapd.templates:18001
+#: ../slapd.templates:17001
 msgid ""
 "One or more slurpd \"replica\" options were found in your slapd config when "
 "upgrading.  Because slurpd is obsolete beginning with OpenLDAP 2.4, you will "
@@ -414,7 +376,7 @@
 
 #. Type: error
 #. Description
-#: ../slapd.templates:18001
+#: ../slapd.templates:17001
 msgid ""
 "The conversion from slurpd to the pull-based syncrepl protocol cannot be "
 "done automatically and you will need to configure your replica servers by "
@@ -427,13 +389,13 @@
 
 #. Type: error
 #. Description
-#: ../slapd.templates:19001
+#: ../slapd.templates:18001
 msgid "TLSCipherSuite values have changed"
 msgstr "Hodnota TLSCipherSuite se zmÄ›nila"
 
 #. Type: error
 #. Description
-#: ../slapd.templates:19001
+#: ../slapd.templates:18001
 msgid ""
 "A \"TLSCipherSuite\" option was found in your slapd config when upgrading. "
 "The values allowed for this option are determined by the SSL implementation "
@@ -448,7 +410,7 @@
 
 #. Type: error
 #. Description
-#: ../slapd.templates:19001
+#: ../slapd.templates:18001
 msgid ""
 "This setting has been automatically commented out for you.  If you have "
 "specific encryption needs that require this option to be re-enabled, see the "

Modified: openldap/trunk/debian/po/da.po
===================================================================
--- openldap/trunk/debian/po/da.po	2008-07-15 15:26:26 UTC (rev 1178)
+++ openldap/trunk/debian/po/da.po	2008-07-20 02:30:18 UTC (rev 1179)
@@ -15,7 +15,7 @@
 msgstr ""
 "Project-Id-Version: openldap2 debconf\n"
 "Report-Msgid-Bugs-To: openldap at packages.debian.org\n"
-"POT-Creation-Date: 2008-02-09 10:32-0800\n"
+"POT-Creation-Date: 2008-07-19 19:11-0700\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"
@@ -348,57 +348,15 @@
 "Flyt derefter databasefilerne tilbage til et sikkerhedskopi-område, og prøv "
 "at køre slapadd fra $location."
 
-#. Type: boolean
-#. Description
-#: ../slapd.templates:16001
-msgid "Change backend type from LDBM to BDB?"
-msgstr "Skift bagendetype fra LDBM til BDB?"
-
-#. Type: boolean
-#. Description
-#: ../slapd.templates:16001
-#, fuzzy
-msgid ""
-"The LDBM backend type has serious stability problems and has been deprecated "
-"by OpenLDAP as of 2.2. It is no longer supported by the OpenLDAP packages."
-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:16001
-#, fuzzy
-msgid ""
-"When the BDB backend is used, it must be configured properly. For more "
-"information, 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:16001
-#, fuzzy
-msgid ""
-"If you enable this option, an attempt will be made to update the "
-"configuration to use BDB instead of LDBM and convert the databases. If you "
-"do not enable this option, the upgrade will be aborted."
-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:16001
 msgid "Database backend to use:"
 msgstr "Database-bagende, der skal benyttes:"
 
 #. Type: select
 #. Description
-#: ../slapd.templates:17001
+#: ../slapd.templates:16001
 msgid ""
 "The HDB backend is recommended. HDB and BDB use similar storage formats, but "
 "HDB adds support for subtree renames. Both support the same configuration "
@@ -407,7 +365,7 @@
 
 #. Type: select
 #. Description
-#: ../slapd.templates:17001
+#: ../slapd.templates:16001
 #, fuzzy
 msgid ""
 "In either case, you should review the resulting database configuration for "
@@ -419,13 +377,13 @@
 
 #. Type: error
 #. Description
-#: ../slapd.templates:18001
+#: ../slapd.templates:17001
 msgid "slurpd is obsolete; replicas must be reconfigured by hand"
 msgstr ""
 
 #. Type: error
 #. Description
-#: ../slapd.templates:18001
+#: ../slapd.templates:17001
 msgid ""
 "One or more slurpd \"replica\" options were found in your slapd config when "
 "upgrading.  Because slurpd is obsolete beginning with OpenLDAP 2.4, you will "
@@ -434,7 +392,7 @@
 
 #. Type: error
 #. Description
-#: ../slapd.templates:18001
+#: ../slapd.templates:17001
 msgid ""
 "The conversion from slurpd to the pull-based syncrepl protocol cannot be "
 "done automatically and you will need to configure your replica servers by "
@@ -444,13 +402,13 @@
 
 #. Type: error
 #. Description
-#: ../slapd.templates:19001
+#: ../slapd.templates:18001
 msgid "TLSCipherSuite values have changed"
 msgstr ""
 
 #. Type: error
 #. Description
-#: ../slapd.templates:19001
+#: ../slapd.templates:18001
 msgid ""
 "A \"TLSCipherSuite\" option was found in your slapd config when upgrading. "
 "The values allowed for this option are determined by the SSL implementation "
@@ -460,7 +418,7 @@
 
 #. Type: error
 #. Description
-#: ../slapd.templates:19001
+#: ../slapd.templates:18001
 msgid ""
 "This setting has been automatically commented out for you.  If you have "
 "specific encryption needs that require this option to be re-enabled, see the "

Modified: openldap/trunk/debian/po/de.po
===================================================================
--- openldap/trunk/debian/po/de.po	2008-07-15 15:26:26 UTC (rev 1178)
+++ openldap/trunk/debian/po/de.po	2008-07-20 02:30:18 UTC (rev 1179)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: openldap 2.4.7-5\n"
 "Report-Msgid-Bugs-To: openldap at packages.debian.org\n"
-"POT-Creation-Date: 2008-02-09 10:32-0800\n"
+"POT-Creation-Date: 2008-07-19 19:11-0700\n"
 "PO-Revision-Date: 2008-02-14 20:32+0100\n"
 "Last-Translator: Helge Kreutzmann <debian at helgefjell.de>\n"
 "Language-Team: de <debian-l10n-german at lists.debian.org>\n"
@@ -332,56 +332,15 @@
 "Verschieben Sie dann die Datenbankdateien zurück in den Backup-Bereich und "
 "versuche Sie, slapadd von $location auszuführen."
 
-#. Type: boolean
-#. Description
-#: ../slapd.templates:16001
-msgid "Change backend type from LDBM to BDB?"
-msgstr "Backendtyp von LDBM auf BDB ändern?"
-
-#. Type: boolean
-#. Description
-#: ../slapd.templates:16001
-msgid ""
-"The LDBM backend type has serious stability problems and has been deprecated "
-"by OpenLDAP as of 2.2. It is no longer supported by the OpenLDAP packages."
-msgstr ""
-"Der LDBM-Backend-Typ hat ernsthafte Stabilitätsprobleme und ist seit Version "
-"2.2 von OpenLDAP veraltet. Er wird von den OpenLDAP-Paketen nicht mehr "
-"unterstützt."
-
-#. Type: boolean
-#. Description
-#: ../slapd.templates:16001
-msgid ""
-"When the BDB backend is used, it must be configured properly. For more "
-"information, see /usr/share/doc/slapd/README.DB_CONFIG.gz."
-msgstr ""
-"Das BDB-Backend-Backend muss vernünftig konfiguriert werden, wenn es "
-"eingesetzt wird. Lesen Sie /usr/share/doc/slapd/README.DB_CONFIG.gz für "
-"weitere Informationen."
-
-#. Type: boolean
-#. Description
-#: ../slapd.templates:16001
-msgid ""
-"If you enable this option, an attempt will be made to update the "
-"configuration to use BDB instead of LDBM and convert the databases. If you "
-"do not enable this option, the upgrade will be aborted."
-msgstr ""
-"Falls Sie diese Option aktivieren, wird ein Versuch durchgeführt, die "
-"Konfiguration zu aktualiseren, um BDB anstatt LDBM zu verwenden und die "
-"Datenbanken zu konvertieren. Falls Sie diese Option nicht wählen, wird das "
-"Upgrade abgebrochen."
-
 #. Type: select
 #. Description
-#: ../slapd.templates:17001
+#: ../slapd.templates:16001
 msgid "Database backend to use:"
 msgstr "Zu verwendendes Datenbank-Backend:"
 
 #. Type: select
 #. Description
-#: ../slapd.templates:17001
+#: ../slapd.templates:16001
 msgid ""
 "The HDB backend is recommended. HDB and BDB use similar storage formats, but "
 "HDB adds support for subtree renames. Both support the same configuration "
@@ -393,7 +352,7 @@
 
 #. Type: select
 #. Description
-#: ../slapd.templates:17001
+#: ../slapd.templates:16001
 msgid ""
 "In either case, you should review the resulting database configuration for "
 "your needs. See /usr/share/doc/slapd/README.DB_CONFIG.gz for more details."
@@ -404,13 +363,13 @@
 
 #. Type: error
 #. Description
-#: ../slapd.templates:18001
+#: ../slapd.templates:17001
 msgid "slurpd is obsolete; replicas must be reconfigured by hand"
 msgstr "Slurpd ist veraltet; Replikas müssen von Hand rekonfiguriert werden"
 
 #. Type: error
 #. Description
-#: ../slapd.templates:18001
+#: ../slapd.templates:17001
 msgid ""
 "One or more slurpd \"replica\" options were found in your slapd config when "
 "upgrading.  Because slurpd is obsolete beginning with OpenLDAP 2.4, you will "
@@ -422,7 +381,7 @@
 
 #. Type: error
 #. Description
-#: ../slapd.templates:18001
+#: ../slapd.templates:17001
 msgid ""
 "The conversion from slurpd to the pull-based syncrepl protocol cannot be "
 "done automatically and you will need to configure your replica servers by "
@@ -436,13 +395,13 @@
 
 #. Type: error
 #. Description
-#: ../slapd.templates:19001
+#: ../slapd.templates:18001
 msgid "TLSCipherSuite values have changed"
 msgstr "TLSCipherSuite-Werte haben sich geändert"
 
 #. Type: error
 #. Description
-#: ../slapd.templates:19001
+#: ../slapd.templates:18001
 msgid ""
 "A \"TLSCipherSuite\" option was found in your slapd config when upgrading. "
 "The values allowed for this option are determined by the SSL implementation "
@@ -457,7 +416,7 @@
 
 #. Type: error
 #. Description
-#: ../slapd.templates:19001
+#: ../slapd.templates:18001
 msgid ""
 "This setting has been automatically commented out for you.  If you have "
 "specific encryption needs that require this option to be re-enabled, see the "

Modified: openldap/trunk/debian/po/es.po
===================================================================
--- openldap/trunk/debian/po/es.po	2008-07-15 15:26:26 UTC (rev 1178)
+++ openldap/trunk/debian/po/es.po	2008-07-20 02:30:18 UTC (rev 1179)
@@ -33,7 +33,7 @@
 msgstr ""
 "Project-Id-Version: openldap 2.3.30\n"
 "Report-Msgid-Bugs-To: openldap at packages.debian.org\n"
-"POT-Creation-Date: 2008-02-09 10:32-0800\n"
+"POT-Creation-Date: 2008-07-19 19:11-0700\n"
 "PO-Revision-Date: 2008-01-13 00:52-0800\n"
 "Last-Translator: Steve Langasek <vorlon at debian.org>\n"
 "Language-Team: Debian l10n Spanish <debian-l10n-spanish at lists.debian.org>\n"
@@ -359,56 +359,15 @@
 "Mueva los ficheros de la base de datos de nuevo al Ã¡rea de la copia de "
 "seguridad e intente utilizar Â«slapaddÂ» en $location."
 
-#. Type: boolean
-#. Description
-#: ../slapd.templates:16001
-msgid "Change backend type from LDBM to BDB?"
-msgstr "Â¿Desea cambiar el tipo de motor de LDBM a BDB?"
-
-#. Type: boolean
-#. Description
-#: ../slapd.templates:16001
-#, fuzzy
-msgid ""
-"The LDBM backend type has serious stability problems and has been deprecated "
-"by OpenLDAP as of 2.2. It is no longer supported by the OpenLDAP packages."
-msgstr ""
-"El motor de tipo LDBM tiene problemas serios de estabilidad y ha quedado "
-"obsoleto en OpenLDAP desde la versiÃ³n 2.2. Ya no se soporta en los paquetes "
-"de OpenLDAP."
-
-#. Type: boolean
-#. Description
-#: ../slapd.templates:16001
-msgid ""
-"When the BDB backend is used, it must be configured properly. For more "
-"information, see /usr/share/doc/slapd/README.DB_CONFIG.gz."
-msgstr ""
-"Cuando use el motor BDB hay que configurarlo adecuadamente. VÃ©ase /usr/share/"
-"doc/slapd/README.DB_CONFIG.gz para mÃ¡s informaciÃ³n."
-
-#. Type: boolean
-#. Description
-#: ../slapd.templates:16001
-#, fuzzy
-msgid ""
-"If you enable this option, an attempt will be made to update the "
-"configuration to use BDB instead of LDBM and convert the databases. If you "
-"do not enable this option, the upgrade will be aborted."
-msgstr ""
-"Si habilita esta opciÃ³n se intentarÃ¡ actualizar la configuraciÃ³n para "
-"utilizar BDB en lugar de LDBM y convertir sus bases de datos. Si no la "
-"habilita, se abortarÃ¡ la actualizaciÃ³n."
-
 #. Type: select
 #. Description
-#: ../slapd.templates:17001
+#: ../slapd.templates:16001
 msgid "Database backend to use:"
 msgstr "Motor de base de datos a utilizar:"
 
 #. Type: select
 #. Description
-#: ../slapd.templates:17001
+#: ../slapd.templates:16001
 #, fuzzy
 msgid ""
 "The HDB backend is recommended. HDB and BDB use similar storage formats, but "
@@ -422,7 +381,7 @@
 
 #. Type: select
 #. Description
-#: ../slapd.templates:17001
+#: ../slapd.templates:16001
 #, fuzzy
 msgid ""
 "In either case, you should review the resulting database configuration for "
@@ -433,13 +392,13 @@
 
 #. Type: error
 #. Description
-#: ../slapd.templates:18001
+#: ../slapd.templates:17001
 msgid "slurpd is obsolete; replicas must be reconfigured by hand"
 msgstr "slurpd es obsoleto; hay que configurar las rÃ©plicas a mano"
 
 #. Type: error
 #. Description
-#: ../slapd.templates:18001
+#: ../slapd.templates:17001
 msgid ""
 "One or more slurpd \"replica\" options were found in your slapd config when "
 "upgrading.  Because slurpd is obsolete beginning with OpenLDAP 2.4, you will "
@@ -448,7 +407,7 @@
 
 #. Type: error
 #. Description
-#: ../slapd.templates:18001
+#: ../slapd.templates:17001
 msgid ""
 "The conversion from slurpd to the pull-based syncrepl protocol cannot be "
 "done automatically and you will need to configure your replica servers by "
@@ -458,13 +417,13 @@
 
 #. Type: error
 #. Description
-#: ../slapd.templates:19001
+#: ../slapd.templates:18001
 msgid "TLSCipherSuite values have changed"
 msgstr ""
 
 #. Type: error
 #. Description
-#: ../slapd.templates:19001
+#: ../slapd.templates:18001
 msgid ""
 "A \"TLSCipherSuite\" option was found in your slapd config when upgrading. "
 "The values allowed for this option are determined by the SSL implementation "
@@ -474,7 +433,7 @@
 
 #. Type: error
 #. Description
-#: ../slapd.templates:19001
+#: ../slapd.templates:18001
 msgid ""
 "This setting has been automatically commented out for you.  If you have "
 "specific encryption needs that require this option to be re-enabled, see the "

Modified: openldap/trunk/debian/po/eu.po
===================================================================
--- openldap/trunk/debian/po/eu.po	2008-07-15 15:26:26 UTC (rev 1178)
+++ openldap/trunk/debian/po/eu.po	2008-07-20 02:30:18 UTC (rev 1179)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: openldap-eu\n"
 "Report-Msgid-Bugs-To: openldap at packages.debian.org\n"
-"POT-Creation-Date: 2008-02-09 10:32-0800\n"
+"POT-Creation-Date: 2008-07-19 19:11-0700\n"
 "PO-Revision-Date: 2008-05-08 16:41+0200\n"
 "Last-Translator: Piarres Beobide <pi at beobide.net>\n"
 "Language-Team: Euskara <debian-l10n-basque at lists.debian.org>\n"
@@ -320,53 +320,15 @@
 "Orduan mugitu datubasea fitxategiak babeskopia eremu batera eta saiatu "
 "slapadd $location-tik exekutatzen."
 
-#. Type: boolean
-#. Description
-#: ../slapd.templates:16001
-msgid "Change backend type from LDBM to BDB?"
-msgstr "Interfaze mota LDBM-tik BDB-ra aldatu?"
-
-#. Type: boolean
-#. Description
-#: ../slapd.templates:16001
-msgid ""
-"The LDBM backend type has serious stability problems and has been deprecated "
-"by OpenLDAP as of 2.2. It is no longer supported by the OpenLDAP packages."
-msgstr ""
-"LDBM interfazeak estabilitate arazo handiak ditu eta baztertua izan da "
-"OpenLDAP 2.2-tik aurrera. Aurrerantzean ez da onartuko OpenLDAP paketeetan."
-
-#. Type: boolean
-#. Description
-#: ../slapd.templates:16001
-msgid ""
-"When the BDB backend is used, it must be configured properly. For more "
-"information, see /usr/share/doc/slapd/README.DB_CONFIG.gz."
-msgstr ""
-"BDB interfazea erabiltzen denean behar bezala konfiguratu behar da. Argibide "
-"gehiagorako, /usr/share/doc/slapd/README.DB_CONFIG.gz begiratu."
-
-#. Type: boolean
-#. Description
-#: ../slapd.templates:16001
-msgid ""
-"If you enable this option, an attempt will be made to update the "
-"configuration to use BDB instead of LDBM and convert the databases. If you "
-"do not enable this option, the upgrade will be aborted."
-msgstr ""
-"Aukera hau gaitzen baduzu, LDBM ordez BDB erabiltzeko konfigurazio berritze "
-"eta datubaseak bihurtzeko saiakera bat egingo da. Aukera hau gaitzen ez "
-"baduzu bertsio-berritzea utzia izango da."
-
 #. Type: select
 #. Description
-#: ../slapd.templates:17001
+#: ../slapd.templates:16001
 msgid "Database backend to use:"
 msgstr "Erabili behar den datubase interfazea:"
 
 #. Type: select
 #. Description
-#: ../slapd.templates:17001
+#: ../slapd.templates:16001
 msgid ""
 "The HDB backend is recommended. HDB and BDB use similar storage formats, but "
 "HDB adds support for subtree renames. Both support the same configuration "
@@ -378,7 +340,7 @@
 
 #. Type: select
 #. Description
-#: ../slapd.templates:17001
+#: ../slapd.templates:16001
 msgid ""
 "In either case, you should review the resulting database configuration for "
 "your needs. See /usr/share/doc/slapd/README.DB_CONFIG.gz for more details."
@@ -389,13 +351,13 @@
 
 #. Type: error
 #. Description
-#: ../slapd.templates:18001
+#: ../slapd.templates:17001
 msgid "slurpd is obsolete; replicas must be reconfigured by hand"
 msgstr "slurpd zaharkiturik dago, erreplikak eskuz konfiguratu behar dira"
 
 #. Type: error
 #. Description
-#: ../slapd.templates:18001
+#: ../slapd.templates:17001
 msgid ""
 "One or more slurpd \"replica\" options were found in your slapd config when "
 "upgrading.  Because slurpd is obsolete beginning with OpenLDAP 2.4, you will "
@@ -408,7 +370,7 @@
 
 #. Type: error
 #. Description
-#: ../slapd.templates:18001
+#: ../slapd.templates:17001
 msgid ""
 "The conversion from slurpd to the pull-based syncrepl protocol cannot be "
 "done automatically and you will need to configure your replica servers by "
@@ -422,13 +384,13 @@
 
 #. Type: error
 #. Description
-#: ../slapd.templates:19001
+#: ../slapd.templates:18001
 msgid "TLSCipherSuite values have changed"
 msgstr "TLSCipherSuite balioak aldatu egin dira"
 
 #. Type: error
 #. Description
-#: ../slapd.templates:19001
+#: ../slapd.templates:18001
 msgid ""
 "A \"TLSCipherSuite\" option was found in your slapd config when upgrading. "
 "The values allowed for this option are determined by the SSL implementation "
@@ -442,7 +404,7 @@
 
 #. Type: error
 #. Description
-#: ../slapd.templates:19001
+#: ../slapd.templates:18001
 msgid ""
 "This setting has been automatically commented out for you.  If you have "
 "specific encryption needs that require this option to be re-enabled, see the "

Modified: openldap/trunk/debian/po/fi.po
===================================================================
--- openldap/trunk/debian/po/fi.po	2008-07-15 15:26:26 UTC (rev 1178)
+++ openldap/trunk/debian/po/fi.po	2008-07-20 02:30:18 UTC (rev 1179)
@@ -2,7 +2,7 @@
 msgstr ""
 "Project-Id-Version: openldap\n"
 "Report-Msgid-Bugs-To: openldap at packages.debian.org\n"
-"POT-Creation-Date: 2008-02-09 10:32-0800\n"
+"POT-Creation-Date: 2008-07-19 19:11-0700\n"
 "PO-Revision-Date: 2008-04-09 20:55+0200\n"
 "Last-Translator: Esko ArajÃ¤rvi <edu at iki.fi>\n"
 "Language-Team: Finnish <debian-l10n-finnish at lists.debian.org>\n"
@@ -312,54 +312,15 @@
 "SiirrÃ¤ tÃ¤mÃ¤n jÃ¤lkeen tietokantatiedostot takaisin varmuuskopiohakemistoon ja "
 "aja slapadd sijainnista $location."
 
-#. Type: boolean
-#. Description
-#: ../slapd.templates:16001
-msgid "Change backend type from LDBM to BDB?"
-msgstr "Vaihdetaanko taustatietokannan tyyppi LDBM:stÃ¤ BDB:een?"
-
-#. Type: boolean
-#. Description
-#: ../slapd.templates:16001
-msgid ""
-"The LDBM backend type has serious stability problems and has been deprecated "
-"by OpenLDAP as of 2.2. It is no longer supported by the OpenLDAP packages."
-msgstr ""
-"LDBM-taustatietokannalla on suuria vakausongelmia ja se on poistumassa "
-"kÃ¤ytÃ¶stÃ¤ OpenLDAPin version 2.2 myÃ¶tÃ¤. SitÃ¤ ei enÃ¤Ã¤ tueta OpenLDAP-pakettien "
-"toimesta."
-
-#. Type: boolean
-#. Description
-#: ../slapd.templates:16001
-msgid ""
-"When the BDB backend is used, it must be configured properly. For more "
-"information, see /usr/share/doc/slapd/README.DB_CONFIG.gz."
-msgstr ""
-"KÃ¤ytettÃ¤essÃ¤ BDB-taustatietokantaa, se tulee asettaa asianmukaisesti. "
-"LisÃ¤tietoja (englanniksi) lÃ¶ytyy tiedostosta /usr/share/doc/slapd/README."
-"DB_CONFIG.gz."
-
-#. Type: boolean
-#. Description
-#: ../slapd.templates:16001
-msgid ""
-"If you enable this option, an attempt will be made to update the "
-"configuration to use BDB instead of LDBM and convert the databases. If you "
-"do not enable this option, the upgrade will be aborted."
-msgstr ""
-"Jos valitset tÃ¤mÃ¤n, yritetÃ¤Ã¤n asetukset pÃ¤ivittÃ¤Ã¤ kÃ¤yttÃ¤mÃ¤Ã¤n BDB:tÃ¤ LDBM:n "
-"sijaan ja muuntaa tietokanta. Jos et valitse tÃ¤tÃ¤, pÃ¤ivitys keskeytetÃ¤Ã¤n."
-
 #. Type: select
 #. Description
-#: ../slapd.templates:17001
+#: ../slapd.templates:16001
 msgid "Database backend to use:"
 msgstr "KÃ¤ytettÃ¤vÃ¤ taustatietokanta:"
 
 #. Type: select
 #. Description
-#: ../slapd.templates:17001
+#: ../slapd.templates:16001
 msgid ""
 "The HDB backend is recommended. HDB and BDB use similar storage formats, but "
 "HDB adds support for subtree renames. Both support the same configuration "
@@ -371,7 +332,7 @@
 
 #. Type: select
 #. Description
-#: ../slapd.templates:17001
+#: ../slapd.templates:16001
 msgid ""
 "In either case, you should review the resulting database configuration for "
 "your needs. See /usr/share/doc/slapd/README.DB_CONFIG.gz for more details."
@@ -382,13 +343,13 @@
 
 #. Type: error
 #. Description
-#: ../slapd.templates:18001
+#: ../slapd.templates:17001
 msgid "slurpd is obsolete; replicas must be reconfigured by hand"
 msgstr "slurpd on vanhentunut; kopioiden asetukset tulee tehdÃ¤ kÃ¤sin uudelleen"
 
 #. Type: error
 #. Description
-#: ../slapd.templates:18001
+#: ../slapd.templates:17001
 msgid ""
 "One or more slurpd \"replica\" options were found in your slapd config when "
 "upgrading.  Because slurpd is obsolete beginning with OpenLDAP 2.4, you will "
@@ -400,7 +361,7 @@
 
 #. Type: error
 #. Description
-#: ../slapd.templates:18001
+#: ../slapd.templates:17001
 msgid ""
 "The conversion from slurpd to the pull-based syncrepl protocol cannot be "
 "done automatically and you will need to configure your replica servers by "
@@ -414,13 +375,13 @@
 
 #. Type: error
 #. Description
-#: ../slapd.templates:19001
+#: ../slapd.templates:18001
 msgid "TLSCipherSuite values have changed"
 msgstr "TLSCipherSuite-arvot ovat muuttuneet"
 
 #. Type: error
 #. Description
-#: ../slapd.templates:19001
+#: ../slapd.templates:18001
 msgid ""
 "A \"TLSCipherSuite\" option was found in your slapd config when upgrading. "
 "The values allowed for this option are determined by the SSL implementation "
@@ -434,7 +395,7 @@
 
 #. Type: error
 #. Description
-#: ../slapd.templates:19001
+#: ../slapd.templates:18001
 msgid ""
 "This setting has been automatically commented out for you.  If you have "
 "specific encryption needs that require this option to be re-enabled, see the "

Modified: openldap/trunk/debian/po/fr.po
===================================================================
--- openldap/trunk/debian/po/fr.po	2008-07-15 15:26:26 UTC (rev 1178)
+++ openldap/trunk/debian/po/fr.po	2008-07-20 02:30:18 UTC (rev 1179)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: openldap at packages.debian.org\n"
-"POT-Creation-Date: 2008-02-09 10:32-0800\n"
+"POT-Creation-Date: 2008-07-19 19:11-0700\n"
 "PO-Revision-Date: 2008-03-10 19:56+0100\n"
 "Last-Translator: Christian Perrier <bubulle at debian.org>\n"
 "Language-Team: French <debian-l10n-french at lists.debian.org>\n"
@@ -333,56 +333,15 @@
 "DÃ©placez ensuite les bases de donnÃ©es vers un emplacement de sauvegarde et "
 "tentez d'utiliser la commande Â«Â slapaddÂ Â» depuis $location."
 
-#. Type: boolean
-#. Description
-#: ../slapd.templates:16001
-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:16001
-msgid ""
-"The LDBM backend type has serious stability problems and has been deprecated "
-"by OpenLDAP as of 2.2. It is no longer supported by the OpenLDAP packages."
-msgstr ""
-"Le module LDBM comporte des dÃ©fauts importants affectant sa stabilitÃ© et est "
-"obsolÃ¨te depuis la version 2.2 d'OpenLDAP. Il n'est plus gÃ©rÃ© par les "
-"paquets d'OpenLDAP."
-
-#. Type: boolean
-#. Description
-#: ../slapd.templates:16001
-msgid ""
-"When the BDB backend is used, it must be configured properly. For more "
-"information, 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:16001
-msgid ""
-"If you enable this option, an attempt will be made to update the "
-"configuration to use BDB instead of LDBM and convert the databases. If you "
-"do not enable this option, the upgrade will be aborted."
-msgstr ""
-"Si vous choisissez cette option, les scripts d'installation tenteront de "
-"mettre Ã  jour la configuration et de convertir les bases de donnÃ©es pour "
-"qu'elles utilisent BDB Ã  la place de LDBM. Dans le cas contraire, la mise Ã  "
-"niveau sera interrompue."
-
 #. Type: select
 #. Description
-#: ../slapd.templates:17001
+#: ../slapd.templates:16001
 msgid "Database backend to use:"
 msgstr "Module de base de donnÃ©es Ã  utiliserÂ :"
 
 #. Type: select
 #. Description
-#: ../slapd.templates:17001
+#: ../slapd.templates:16001
 msgid ""
 "The HDB backend is recommended. HDB and BDB use similar storage formats, but "
 "HDB adds support for subtree renames. Both support the same configuration "
@@ -394,7 +353,7 @@
 
 #. Type: select
 #. Description
-#: ../slapd.templates:17001
+#: ../slapd.templates:16001
 msgid ""
 "In either case, you should review the resulting database configuration for "
 "your needs. See /usr/share/doc/slapd/README.DB_CONFIG.gz for more details."
@@ -405,13 +364,13 @@
 
 #. Type: error
 #. Description
-#: ../slapd.templates:18001
+#: ../slapd.templates:17001
 msgid "slurpd is obsolete; replicas must be reconfigured by hand"
 msgstr "Programme slurpd obsolÃ¨teÂ : reconfiguration manuelle des rÃ©plicats"
 
 #. Type: error
 #. Description
-#: ../slapd.templates:18001
+#: ../slapd.templates:17001
 msgid ""
 "One or more slurpd \"replica\" options were found in your slapd config when "
 "upgrading.  Because slurpd is obsolete beginning with OpenLDAP 2.4, you will "
@@ -424,7 +383,7 @@
 
 #. Type: error
 #. Description
-#: ../slapd.templates:18001
+#: ../slapd.templates:17001
 msgid ""
 "The conversion from slurpd to the pull-based syncrepl protocol cannot be "
 "done automatically and you will need to configure your replica servers by "
@@ -437,13 +396,13 @@
 
 #. Type: error
 #. Description
-#: ../slapd.templates:19001
+#: ../slapd.templates:18001
 msgid "TLSCipherSuite values have changed"
 msgstr "Changement des valeurs possibles pour Â«Â TLSCipherSuiteÂ Â»"
 
 #. Type: error
 #. Description
-#: ../slapd.templates:19001
+#: ../slapd.templates:18001
 msgid ""
 "A \"TLSCipherSuite\" option was found in your slapd config when upgrading. "
 "The values allowed for this option are determined by the SSL implementation "
@@ -458,7 +417,7 @@
 
 #. Type: error
 #. Description
-#: ../slapd.templates:19001
+#: ../slapd.templates:18001
 msgid ""
 "This setting has been automatically commented out for you.  If you have "
 "specific encryption needs that require this option to be re-enabled, see the "

Modified: openldap/trunk/debian/po/gl.po
===================================================================
--- openldap/trunk/debian/po/gl.po	2008-07-15 15:26:26 UTC (rev 1178)
+++ openldap/trunk/debian/po/gl.po	2008-07-20 02:30:18 UTC (rev 1179)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: openldap\n"
 "Report-Msgid-Bugs-To: openldap at packages.debian.org\n"
-"POT-Creation-Date: 2008-02-09 10:32-0800\n"
+"POT-Creation-Date: 2008-07-19 19:11-0700\n"
 "PO-Revision-Date: 2008-05-08 20:39+0100\n"
 "Last-Translator: Jacobo Tarrio <jtarrio at debian.org>\n"
 "Language-Team: Galician <proxecto at trasno.net>\n"
@@ -320,54 +320,15 @@
 "Volva trasladar os ficheiros da base de datos a unha zona de copias de "
 "seguridade e probe a executar slapadd desde $location."
 
-#. Type: boolean
-#. Description
-#: ../slapd.templates:16001
-msgid "Change backend type from LDBM to BDB?"
-msgstr "Â¿Cambiar o tipo de motor de LDBM a BDB?"
-
-#. Type: boolean
-#. Description
-#: ../slapd.templates:16001
-msgid ""
-"The LDBM backend type has serious stability problems and has been deprecated "
-"by OpenLDAP as of 2.2. It is no longer supported by the OpenLDAP packages."
-msgstr ""
-"O tipo de motor LDBM ten graves problemas de estabilidade e estÃ¡ declarado a "
-"extinguir desde OpenLDAP 2.2. Xa non estÃ¡ soportado polos paquetes de "
-"OpenLDAP."
-
-#. Type: boolean
-#. Description
-#: ../slapd.templates:16001
-msgid ""
-"When the BDB backend is used, it must be configured properly. For more "
-"information, see /usr/share/doc/slapd/README.DB_CONFIG.gz."
-msgstr ""
-"Para empregar o motor BDB hai que configuralo correctamente. Para mÃ¡is "
-"informaciÃ³n, consulte /usr/share/doc/slapd/README.DB_CONFIG.gz"
-
-#. Type: boolean
-#. Description
-#: ../slapd.templates:16001
-msgid ""
-"If you enable this option, an attempt will be made to update the "
-"configuration to use BDB instead of LDBM and convert the databases. If you "
-"do not enable this option, the upgrade will be aborted."
-msgstr ""
-"Se activa esta opciÃ³n hase tentar actualizar a configuraciÃ³n para empregar "
-"BDB no canto de LDBM e converter as bases de datos. Se non activa esta "
-"opciÃ³n, hase cancelar a actualizaciÃ³n."
-
 #. Type: select
 #. Description
-#: ../slapd.templates:17001
+#: ../slapd.templates:16001
 msgid "Database backend to use:"
 msgstr "Motor de base de datos a empregar:"
 
 #. Type: select
 #. Description
-#: ../slapd.templates:17001
+#: ../slapd.templates:16001
 msgid ""
 "The HDB backend is recommended. HDB and BDB use similar storage formats, but "
 "HDB adds support for subtree renames. Both support the same configuration "
@@ -379,7 +340,7 @@
 
 #. Type: select
 #. Description
-#: ../slapd.templates:17001
+#: ../slapd.templates:16001
 msgid ""
 "In either case, you should review the resulting database configuration for "
 "your needs. See /usr/share/doc/slapd/README.DB_CONFIG.gz for more details."
@@ -390,13 +351,13 @@
 
 #. Type: error
 #. Description
-#: ../slapd.templates:18001
+#: ../slapd.templates:17001
 msgid "slurpd is obsolete; replicas must be reconfigured by hand"
 msgstr "slurpd estÃ¡ obsoleto; Ã© preciso reconfigurar as rÃ©plicas Ã¡ man"
 
 #. Type: error
 #. Description
-#: ../slapd.templates:18001
+#: ../slapd.templates:17001
 msgid ""
 "One or more slurpd \"replica\" options were found in your slapd config when "
 "upgrading.  Because slurpd is obsolete beginning with OpenLDAP 2.4, you will "
@@ -408,7 +369,7 @@
 
 #. Type: error
 #. Description
-#: ../slapd.templates:18001
+#: ../slapd.templates:17001
 msgid ""
 "The conversion from slurpd to the pull-based syncrepl protocol cannot be "
 "done automatically and you will need to configure your replica servers by "
@@ -422,13 +383,13 @@
 
 #. Type: error
 #. Description
-#: ../slapd.templates:19001
+#: ../slapd.templates:18001
 msgid "TLSCipherSuite values have changed"
 msgstr "Os valores de TLSCipherSuite cambiaron"
 
 #. Type: error
 #. Description
-#: ../slapd.templates:19001
+#: ../slapd.templates:18001
 msgid ""
 "A \"TLSCipherSuite\" option was found in your slapd config when upgrading. "
 "The values allowed for this option are determined by the SSL implementation "
@@ -443,7 +404,7 @@
 
 #. Type: error
 #. Description
-#: ../slapd.templates:19001
+#: ../slapd.templates:18001
 msgid ""
 "This setting has been automatically commented out for you.  If you have "
 "specific encryption needs that require this option to be re-enabled, see the "

Modified: openldap/trunk/debian/po/it.po
===================================================================
--- openldap/trunk/debian/po/it.po	2008-07-15 15:26:26 UTC (rev 1178)
+++ openldap/trunk/debian/po/it.po	2008-07-20 02:30:18 UTC (rev 1179)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: openldap 2.4.7 italian debconf templates\n"
 "Report-Msgid-Bugs-To: openldap at packages.debian.org\n"
-"POT-Creation-Date: 2008-02-09 10:32-0800\n"
+"POT-Creation-Date: 2008-07-19 19:11-0700\n"
 "PO-Revision-Date: 2008-04-22 21:55+0200\n"
 "Last-Translator: Luca Monducci <luca.mo at tiscali.it>\n"
 "Language-Team: Italian <debian-l10n-italian at lists.debian.org>\n"
@@ -326,54 +326,15 @@
 "Poi spostare i file del database in un'area di backup e provare a eseguire "
 "slapadd da $location."
 
-#. Type: boolean
-#. Description
-#: ../slapd.templates:16001
-msgid "Change backend type from LDBM to BDB?"
-msgstr "Cambiare il tipo di backend da LDBM in BDB?"
-
-#. Type: boolean
-#. Description
-#: ../slapd.templates:16001
-msgid ""
-"The LDBM backend type has serious stability problems and has been deprecated "
-"by OpenLDAP as of 2.2. It is no longer supported by the OpenLDAP packages."
-msgstr ""
-"Il backend di tipo LDBM ha dei seri problemi di stabilitÃ  ed Ã¨ stato "
-"deprecato a partire da OpenLDAP 2.2. Non Ã¨ piÃ¹ supportato dai pacchetti "
-"OpenLDAP."
-
-#. Type: boolean
-#. Description
-#: ../slapd.templates:16001
-msgid ""
-"When the BDB backend is used, it must be configured properly. For more "
-"information, see /usr/share/doc/slapd/README.DB_CONFIG.gz."
-msgstr ""
-"Per usare BDB Ã¨ necessario configurarlo, per maggiori informazioni si veda /"
-"usr/share/doc/slapd/README.DB_CONFIG.gz."
-
-#. Type: boolean
-#. Description
-#: ../slapd.templates:16001
-msgid ""
-"If you enable this option, an attempt will be made to update the "
-"configuration to use BDB instead of LDBM and convert the databases. If you "
-"do not enable this option, the upgrade will be aborted."
-msgstr ""
-"Se si accetta, verrÃ  tentato l'aggiornamento della configurazione per "
-"utilizzare BDB al posto di LDBM e la conversione dei database. Qualora si "
-"rifiuti, l'aggiornamento verrÃ  interrotto."
-
 #. Type: select
 #. Description
-#: ../slapd.templates:17001
+#: ../slapd.templates:16001
 msgid "Database backend to use:"
 msgstr "Database di backend da usare:"
 
 #. Type: select
 #. Description
-#: ../slapd.templates:17001
+#: ../slapd.templates:16001
 msgid ""
 "The HDB backend is recommended. HDB and BDB use similar storage formats, but "
 "HDB adds support for subtree renames. Both support the same configuration "
@@ -385,7 +346,7 @@
 
 #. Type: select
 #. Description
-#: ../slapd.templates:17001
+#: ../slapd.templates:16001
 msgid ""
 "In either case, you should review the resulting database configuration for "
 "your needs. See /usr/share/doc/slapd/README.DB_CONFIG.gz for more details."
@@ -396,13 +357,13 @@
 
 #. Type: error
 #. Description
-#: ../slapd.templates:18001
+#: ../slapd.templates:17001
 msgid "slurpd is obsolete; replicas must be reconfigured by hand"
 msgstr "slurpd Ã¨ obsoleto; le repliche devono essere riconfigurate manualmente"
 
 #. Type: error
 #. Description
-#: ../slapd.templates:18001
+#: ../slapd.templates:17001
 msgid ""
 "One or more slurpd \"replica\" options were found in your slapd config when "
 "upgrading.  Because slurpd is obsolete beginning with OpenLDAP 2.4, you will "
@@ -415,7 +376,7 @@
 
 #. Type: error
 #. Description
-#: ../slapd.templates:18001
+#: ../slapd.templates:17001
 msgid ""
 "The conversion from slurpd to the pull-based syncrepl protocol cannot be "
 "done automatically and you will need to configure your replica servers by "
@@ -429,13 +390,13 @@
 
 #. Type: error
 #. Description
-#: ../slapd.templates:19001
+#: ../slapd.templates:18001
 msgid "TLSCipherSuite values have changed"
 msgstr "Sono cambiati i valori di TLSCipherSuite"
 
 #. Type: error
 #. Description
-#: ../slapd.templates:19001
+#: ../slapd.templates:18001
 msgid ""
 "A \"TLSCipherSuite\" option was found in your slapd config when upgrading. "
 "The values allowed for this option are determined by the SSL implementation "
@@ -450,7 +411,7 @@
 
 #. Type: error
 #. Description
-#: ../slapd.templates:19001
+#: ../slapd.templates:18001
 msgid ""
 "This setting has been automatically commented out for you.  If you have "
 "specific encryption needs that require this option to be re-enabled, see the "

Modified: openldap/trunk/debian/po/ja.po
===================================================================
--- openldap/trunk/debian/po/ja.po	2008-07-15 15:26:26 UTC (rev 1178)
+++ openldap/trunk/debian/po/ja.po	2008-07-20 02:30:18 UTC (rev 1179)
@@ -15,7 +15,7 @@
 msgstr ""
 "Project-Id-Version: openldap\n"
 "Report-Msgid-Bugs-To: openldap at packages.debian.org\n"
-"POT-Creation-Date: 2008-02-09 10:32-0800\n"
+"POT-Creation-Date: 2008-07-19 19:11-0700\n"
 "PO-Revision-Date: 2008-05-09 11:50+0900\n"
 "Last-Translator: Kenshi Muto <kmuto at debian.org>\n"
 "Language-Team: Japanese <debian-japanese at lists.debian.org>\n"
@@ -322,53 +322,15 @@
 "ãã—ã¦ã€ãƒ‡ãƒ¼ã‚¿ãƒ™ãƒ¼ã‚¹ãƒ•ã‚¡ã‚¤ãƒ«ã‚’ãƒãƒƒã‚¯ã‚¢ãƒƒãƒ—é ˜åŸŸã«æˆ»ã—ã€slapadd ã‚’ $location ã‹"
 "ã‚‰å®Ÿè¡Œã—ã¦ã¿ã¾ã™ã€‚"
 
-#. Type: boolean
-#. Description
-#: ../slapd.templates:16001
-msgid "Change backend type from LDBM to BDB?"
-msgstr "ãƒãƒƒã‚¯ã‚¨ãƒ³ãƒ‰ã®å½¢å¼ã‚’ LDBM ã‹ã‚‰ BDB ã«å¤‰æ›´ã—ã¾ã™ã‹?"
-
-#. Type: boolean
-#. Description
-#: ../slapd.templates:16001
-msgid ""
-"The LDBM backend type has serious stability problems and has been deprecated "
-"by OpenLDAP as of 2.2. It is no longer supported by the OpenLDAP packages."
-msgstr ""
-"LDBM ãƒãƒƒã‚¯ã‚¨ãƒ³ãƒ‰å½¢å¼ã¯æ·±åˆ»ãªå®‰å®šæ€§ã®å•é¡ŒãŒã‚ã‚Šã€OpenLDAP ã® 2.2 ã§å»ƒæ¢ã•ã‚Œã¾"
-"ã—ãŸã€‚OpenLDAP ãƒ‘ãƒƒã‚±ãƒ¼ã‚¸ã§ã¯ã‚‚ã†ã‚µãƒãƒ¼ãƒˆã•ã‚Œã¦ã„ã¾ã›ã‚“ã€‚"
-
-#. Type: boolean
-#. Description
-#: ../slapd.templates:16001
-msgid ""
-"When the BDB backend is used, it must be configured properly. For more "
-"information, see /usr/share/doc/slapd/README.DB_CONFIG.gz."
-msgstr ""
-"BDB ãƒãƒƒã‚¯ã‚¨ãƒ³ãƒ‰ã‚’åˆ©ç”¨ã™ã‚‹ã«ã¯ã€æ£ã—ãè¨å®šã™ã‚‹å¿…è¦ãŒã‚ã‚Šã¾ã™ã€‚è©³ç´°ãªæƒ…å ±ã«ã¤"
-"ã„ã¦ã¯ã€/usr/share/doc/slapd/README.DB_CONFIG.gz ã‚’å‚ç…§ã—ã¦ãã ã•ã„ã€‚"
-
-#. Type: boolean
-#. Description
-#: ../slapd.templates:16001
-msgid ""
-"If you enable this option, an attempt will be made to update the "
-"configuration to use BDB instead of LDBM and convert the databases. If you "
-"do not enable this option, the upgrade will be aborted."
-msgstr ""
-"ã“ã®é¸æŠžè‚¢ã«ã€Œã¯ã„ã€ã¨ç”ãˆã‚‹ã¨ã€LDBM ã®ä»£ã‚ã‚Šã« BDB ã‚’ä½¿ã†ã‚ˆã†ã«è¨å®šã‚’æ›´æ–°ã—"
-"ã¦ãƒ‡ãƒ¼ã‚¿ãƒ™ãƒ¼ã‚¹ã‚’å¤‰æ›ã™ã‚‹ã“ã¨ãŒè©¦ã¿ã‚‰ã‚Œã¾ã™ã€‚ã€Œã„ã„ãˆã€ã¨ã™ã‚‹ã¨ã€æ›´æ–°ã¯ä¸æ¢ã•"
-"ã‚Œã¾ã™ã€‚"
-
 #. Type: select
 #. Description
-#: ../slapd.templates:17001
+#: ../slapd.templates:16001
 msgid "Database backend to use:"
 msgstr "åˆ©ç”¨ã™ã‚‹ãƒ‡ãƒ¼ã‚¿ãƒ™ãƒ¼ã‚¹ãƒãƒƒã‚¯ã‚¨ãƒ³ãƒ‰:"
 
 #. Type: select
 #. Description
-#: ../slapd.templates:17001
+#: ../slapd.templates:16001
 msgid ""
 "The HDB backend is recommended. HDB and BDB use similar storage formats, but "
 "HDB adds support for subtree renames. Both support the same configuration "
@@ -380,7 +342,7 @@
 
 #. Type: select
 #. Description
-#: ../slapd.templates:17001
+#: ../slapd.templates:16001
 msgid ""
 "In either case, you should review the resulting database configuration for "
 "your needs. See /usr/share/doc/slapd/README.DB_CONFIG.gz for more details."
@@ -390,13 +352,13 @@
 
 #. Type: error
 #. Description
-#: ../slapd.templates:18001
+#: ../slapd.templates:17001
 msgid "slurpd is obsolete; replicas must be reconfigured by hand"
 msgstr "slurpd ã¯æ™‚ä»£é…ã‚Œã§ã™; è¤‡è£½ã¯æ‰‹å‹•ã§è¨å®šã—ãªã‘ã‚Œã°ãªã‚Šã¾ã›ã‚“"
 
 #. Type: error
 #. Description
-#: ../slapd.templates:18001
+#: ../slapd.templates:17001
 msgid ""
 "One or more slurpd \"replica\" options were found in your slapd config when "
 "upgrading.  Because slurpd is obsolete beginning with OpenLDAP 2.4, you will "
@@ -408,7 +370,7 @@
 
 #. Type: error
 #. Description
-#: ../slapd.templates:18001
+#: ../slapd.templates:17001
 msgid ""
 "The conversion from slurpd to the pull-based syncrepl protocol cannot be "
 "done automatically and you will need to configure your replica servers by "
@@ -421,13 +383,13 @@
 
 #. Type: error
 #. Description
-#: ../slapd.templates:19001
+#: ../slapd.templates:18001
 msgid "TLSCipherSuite values have changed"
 msgstr "TLSCipherSuite ã®å€¤ãŒå¤‰æ›´ã•ã‚Œã¾ã—ãŸ"
 
 #. Type: error
 #. Description
-#: ../slapd.templates:19001
+#: ../slapd.templates:18001
 msgid ""
 "A \"TLSCipherSuite\" option was found in your slapd config when upgrading. "
 "The values allowed for this option are determined by the SSL implementation "
@@ -441,7 +403,7 @@
 
 #. Type: error
 #. Description
-#: ../slapd.templates:19001
+#: ../slapd.templates:18001
 msgid ""
 "This setting has been automatically commented out for you.  If you have "
 "specific encryption needs that require this option to be re-enabled, see the "

Modified: openldap/trunk/debian/po/nl.po
===================================================================
--- openldap/trunk/debian/po/nl.po	2008-07-15 15:26:26 UTC (rev 1178)
+++ openldap/trunk/debian/po/nl.po	2008-07-20 02:30:18 UTC (rev 1179)
@@ -15,7 +15,7 @@
 msgstr ""
 "Project-Id-Version: openldap2\n"
 "Report-Msgid-Bugs-To: openldap at packages.debian.org\n"
-"POT-Creation-Date: 2008-02-09 10:32-0800\n"
+"POT-Creation-Date: 2008-07-19 19:11-0700\n"
 "PO-Revision-Date: 2008-05-08 12:42+0100\n"
 "Last-Translator: Bart Cornelis <cobaco at skolelinux.no>\n"
 "Language-Team: debian-l10n-dutch <debian-l10n-dutch at lists.debian.org>\n"
@@ -336,56 +336,15 @@
 "Vervolgens verplaatst u de databasebestanden terug naar de reservekopie-map "
 "en probeert u slapadd uit te voeren vanaf $location."
 
-#. Type: boolean
-#. Description
-#: ../slapd.templates:16001
-msgid "Change backend type from LDBM to BDB?"
-msgstr "Wilt u het backendtype veranderen van LDBM naar BDB?"
-
-#. Type: boolean
-#. Description
-#: ../slapd.templates:16001
-msgid ""
-"The LDBM backend type has serious stability problems and has been deprecated "
-"by OpenLDAP as of 2.2. It is no longer supported by the OpenLDAP packages."
-msgstr ""
-"Het LDBM-backend heeft serieuze stabiliteitsproblemen en is daarom sinds "
-"versie 2.2. van OpenLDAP verouderd verklaart, Het wordt dan ook niet meer "
-"ondersteund door de OpenLDAP-pakketten."
-
-#. Type: boolean
-#. Description
-#: ../slapd.templates:16001
-msgid ""
-"When the BDB backend is used, it must be configured properly. For more "
-"information, see /usr/share/doc/slapd/README.DB_CONFIG.gz."
-msgstr ""
-"Wanneer u gebruik maakt van de BDB-backend dient u ervoor te zorgen dat deze "
-"juist ingesteld is. Meer informatie hierover vindt u in /usr/share/doc/slapd/"
-"README.DB_CONFIG.gz"
-
-#. Type: boolean
-#. Description
-#: ../slapd.templates:16001
-msgid ""
-"If you enable this option, an attempt will be made to update the "
-"configuration to use BDB instead of LDBM and convert the databases. If you "
-"do not enable this option, the upgrade will be aborted."
-msgstr ""
-"Wanneer u deze optie kiest zal er een poging gewaagd worden om uw "
-"configuratie aan te passen van de LDBM-backend naar de BDB-backend en om uw "
-"databases overeenkomstig te converteren. Als u deze optie afslaat wordt de "
-"opwaardering afgebroken."
-
 #. Type: select
 #. Description
-#: ../slapd.templates:17001
+#: ../slapd.templates:16001
 msgid "Database backend to use:"
 msgstr "Welk database-backend wilt u gebruiken?"
 
 #. Type: select
 #. Description
-#: ../slapd.templates:17001
+#: ../slapd.templates:16001
 msgid ""
 "The HDB backend is recommended. HDB and BDB use similar storage formats, but "
 "HDB adds support for subtree renames. Both support the same configuration "
@@ -397,7 +356,7 @@
 
 #. Type: select
 #. Description
-#: ../slapd.templates:17001
+#: ../slapd.templates:16001
 msgid ""
 "In either case, you should review the resulting database configuration for "
 "your needs. See /usr/share/doc/slapd/README.DB_CONFIG.gz for more details."
@@ -408,13 +367,13 @@
 
 #. Type: error
 #. Description
-#: ../slapd.templates:18001
+#: ../slapd.templates:17001
 msgid "slurpd is obsolete; replicas must be reconfigured by hand"
 msgstr "slurpd is verouderd; replica's dienen handmatig ingesteld te worden"
 
 #. Type: error
 #. Description
-#: ../slapd.templates:18001
+#: ../slapd.templates:17001
 msgid ""
 "One or more slurpd \"replica\" options were found in your slapd config when "
 "upgrading.  Because slurpd is obsolete beginning with OpenLDAP 2.4, you will "
@@ -426,7 +385,7 @@
 
 #. Type: error
 #. Description
-#: ../slapd.templates:18001
+#: ../slapd.templates:17001
 msgid ""
 "The conversion from slurpd to the pull-based syncrepl protocol cannot be "
 "done automatically and you will need to configure your replica servers by "
@@ -440,13 +399,13 @@
 
 #. Type: error
 #. Description
-#: ../slapd.templates:19001
+#: ../slapd.templates:18001
 msgid "TLSCipherSuite values have changed"
 msgstr "De TLSCipherSuite-waardes zijn veranderd"
 
 #. Type: error
 #. Description
-#: ../slapd.templates:19001
+#: ../slapd.templates:18001
 msgid ""
 "A \"TLSCipherSuite\" option was found in your slapd config when upgrading. "
 "The values allowed for this option are determined by the SSL implementation "
@@ -460,7 +419,7 @@
 
 #. Type: error
 #. Description
-#: ../slapd.templates:19001
+#: ../slapd.templates:18001
 msgid ""
 "This setting has been automatically commented out for you.  If you have "
 "specific encryption needs that require this option to be re-enabled, see the "

Modified: openldap/trunk/debian/po/pt.po
===================================================================
--- openldap/trunk/debian/po/pt.po	2008-07-15 15:26:26 UTC (rev 1178)
+++ openldap/trunk/debian/po/pt.po	2008-07-20 02:30:18 UTC (rev 1179)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: openldap 2.3.38-2\n"
 "Report-Msgid-Bugs-To: openldap at packages.debian.org\n"
-"POT-Creation-Date: 2008-02-09 10:32-0800\n"
+"POT-Creation-Date: 2008-07-19 19:11-0700\n"
 "PO-Revision-Date: 2008-05-12 21:10+0100\n"
 "Last-Translator: Tiago Fernandes <tjg.fernandes at gmail.com>\n"
 "Language-Team: Portuguese <traduz at debianpt.org>\n"
@@ -327,54 +327,15 @@
 "Depois mova os ficheiros da base de dados de volta para a Ã¡rea de backup e a "
 "seguir tente correr o slapadd a partir de $location."
 
-#. Type: boolean
-#. Description
-#: ../slapd.templates:16001
-msgid "Change backend type from LDBM to BDB?"
-msgstr "Mudar o tipo de backend de LDBM para BDB?"
-
-#. Type: boolean
-#. Description
-#: ../slapd.templates:16001
-msgid ""
-"The LDBM backend type has serious stability problems and has been deprecated "
-"by OpenLDAP as of 2.2. It is no longer supported by the OpenLDAP packages."
-msgstr ""
-"O backend to tipo LDBM tem sÃ©rios problemas de estabilidade e foi depreceado "
-"pelo OpenLDAP, a partir da versÃ£o 2.2. Deixou de ser suportado pelos pacotes "
-"OpenLDAP."
-
-#. Type: boolean
-#. Description
-#: ../slapd.templates:16001
-msgid ""
-"When the BDB backend is used, it must be configured properly. For more "
-"information, see /usr/share/doc/slapd/README.DB_CONFIG.gz."
-msgstr ""
-"Quando o backend BDB, Ã© usado, deverÃ¡ ser configurado correctamente. Para "
-"mais informaÃ§Ã£o, ver /usr/share/doc/slap/README.DB_CONFIG.gz"
-
-#. Type: boolean
-#. Description
-#: ../slapd.templates:16001
-msgid ""
-"If you enable this option, an attempt will be made to update the "
-"configuration to use BDB instead of LDBM and convert the databases. If you "
-"do not enable this option, the upgrade will be aborted."
-msgstr ""
-"Se activar esta opÃ§Ã£o serÃ¡ feita uma tentativa para actualizar a "
-"configuraÃ§Ã£o para usar BDB em vez de LDBM e converter as bases de dados. Se "
-"nÃ£o activar esta opÃ§Ã£o, a actualizaÃ§Ã£o serÃ¡ abortada."
-
 #. Type: select
 #. Description
-#: ../slapd.templates:17001
+#: ../slapd.templates:16001
 msgid "Database backend to use:"
 msgstr "Backend a usar para a base de dados:"
 
 #. Type: select
 #. Description
-#: ../slapd.templates:17001
+#: ../slapd.templates:16001
 msgid ""
 "The HDB backend is recommended. HDB and BDB use similar storage formats, but "
 "HDB adds support for subtree renames. Both support the same configuration "
@@ -386,7 +347,7 @@
 
 #. Type: select
 #. Description
-#: ../slapd.templates:17001
+#: ../slapd.templates:16001
 msgid ""
 "In either case, you should review the resulting database configuration for "
 "your needs. See /usr/share/doc/slapd/README.DB_CONFIG.gz for more details."
@@ -397,13 +358,13 @@
 
 #. Type: error
 #. Description
-#: ../slapd.templates:18001
+#: ../slapd.templates:17001
 msgid "slurpd is obsolete; replicas must be reconfigured by hand"
 msgstr "o slurpd estÃ¡ obsoleto; as rÃ©plicas terÃ£o de ser configuradas Ã¡ mÃ£o"
 
 #. Type: error
 #. Description
-#: ../slapd.templates:18001
+#: ../slapd.templates:17001
 msgid ""
 "One or more slurpd \"replica\" options were found in your slapd config when "
 "upgrading.  Because slurpd is obsolete beginning with OpenLDAP 2.4, you will "
@@ -416,7 +377,7 @@
 
 #. Type: error
 #. Description
-#: ../slapd.templates:18001
+#: ../slapd.templates:17001
 msgid ""
 "The conversion from slurpd to the pull-based syncrepl protocol cannot be "
 "done automatically and you will need to configure your replica servers by "
@@ -430,13 +391,13 @@
 
 #. Type: error
 #. Description
-#: ../slapd.templates:19001
+#: ../slapd.templates:18001
 msgid "TLSCipherSuite values have changed"
 msgstr "Os valores para TLSCipherSuite foram alterados"
 
 #. Type: error
 #. Description
-#: ../slapd.templates:19001
+#: ../slapd.templates:18001
 msgid ""
 "A \"TLSCipherSuite\" option was found in your slapd config when upgrading. "
 "The values allowed for this option are determined by the SSL implementation "
@@ -451,7 +412,7 @@
 
 #. Type: error
 #. Description
-#: ../slapd.templates:19001
+#: ../slapd.templates:18001
 msgid ""
 "This setting has been automatically commented out for you.  If you have "
 "specific encryption needs that require this option to be re-enabled, see the "

Modified: openldap/trunk/debian/po/pt_BR.po
===================================================================
--- openldap/trunk/debian/po/pt_BR.po	2008-07-15 15:26:26 UTC (rev 1178)
+++ openldap/trunk/debian/po/pt_BR.po	2008-07-20 02:30:18 UTC (rev 1179)
@@ -10,7 +10,7 @@
 msgstr ""
 "Project-Id-Version: openldap 2.4.7-3\n"
 "Report-Msgid-Bugs-To: openldap at packages.debian.org\n"
-"POT-Creation-Date: 2008-02-09 10:32-0800\n"
+"POT-Creation-Date: 2008-07-19 19:11-0700\n"
 "PO-Revision-Date: 2008-05-08 10:00-0300\n"
 "Last-Translator: Eder L. Marques (frolic) <frolic at debian-ce.org>\n"
 "Language-Team: l10n Portuguese <debian-l10n-portuguese at lists.debian.org>\n"
@@ -333,54 +333,15 @@
 "EntÃ£o mova os arquivos das bases de dados de volta para a Ã¡rea de backup e "
 "depois tente executar slapadd a partir de $location."
 
-#. Type: boolean
-#. Description
-#: ../slapd.templates:16001
-msgid "Change backend type from LDBM to BDB?"
-msgstr "Mudar o tipo do \"backend\" de LDBM para BDB?"
-
-#. Type: boolean
-#. Description
-#: ../slapd.templates:16001
-msgid ""
-"The LDBM backend type has serious stability problems and has been deprecated "
-"by OpenLDAP as of 2.2. It is no longer supported by the OpenLDAP packages."
-msgstr ""
-"O \"backend\" tipo LDBM tem sÃ©rios problemas de estabilidade e tornou-se "
-"obsoleto a partir do OpenLDAP 2.2. Ele nÃ£o Ã© mais suportado pelos pacotes "
-"OpenLDAP."
-
-#. Type: boolean
-#. Description
-#: ../slapd.templates:16001
-msgid ""
-"When the BDB backend is used, it must be configured properly. For more "
-"information, see /usr/share/doc/slapd/README.DB_CONFIG.gz."
-msgstr ""
-"Quando o \"backend\" BDB Ã© usado, ele deve ser configurado corretamente. "
-"Para mais informaÃ§Ãµes, veja /usr/share/doc/slapd/README.DB_CONFIG.gz"
-
-#. Type: boolean
-#. Description
-#: ../slapd.templates:16001
-msgid ""
-"If you enable this option, an attempt will be made to update the "
-"configuration to use BDB instead of LDBM and convert the databases. If you "
-"do not enable this option, the upgrade will be aborted."
-msgstr ""
-"Se vocÃª habilitar esta opÃ§Ã£o, uma tentativa serÃ¡ feita para atualizar a "
-"configuraÃ§Ã£o para usar BDB ao invÃ©s de LDBM e converter suas bases de dados. "
-"Se vocÃª nÃ£o habilitar esta opÃ§Ã£o, a atualizaÃ§Ã£o irÃ¡ abortar."
-
 #. Type: select
 #. Description
-#: ../slapd.templates:17001
+#: ../slapd.templates:16001
 msgid "Database backend to use:"
 msgstr "\"Backend\" de base de dados a ser usado:"
 
 #. Type: select
 #. Description
-#: ../slapd.templates:17001
+#: ../slapd.templates:16001
 msgid ""
 "The HDB backend is recommended. HDB and BDB use similar storage formats, but "
 "HDB adds support for subtree renames. Both support the same configuration "
@@ -392,7 +353,7 @@
 
 #. Type: select
 #. Description
-#: ../slapd.templates:17001
+#: ../slapd.templates:16001
 msgid ""
 "In either case, you should review the resulting database configuration for "
 "your needs. See /usr/share/doc/slapd/README.DB_CONFIG.gz for more details."
@@ -403,13 +364,13 @@
 
 #. Type: error
 #. Description
-#: ../slapd.templates:18001
+#: ../slapd.templates:17001
 msgid "slurpd is obsolete; replicas must be reconfigured by hand"
 msgstr "O slurpd estÃ¡ obsoleto, rÃ©plicas devem ser configuradas manualmente."
 
 #. Type: error
 #. Description
-#: ../slapd.templates:18001
+#: ../slapd.templates:17001
 msgid ""
 "One or more slurpd \"replica\" options were found in your slapd config when "
 "upgrading.  Because slurpd is obsolete beginning with OpenLDAP 2.4, you will "
@@ -422,7 +383,7 @@
 
 #. Type: error
 #. Description
-#: ../slapd.templates:18001
+#: ../slapd.templates:17001
 msgid ""
 "The conversion from slurpd to the pull-based syncrepl protocol cannot be "
 "done automatically and you will need to configure your replica servers by "
@@ -436,13 +397,13 @@
 
 #. Type: error
 #. Description
-#: ../slapd.templates:19001
+#: ../slapd.templates:18001
 msgid "TLSCipherSuite values have changed"
 msgstr "Os valores da TLSCipherSuite mudou"
 
 #. Type: error
 #. Description
-#: ../slapd.templates:19001
+#: ../slapd.templates:18001
 msgid ""
 "A \"TLSCipherSuite\" option was found in your slapd config when upgrading. "
 "The values allowed for this option are determined by the SSL implementation "
@@ -457,7 +418,7 @@
 
 #. Type: error
 #. Description
-#: ../slapd.templates:19001
+#: ../slapd.templates:18001
 msgid ""
 "This setting has been automatically commented out for you.  If you have "
 "specific encryption needs that require this option to be re-enabled, see the "

Modified: openldap/trunk/debian/po/ru.po
===================================================================
--- openldap/trunk/debian/po/ru.po	2008-07-15 15:26:26 UTC (rev 1178)
+++ openldap/trunk/debian/po/ru.po	2008-07-20 02:30:18 UTC (rev 1179)
@@ -15,7 +15,7 @@
 msgstr ""
 "Project-Id-Version: openldap 2.4.7-6.4\n"
 "Report-Msgid-Bugs-To: openldap at packages.debian.org\n"
-"POT-Creation-Date: 2008-02-09 10:32-0800\n"
+"POT-Creation-Date: 2008-07-19 19:11-0700\n"
 "PO-Revision-Date: 2008-05-11 08:49+0400\n"
 "Last-Translator: Yuri Kozlov <kozlov.y at gmail.com>\n"
 "Language-Team: Russian <debian-l10n-russian at lists.debian.org>\n"
@@ -330,54 +330,15 @@
 "Ð—Ð°Ñ‚ÐµÐ¼ Ð¿ÐµÑ€ÐµÐ¼ÐµÑÑ‚Ð¸Ñ‚Ðµ Ñ„Ð°Ð¹Ð»Ñ‹ Ð±Ð°Ð·Ñ‹ Ð´Ð°Ð½Ð½Ñ‹Ñ… Ð¾Ð±Ñ€Ð°Ñ‚Ð½Ð¾ Ð² Ð¼ÐµÑÑ‚Ð¾ Ñ…Ñ€Ð°Ð½ÐµÐ½Ð¸Ñ Ñ€ÐµÐ·ÐµÑ€Ð²Ð½Ð¾Ð¹ ÐºÐ¾Ð¿Ð¸Ð¸ "
 "Ð¸ Ð¿Ð¾Ð¿Ñ‹Ñ‚Ð°Ð¹Ñ‚ÐµÑÑŒ Ð²Ñ‹Ð¿Ð¾Ð»Ð½Ð¸Ñ‚ÑŒ slapadd Ð¸Ð· $location."
 
-#. Type: boolean
-#. Description
-#: ../slapd.templates:16001
-msgid "Change backend type from LDBM to BDB?"
-msgstr "Ð˜Ð·Ð¼ÐµÐ½Ð¸Ñ‚ÑŒ Ñ‚Ð¸Ð¿ ÑÐµÑ€Ð²ÐµÑ€Ð° Ñ LDBM Ð½Ð° BDB?"
-
-#. Type: boolean
-#. Description
-#: ../slapd.templates:16001
-msgid ""
-"The LDBM backend type has serious stability problems and has been deprecated "
-"by OpenLDAP as of 2.2. It is no longer supported by the OpenLDAP packages."
-msgstr ""
-"Ð¢Ð¸Ð¿ ÑÐµÑ€Ð²ÐµÑ€Ð° LDBM Ð¸Ð¼ÐµÐ» ÑÐµÑ€ÑŒÑ‘Ð·Ð½Ñ‹Ðµ Ð¿Ñ€Ð¾Ð±Ð»ÐµÐ¼Ñ‹ ÑÐ¾ ÑÑ‚Ð°Ð±Ð¸Ð»ÑŒÐ½Ð¾ÑÑ‚ÑŒÑŽ Ð¸ Ð±Ñ‹Ð» Ð¸ÑÐºÐ»ÑŽÑ‡Ñ‘Ð½ Ð¸Ð· "
-"OpenLDAP Ð½Ð°Ñ‡Ð¸Ð½Ð°Ñ Ð²ÐµÑ€ÑÐ¸Ð¸ Ñ 2.2. ÐžÐ½ Ð±Ð¾Ð»ÑŒÑˆÐµ Ð½Ðµ Ð¿Ð¾Ð´Ð´ÐµÑ€Ð¶Ð¸Ð²Ð°ÐµÑ‚ÑÑ Ð² Ð¿Ð°ÐºÐµÑ‚Ð°Ñ… "
-"OpenLDAP."
-
-#. Type: boolean
-#. Description
-#: ../slapd.templates:16001
-msgid ""
-"When the BDB backend is used, it must be configured properly. For more "
-"information, 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:16001
-msgid ""
-"If you enable this option, an attempt will be made to update the "
-"configuration to use BDB instead of LDBM and convert the databases. If you "
-"do not enable this option, the upgrade will be aborted."
-msgstr ""
-"Ð•ÑÐ»Ð¸ Ð²Ñ‹ Ð¾Ñ‚Ð²ÐµÑ‚Ð¸Ñ‚Ðµ ÑƒÑ‚Ð²ÐµÑ€Ð´Ð¸Ñ‚ÐµÐ»ÑŒÐ½Ð¾, Ñ‚Ð¾ Ð±ÑƒÐ´ÐµÑ‚ ÑÐ´ÐµÐ»Ð°Ð½Ð° Ð¿Ð¾Ð¿Ñ‹Ñ‚ÐºÐ° Ð¾Ð±Ð½Ð¾Ð²Ð»ÐµÐ½Ð¸Ñ "
-"ÐºÐ¾Ð½Ñ„Ð¸Ð³ÑƒÑ€Ð°Ñ†Ð¸Ð¸ Ð´Ð»Ñ Ð¸ÑÐ¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ð½Ð¸Ñ BDB Ð²Ð¼ÐµÑÑ‚Ð¾ LDBM Ð¸ Ð¿Ñ€ÐµÐ¾Ð±Ñ€Ð°Ð·Ð¾Ð²Ð°Ð½Ð¸Ðµ Ð±Ð°Ð· Ð´Ð°Ð½Ð½Ñ‹Ñ…. "
-"Ð•ÑÐ»Ð¸ Ð²Ñ‹ Ð¾Ñ‚Ð²ÐµÑ‚Ð¸Ñ‚Ðµ Ð¾Ñ‚Ñ€Ð¸Ñ†Ð°Ñ‚ÐµÐ»ÑŒÐ½Ð¾, Ñ‚Ð¾ Ð¾Ð±Ð½Ð¾Ð²Ð»ÐµÐ½Ð¸Ðµ Ð±ÑƒÐ´ÐµÑ‚ Ð¿Ñ€ÐµÑ€Ð²Ð°Ð½Ð¾."
-
 #. Type: select
 #. Description
-#: ../slapd.templates:17001
+#: ../slapd.templates:16001
 msgid "Database backend to use:"
 msgstr "Ð˜ÑÐ¿Ð¾Ð»ÑŒÐ·ÑƒÐµÐ¼Ñ‹Ðµ ÑÐµÑ€Ð²ÐµÑ€Ñ‹ Ð±Ð°Ð· Ð´Ð°Ð½Ð½Ñ‹Ñ…:"
 
 #. Type: select
 #. Description
-#: ../slapd.templates:17001
+#: ../slapd.templates:16001
 msgid ""
 "The HDB backend is recommended. HDB and BDB use similar storage formats, but "
 "HDB adds support for subtree renames. Both support the same configuration "
@@ -389,7 +350,7 @@
 
 #. Type: select
 #. Description
-#: ../slapd.templates:17001
+#: ../slapd.templates:16001
 msgid ""
 "In either case, you should review the resulting database configuration for "
 "your needs. See /usr/share/doc/slapd/README.DB_CONFIG.gz for more details."
@@ -400,13 +361,13 @@
 
 #. Type: error
 #. Description
-#: ../slapd.templates:18001
+#: ../slapd.templates:17001
 msgid "slurpd is obsolete; replicas must be reconfigured by hand"
 msgstr "slurpd ÑƒÑÑ‚Ð°Ñ€ÐµÐ»; Ñ€ÐµÐ¿Ð»Ð¸ÐºÐ¸ Ð´Ð¾Ð»Ð¶Ð½Ñ‹ Ð±Ñ‹Ñ‚ÑŒ Ð¿ÐµÑ€ÐµÐ½Ð°ÑÑ‚Ñ€Ð¾ÐµÐ½Ñ‹ Ð²Ñ€ÑƒÑ‡Ð½ÑƒÑŽ"
 
 #. Type: error
 #. Description
-#: ../slapd.templates:18001
+#: ../slapd.templates:17001
 msgid ""
 "One or more slurpd \"replica\" options were found in your slapd config when "
 "upgrading.  Because slurpd is obsolete beginning with OpenLDAP 2.4, you will "
@@ -418,7 +379,7 @@
 
 #. Type: error
 #. Description
-#: ../slapd.templates:18001
+#: ../slapd.templates:17001
 msgid ""
 "The conversion from slurpd to the pull-based syncrepl protocol cannot be "
 "done automatically and you will need to configure your replica servers by "
@@ -432,13 +393,13 @@
 
 #. Type: error
 #. Description
-#: ../slapd.templates:19001
+#: ../slapd.templates:18001
 msgid "TLSCipherSuite values have changed"
 msgstr "Ð˜Ð·Ð¼ÐµÐ½Ð¸Ð»Ð¸ÑÑŒ Ð·Ð½Ð°Ñ‡ÐµÐ½Ð¸Ñ Ð´Ð»Ñ TLSCipherSuite"
 
 #. Type: error
 #. Description
-#: ../slapd.templates:19001
+#: ../slapd.templates:18001
 msgid ""
 "A \"TLSCipherSuite\" option was found in your slapd config when upgrading. "
 "The values allowed for this option are determined by the SSL implementation "
@@ -452,7 +413,7 @@
 
 #. Type: error
 #. Description
-#: ../slapd.templates:19001
+#: ../slapd.templates:18001
 msgid ""
 "This setting has been automatically commented out for you.  If you have "
 "specific encryption needs that require this option to be re-enabled, see the "

Modified: openldap/trunk/debian/po/templates.pot
===================================================================
--- openldap/trunk/debian/po/templates.pot	2008-07-15 15:26:26 UTC (rev 1178)
+++ openldap/trunk/debian/po/templates.pot	2008-07-20 02:30:18 UTC (rev 1179)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: openldap at packages.debian.org\n"
-"POT-Creation-Date: 2008-02-09 10:32-0800\n"
+"POT-Creation-Date: 2008-07-19 19:11-0700\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"
@@ -272,46 +272,15 @@
 "slapadd from $location."
 msgstr ""
 
-#. Type: boolean
-#. Description
-#: ../slapd.templates:16001
-msgid "Change backend type from LDBM to BDB?"
-msgstr ""
-
-#. Type: boolean
-#. Description
-#: ../slapd.templates:16001
-msgid ""
-"The LDBM backend type has serious stability problems and has been deprecated "
-"by OpenLDAP as of 2.2. It is no longer supported by the OpenLDAP packages."
-msgstr ""
-
-#. Type: boolean
-#. Description
-#: ../slapd.templates:16001
-msgid ""
-"When the BDB backend is used, it must be configured properly. For more "
-"information, see /usr/share/doc/slapd/README.DB_CONFIG.gz."
-msgstr ""
-
-#. Type: boolean
-#. Description
-#: ../slapd.templates:16001
-msgid ""
-"If you enable this option, an attempt will be made to update the "
-"configuration to use BDB instead of LDBM and convert the databases. If you "
-"do not enable this option, the upgrade will be aborted."
-msgstr ""
-
 #. Type: select
 #. Description
-#: ../slapd.templates:17001
+#: ../slapd.templates:16001
 msgid "Database backend to use:"
 msgstr ""
 
 #. Type: select
 #. Description
-#: ../slapd.templates:17001
+#: ../slapd.templates:16001
 msgid ""
 "The HDB backend is recommended. HDB and BDB use similar storage formats, but "
 "HDB adds support for subtree renames. Both support the same configuration "
@@ -320,7 +289,7 @@
 
 #. Type: select
 #. Description
-#: ../slapd.templates:17001
+#: ../slapd.templates:16001
 msgid ""
 "In either case, you should review the resulting database configuration for "
 "your needs. See /usr/share/doc/slapd/README.DB_CONFIG.gz for more details."
@@ -328,13 +297,13 @@
 
 #. Type: error
 #. Description
-#: ../slapd.templates:18001
+#: ../slapd.templates:17001
 msgid "slurpd is obsolete; replicas must be reconfigured by hand"
 msgstr ""
 
 #. Type: error
 #. Description
-#: ../slapd.templates:18001
+#: ../slapd.templates:17001
 msgid ""
 "One or more slurpd \"replica\" options were found in your slapd config when "
 "upgrading.  Because slurpd is obsolete beginning with OpenLDAP 2.4, you will "
@@ -343,7 +312,7 @@
 
 #. Type: error
 #. Description
-#: ../slapd.templates:18001
+#: ../slapd.templates:17001
 msgid ""
 "The conversion from slurpd to the pull-based syncrepl protocol cannot be "
 "done automatically and you will need to configure your replica servers by "
@@ -353,13 +322,13 @@
 
 #. Type: error
 #. Description
-#: ../slapd.templates:19001
+#: ../slapd.templates:18001
 msgid "TLSCipherSuite values have changed"
 msgstr ""
 
 #. Type: error
 #. Description
-#: ../slapd.templates:19001
+#: ../slapd.templates:18001
 msgid ""
 "A \"TLSCipherSuite\" option was found in your slapd config when upgrading. "
 "The values allowed for this option are determined by the SSL implementation "
@@ -369,7 +338,7 @@
 
 #. Type: error
 #. Description
-#: ../slapd.templates:19001
+#: ../slapd.templates:18001
 msgid ""
 "This setting has been automatically commented out for you.  If you have "
 "specific encryption needs that require this option to be re-enabled, see the "

Modified: openldap/trunk/debian/po/vi.po
===================================================================
--- openldap/trunk/debian/po/vi.po	2008-07-15 15:26:26 UTC (rev 1178)
+++ openldap/trunk/debian/po/vi.po	2008-07-20 02:30:18 UTC (rev 1179)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: openldap 2.4.7-6.4\n"
 "Report-Msgid-Bugs-To: openldap at packages.debian.org\n"
-"POT-Creation-Date: 2008-02-09 10:32-0800\n"
+"POT-Creation-Date: 2008-07-19 19:11-0700\n"
 "PO-Revision-Date: 2008-05-09 00:24+0930\n"
 "Last-Translator: Clytie Siddall <clytie at riverland.net.au>\n"
 "Language-Team: Vietnamese <vi-VN at googlegroups.com>\n"
@@ -320,57 +320,15 @@
 "Sau Ä‘Ã³, hÃ£y di chuyá»ƒn cÃ¡c táºp tin cÆ¡ sá»Ÿ dá»¯ liá»‡u sang má»™t vÃ¹ng sao lÆ°u, rá»“i "
 "thá» cháº¡y trÃ¬nh slapadd tá»« nÆ¡i Â« $location Â»."
 
-#. Type: boolean
-#. Description
-#: ../slapd.templates:16001
-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:16001
-msgid ""
-"The LDBM backend type has serious stability problems and has been deprecated "
-"by OpenLDAP as of 2.2. It is no longer supported by the OpenLDAP packages."
-msgstr ""
-"Kiá»ƒu háºu phÆ°Æ¡ng LDBM khÃ´ng á»•n Ä‘á»‹nh nÃªn bá»‹ pháº£n Ä‘á»‘i bá»Ÿi OpenLDAP ká»ƒ tá»« phiÃªn "
-"báº£n 2.2. VÃ¬ tháº¿ nÃ³ khÃ´ng cÃ²n Ä‘Æ°á»£c gÃ³i OpenLDAP há»— trá»£ láº¡i."
-
-# 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
-#. Type: boolean
-#. Description
-#: ../slapd.templates:16001
-msgid ""
-"When the BDB backend is used, it must be configured properly. For more "
-"information, see /usr/share/doc/slapd/README.DB_CONFIG.gz."
-msgstr ""
-"Äá»ƒ sá» dá»¥ng háºu phÆ°Æ¡ng BDB, nÃ³ pháº£i Ä‘Æ°á»£c cáº¥u hÃ¬nh cho Ä‘Ãºng. Muá»‘n tÃ¬m thÃªm "
-"thÃ´ng tin thÃ¬ xem táºp tin Äá»c Äi Â« /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.
-#. Type: boolean
-#. Description
-#: ../slapd.templates:16001
-msgid ""
-"If you enable this option, an attempt will be made to update the "
-"configuration to use BDB instead of LDBM and convert the databases. If you "
-"do not enable this option, the upgrade will be aborted."
-msgstr ""
-"Báºt tÃ¹y chá»n nÃ y thÃ¬ tiáº¿n trÃ¬nh thá» cáºp nháºt cáº¥u hÃ¬nh Ä‘á»ƒ sá» dá»¥ng BDB thay "
-"cho LDBM vÃ  chuyá»ƒn Ä‘á»•i cÃ¡c cÆ¡ sá»Ÿ dá»¯ liá»‡u. KhÃ´ng báºt tÃ¹y chá»n nÃ y thÃ¬ há»§y bá» "
-"nÃ¢ng cáº¥p."
-
 #. Type: select
 #. Description
-#: ../slapd.templates:17001
+#: ../slapd.templates:16001
 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:16001
 msgid ""
 "The HDB backend is recommended. HDB and BDB use similar storage formats, but "
 "HDB adds support for subtree renames. Both support the same configuration "
@@ -386,7 +344,7 @@
 # DB_CONFIG.gz
 #. Type: select
 #. Description
-#: ../slapd.templates:17001
+#: ../slapd.templates:16001
 msgid ""
 "In either case, you should review the resulting database configuration for "
 "your needs. See /usr/share/doc/slapd/README.DB_CONFIG.gz for more details."
@@ -397,13 +355,13 @@
 
 #. Type: error
 #. Description
-#: ../slapd.templates:18001
+#: ../slapd.templates:17001
 msgid "slurpd is obsolete; replicas must be reconfigured by hand"
 msgstr "slurpd quÃ¡ cÅ© ; má»—i báº£n sao pháº£i Ä‘Æ°á»£c cáº¥u hÃ¬nh láº¡i báº±ng tay"
 
 #. Type: error
 #. Description
-#: ../slapd.templates:18001
+#: ../slapd.templates:17001
 msgid ""
 "One or more slurpd \"replica\" options were found in your slapd config when "
 "upgrading.  Because slurpd is obsolete beginning with OpenLDAP 2.4, you will "
@@ -415,7 +373,7 @@
 
 #. Type: error
 #. Description
-#: ../slapd.templates:18001
+#: ../slapd.templates:17001
 msgid ""
 "The conversion from slurpd to the pull-based syncrepl protocol cannot be "
 "done automatically and you will need to configure your replica servers by "
@@ -429,13 +387,13 @@
 
 #. Type: error
 #. Description
-#: ../slapd.templates:19001
+#: ../slapd.templates:18001
 msgid "TLSCipherSuite values have changed"
 msgstr "GiÃ¡ trá»‹ TLSCipherSuite bá»‹ thay Ä‘á»•i"
 
 #. Type: error
 #. Description
-#: ../slapd.templates:19001
+#: ../slapd.templates:18001
 msgid ""
 "A \"TLSCipherSuite\" option was found in your slapd config when upgrading. "
 "The values allowed for this option are determined by the SSL implementation "
@@ -450,7 +408,7 @@
 
 #. Type: error
 #. Description
-#: ../slapd.templates:19001
+#: ../slapd.templates:18001
 msgid ""
 "This setting has been automatically commented out for you.  If you have "
 "specific encryption needs that require this option to be re-enabled, see the "

Modified: openldap/trunk/debian/slapd.config
===================================================================
--- openldap/trunk/debian/slapd.config	2008-07-15 15:26:26 UTC (rev 1178)
+++ openldap/trunk/debian/slapd.config	2008-07-20 02:30:18 UTC (rev 1179)
@@ -156,9 +156,9 @@
 	fi
 fi
 
-# Configure the dumping component if we are upgrading some older version
+# Configure the dumping and v2 binds components 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/debian/slapd.postinst
===================================================================
--- openldap/trunk/debian/slapd.postinst	2008-07-15 15:26:26 UTC (rev 1178)
+++ openldap/trunk/debian/slapd.postinst	2008-07-20 02:30:18 UTC (rev 1179)
@@ -50,14 +50,6 @@
 	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/debian/slapd.preinst
===================================================================
--- openldap/trunk/debian/slapd.preinst	2008-07-15 15:26:26 UTC (rev 1178)
+++ openldap/trunk/debian/slapd.preinst	2008-07-20 02:30:18 UTC (rev 1179)
@@ -12,8 +12,6 @@
 # slapcat out the data so we can use it in postinst to do the upgrade
 
 if [ "$MODE" = upgrade ]; then
-	configure_ldbm_to_bdb_migration
-	break_on_ldbm_to_bdb_migration_disagree
 	dump_databases
 fi
 

Modified: openldap/trunk/debian/slapd.prerm
===================================================================
--- openldap/trunk/debian/slapd.prerm	2008-07-15 15:26:26 UTC (rev 1178)
+++ openldap/trunk/debian/slapd.prerm	2008-07-20 02:30:18 UTC (rev 1179)
@@ -4,10 +4,6 @@
 
 . /usr/share/debconf/confmodule
 
-# 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/debian/slapd.scripts-common
===================================================================
--- openldap/trunk/debian/slapd.scripts-common	2008-07-15 15:26:26 UTC (rev 1178)
+++ openldap/trunk/debian/slapd.scripts-common	2008-07-20 02:30:18 UTC (rev 1179)
@@ -17,37 +17,6 @@
 # for example. Therefore we must give the user exact control over what we
 # are doing.
 
-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 [ -f "$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
-}
-# }}}
-break_on_ldbm_to_bdb_migration_disagree() { # {{{
-  if [ -f "$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.
@@ -789,7 +758,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.  
+# directives.  This function is currently unused.
 # Usage: migrate_databases <old-backend> <new-backend>
 
 	local old new
@@ -1013,7 +982,7 @@
 # our scripts.
 # Usage: if upgrade_supported_from_backend "backend"; then ... fi
 
-	case "$1" in ldbm|bdb|hdb) return 0; esac
+	case "$1" in bdb|hdb) return 0; esac
 	return 1
 }
 

Modified: openldap/trunk/debian/slapd.templates
===================================================================
--- openldap/trunk/debian/slapd.templates	2008-07-15 15:26:26 UTC (rev 1178)
+++ openldap/trunk/debian/slapd.templates	2008-07-20 02:30:18 UTC (rev 1179)
@@ -133,21 +133,6 @@
  Then move the database files back to a backup area and then try running
  slapadd from $location.
 
-Template: slapd/migrate_ldbm_to_bdb
-Type: boolean
-Default: true
-_Description: Change backend type from LDBM to BDB?
- The LDBM backend type has serious stability problems and has been
- deprecated by OpenLDAP as of 2.2. It is no longer supported by the
- OpenLDAP packages.
- .
- When the BDB backend is used, it must be configured properly. For
- more information, see /usr/share/doc/slapd/README.DB_CONFIG.gz.
- .
- If you enable this option, an attempt will be made to update the
- configuration to use BDB instead of LDBM and convert the databases.
- If you do not enable this option, the upgrade will be aborted.
-
 Template: slapd/backend
 Type: select
 Choices: BDB, HDB


