diff -Nru dput-0.9.2.10.ori/debian/control dput-0.9.2.10/debian/control
--- dput-0.9.2.10.ori/debian/control	2003-07-04 11:05:27.000000000 +0200
+++ dput-0.9.2.10/debian/control	2003-07-04 11:07:26.000000000 +0200
@@ -2,7 +2,7 @@
 Section: devel
 Priority: optional
 Maintainer: Christian Kurz <shorty@debian.org>
-Build-Depends-Indep: debconf-utils (>= 1.1.1)
+Build-Depends-Indep: debconf-utils (>= 1.1.1), debhelper (>= 4.1.16)
 Standards-Version: 3.5.7
 Uploaders: Steve Kowalik <stevenk@debian.org>
 
diff -Nru dput-0.9.2.10.ori/debian/po/de.po dput-0.9.2.10/debian/po/de.po
--- dput-0.9.2.10.ori/debian/po/de.po	1970-01-01 01:00:00.000000000 +0100
+++ dput-0.9.2.10/debian/po/de.po	2003-07-04 11:08:44.000000000 +0200
@@ -0,0 +1,45 @@
+#
+#    Translators, if you are not familiar with the PO format, gettext
+#    documentation is worth reading, especially sections dedicated to
+#    this format, e.g. by running:
+#         info -n '(gettext)PO Files'
+#         info -n '(gettext)Header Entry'
+#
+#    Some information specific to po-debconf are available at
+#            /usr/share/doc/po-debconf/README-trans
+#         or http://www.debian.org/intl/l10n/po-debconf/README-trans
+#
+#    Developers do not need to manually edit POT or PO files.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2003-07-04 11:08+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=ISO-8859-15\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Description
+#: ../templates:3
+msgid "Change config file after installation"
+msgstr "nderung an der Konfigurationsdatei nach Installation"
+
+#. Description
+#: ../templates:3
+msgid ""
+"The dput package changed the format of it's config file, because of some "
+"major rewrites in the parser for it. Therefore, if you were using a personal "
+"~/.dput.cf, you have to update it to the new style before you can use dput "
+"again. See the global file at /etc/dput.cf and the man pages for more info."
+msgstr ""
+"Das dput-Paket hat ein neues Format fr die Konfigurationsdatei. Die "
+"Anpassung der Konfigurationsdatei wurde wegen einem neuen Konfigurations-"
+"Parser notwendig. Wenn Sie eine persnliche Konfigurationsdatei (~/.dput.cf) "
+"verwenden, mssen Sie diese in das neue Format konvertieren, bevor Sie dput "
+"verwenden knnen. In der globalen Konfigurationsdatei /etc/dput.cf finden "
+"Sie dazu weitere Informationen."
diff -Nru dput-0.9.2.10.ori/debian/po/es.po dput-0.9.2.10/debian/po/es.po
--- dput-0.9.2.10.ori/debian/po/es.po	1970-01-01 01:00:00.000000000 +0100
+++ dput-0.9.2.10/debian/po/es.po	2003-07-04 11:08:45.000000000 +0200
@@ -0,0 +1,44 @@
+#
+#    Translators, if you are not familiar with the PO format, gettext
+#    documentation is worth reading, especially sections dedicated to
+#    this format, e.g. by running:
+#         info -n '(gettext)PO Files'
+#         info -n '(gettext)Header Entry'
+#
+#    Some information specific to po-debconf are available at
+#            /usr/share/doc/po-debconf/README-trans
+#         or http://www.debian.org/intl/l10n/po-debconf/README-trans
+#
+#    Developers do not need to manually edit POT or PO files.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2003-07-04 11:08+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=ISO-8859-15\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Description
+#: ../templates:3
+msgid "Change config file after installation"
+msgstr "Cambia tu archivo de configuracin despus de la instalacin"
+
+#. Description
+#: ../templates:3
+msgid ""
+"The dput package changed the format of it's config file, because of some "
+"major rewrites in the parser for it. Therefore, if you were using a personal "
+"~/.dput.cf, you have to update it to the new style before you can use dput "
+"again. See the global file at /etc/dput.cf and the man pages for more info."
+msgstr ""
+"El paquete dput ha cambiado el formato de su archivo de configuracin, "
+"despus de grandes cambios en el cdigo de parseado. Por lo tanto, si "
+"estabas usando un ~/.dput.cf personal, tienes que actualizarlo al nuevo "
+"estilo antes de poder usarlo de nuevo. Echa un vistazo al fichero global en /"
+"etc/dput.cf y las pginas de manual para ms informacin."
diff -Nru dput-0.9.2.10.ori/debian/po/fr.po dput-0.9.2.10/debian/po/fr.po
--- dput-0.9.2.10.ori/debian/po/fr.po	1970-01-01 01:00:00.000000000 +0100
+++ dput-0.9.2.10/debian/po/fr.po	2003-07-04 11:20:07.000000000 +0200
@@ -0,0 +1,47 @@
+#
+#    Translators, if you are not familiar with the PO format, gettext
+#    documentation is worth reading, especially sections dedicated to
+#    this format, e.g. by running:
+#         info -n '(gettext)PO Files'
+#         info -n '(gettext)Header Entry'
+#
+#    Some information specific to po-debconf are available at
+#            /usr/share/doc/po-debconf/README-trans
+#         or http://www.debian.org/intl/l10n/po-debconf/README-trans
+#
+#    Developers do not need to manually edit POT or PO files.
+#
+# Original translator is unknown. Translator mentioned below
+# did the po file proofreading, with the help of the contributors
+# from the debian-l10n-french mailing list
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: dput 0.9.2.10\n"
+"POT-Creation-Date: 2003-07-04 11:08+0200\n"
+"PO-Revision-Date: 2003-07-04 11:19+0100\n"
+"Last-Translator: Christian Perrier <bubulle@debian.org>\n"
+"Language-Team: French <debian-l10n-french@lists.debian.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=ISO-8859-15\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Description
+#: ../templates:3
+msgid "Change config file after installation"
+msgstr "Changement du fichier de configuration aprs installation"
+
+#. Description
+#: ../templates:3
+msgid ""
+"The dput package changed the format of it's config file, because of some "
+"major rewrites in the parser for it. Therefore, if you were using a personal "
+"~/.dput.cf, you have to update it to the new style before you can use dput "
+"again. See the global file at /etc/dput.cf and the man pages for more info."
+msgstr ""
+"Le format des fichiers de configuration de dput a chang car l'interprteur "
+"de configuration a t profondment modifi.  En consquence, si vous "
+"utilisiez un fichier ~/.dput.cf, vous devrez le mettre  jour pour qu'il "
+"suive le nouveau format, avant de pouvoir continuer  utiliser dput.  Pour "
+"plus d'informations, veuillez consulter le fichier de configuration global (/"
+"etc/dput.cf) et les pages de manuel."
diff -Nru dput-0.9.2.10.ori/debian/po/POTFILES.in dput-0.9.2.10/debian/po/POTFILES.in
--- dput-0.9.2.10.ori/debian/po/POTFILES.in	1970-01-01 01:00:00.000000000 +0100
+++ dput-0.9.2.10/debian/po/POTFILES.in	2003-07-04 11:08:43.000000000 +0200
@@ -0,0 +1 @@
+[type: gettext/rfc822deb] templates
diff -Nru dput-0.9.2.10.ori/debian/po/pt_BR.po dput-0.9.2.10/debian/po/pt_BR.po
--- dput-0.9.2.10.ori/debian/po/pt_BR.po	1970-01-01 01:00:00.000000000 +0100
+++ dput-0.9.2.10/debian/po/pt_BR.po	2003-07-04 11:08:46.000000000 +0200
@@ -0,0 +1,44 @@
+#
+#    Translators, if you are not familiar with the PO format, gettext
+#    documentation is worth reading, especially sections dedicated to
+#    this format, e.g. by running:
+#         info -n '(gettext)PO Files'
+#         info -n '(gettext)Header Entry'
+#
+#    Some information specific to po-debconf are available at
+#            /usr/share/doc/po-debconf/README-trans
+#         or http://www.debian.org/intl/l10n/po-debconf/README-trans
+#
+#    Developers do not need to manually edit POT or PO files.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2003-07-04 11:08+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=ISO-8859-1\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Description
+#: ../templates:3
+msgid "Change config file after installation"
+msgstr "Mudar arquivo de configurao aps instalao"
+
+#. Description
+#: ../templates:3
+msgid ""
+"The dput package changed the format of it's config file, because of some "
+"major rewrites in the parser for it. Therefore, if you were using a personal "
+"~/.dput.cf, you have to update it to the new style before you can use dput "
+"again. See the global file at /etc/dput.cf and the man pages for more info."
+msgstr ""
+"O pacote dput mudou o formato de seus arquivos de configurao devido a "
+"algumas reescritas grandes em seu parser. Assim, se voc estava usando um "
+"arquivo ~/.dput.cf pessoal voc precisa atualiz-lo para o novo estilo antes "
+"que voc possa usar o dput novamente. Veja o arquivo global em /etc/dput.cf "
+"e as pginas de manual para maiores informaes."
diff -Nru dput-0.9.2.10.ori/debian/po/ru.po dput-0.9.2.10/debian/po/ru.po
--- dput-0.9.2.10.ori/debian/po/ru.po	1970-01-01 01:00:00.000000000 +0100
+++ dput-0.9.2.10/debian/po/ru.po	2003-07-04 11:08:46.000000000 +0200
@@ -0,0 +1,44 @@
+#
+#    Translators, if you are not familiar with the PO format, gettext
+#    documentation is worth reading, especially sections dedicated to
+#    this format, e.g. by running:
+#         info -n '(gettext)PO Files'
+#         info -n '(gettext)Header Entry'
+#
+#    Some information specific to po-debconf are available at
+#            /usr/share/doc/po-debconf/README-trans
+#         or http://www.debian.org/intl/l10n/po-debconf/README-trans
+#
+#    Developers do not need to manually edit POT or PO files.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2003-07-04 11:08+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=KOI8-R\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Description
+#: ../templates:3
+msgid "Change config file after installation"
+msgstr "    "
+
+#. Description
+#: ../templates:3
+msgid ""
+"The dput package changed the format of it's config file, because of some "
+"major rewrites in the parser for it. Therefore, if you were using a personal "
+"~/.dput.cf, you have to update it to the new style before you can use dput "
+"again. See the global file at /etc/dput.cf and the man pages for more info."
+msgstr ""
+"        dput ,    "
+"     .  ,       "
+"    ~/.dput.cf,           "
+"    ,      dput.   "
+" .    /etc/dput.cf   "
diff -Nru dput-0.9.2.10.ori/debian/po/templates.pot dput-0.9.2.10/debian/po/templates.pot
--- dput-0.9.2.10.ori/debian/po/templates.pot	1970-01-01 01:00:00.000000000 +0100
+++ dput-0.9.2.10/debian/po/templates.pot	2003-07-04 11:08:46.000000000 +0200
@@ -0,0 +1,39 @@
+#
+#    Translators, if you are not familiar with the PO format, gettext
+#    documentation is worth reading, especially sections dedicated to
+#    this format, e.g. by running:
+#         info -n '(gettext)PO Files'
+#         info -n '(gettext)Header Entry'
+#
+#    Some information specific to po-debconf are available at
+#            /usr/share/doc/po-debconf/README-trans
+#         or http://www.debian.org/intl/l10n/po-debconf/README-trans
+#
+#    Developers do not need to manually edit POT or PO files.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2003-07-04 11:08+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=CHARSET\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Description
+#: ../templates:3
+msgid "Change config file after installation"
+msgstr ""
+
+#. Description
+#: ../templates:3
+msgid ""
+"The dput package changed the format of it's config file, because of some "
+"major rewrites in the parser for it. Therefore, if you were using a personal "
+"~/.dput.cf, you have to update it to the new style before you can use dput "
+"again. See the global file at /etc/dput.cf and the man pages for more info."
+msgstr ""
diff -Nru dput-0.9.2.10.ori/debian/rules dput-0.9.2.10/debian/rules
--- dput-0.9.2.10.ori/debian/rules	2003-07-04 11:05:27.000000000 +0200
+++ dput-0.9.2.10/debian/rules	2003-07-04 11:08:33.000000000 +0200
@@ -45,8 +45,10 @@
 	install --mode=0644 Thanks "debian/tmp/usr/share/doc/$(PACKAGE)"
 	install --mode=0644 debian/changelog "debian/tmp/usr/share/doc/$(PACKAGE)"
 	install --mode=0644 bash_completion "debian/tmp/etc/bash_completion.d/$(PACKAGE)"
-	# Merge templates, and install the merged one where it belongs
-	debconf-mergetemplate --drop-old-templates debian/templates.* debian/templates > debian/tmp/DEBIAN/templates
+	dh_installdebconf
+	# The following is obsoleted as debconf-mergetemplates is obsoleted
+	## Merge templates, and install the merged one where it belongs
+	#debconf-mergetemplate --drop-old-templates debian/templates.* debian/templates > debian/tmp/DEBIAN/templates
 	chmod 0644 debian/tmp/DEBIAN/templates
 	install --mode=0755 debian/config "debian/tmp/DEBIAN"
 	gzip -9 debian/tmp/usr/share/man/man1/*
diff -Nru dput-0.9.2.10.ori/debian/templates dput-0.9.2.10/debian/templates
--- dput-0.9.2.10.ori/debian/templates	2003-07-04 11:05:27.000000000 +0200
+++ dput-0.9.2.10/debian/templates	2003-07-04 11:08:43.000000000 +0200
@@ -1,8 +1,8 @@
 Template: dput/config-file-format
 Type: note
-Description: Change config file after installation
- The dput package changed the format of it's config file, because
- of some major rewrites in the parser for it. Therefore, if you were
- using a personal ~/.dput.cf, you have to update it to the new style
- before you can use dput again. See the global file at /etc/dput.cf
- and the man pages for more info.
+_Description: Change config file after installation
+ The dput package changed the format of it's config file, because of some
+ major rewrites in the parser for it. Therefore, if you were using a
+ personal ~/.dput.cf, you have to update it to the new style before you can
+ use dput again. See the global file at /etc/dput.cf and the man pages for
+ more info.
diff -Nru dput-0.9.2.10.ori/debian/templates.de dput-0.9.2.10/debian/templates.de
--- dput-0.9.2.10.ori/debian/templates.de	2003-07-04 11:05:27.000000000 +0200
+++ dput-0.9.2.10/debian/templates.de	1970-01-01 01:00:00.000000000 +0100
@@ -1,16 +0,0 @@
-Template: dput/config-file-format
-Type: note
-Description: Change config file after installation
- The dput package changed the format of it's config file, because
- of some major rewrites in the parser for it. Therefore, if you were
- using a personal ~/.dput.cf, you have to update it to the new style
- before you can use dput again. See the global file at /etc/dput.cf
- and the man pages for more info.
-Description-de: nderung an der Konfigurationsdatei nach Installation
- Das dput-Paket hat ein neues Format fr die Konfigurationsdatei.
- Die Anpassung der Konfigurationsdatei wurde wegen einem neuen
- Konfigurations-Parser notwendig. Wenn Sie eine persnliche
- Konfigurationsdatei (~/.dput.cf) verwenden, mssen Sie diese in das
- neue Format konvertieren, bevor Sie dput verwenden knnen. In der
- globalen Konfigurationsdatei /etc/dput.cf finden Sie dazu weitere
- Informationen.
diff -Nru dput-0.9.2.10.ori/debian/templates.es dput-0.9.2.10/debian/templates.es
--- dput-0.9.2.10.ori/debian/templates.es	2003-07-04 11:05:27.000000000 +0200
+++ dput-0.9.2.10/debian/templates.es	1970-01-01 01:00:00.000000000 +0100
@@ -1,14 +0,0 @@
-Template: dput/config-file-format
-Type: note
-Description: Change config file after installation
- The dput package changed the format of it's config file, because
- of some major rewrites in the parser for it. Therefore, if you were
- using a personal ~/.dput.cf, you have to update it to the new style
- before you can use dput again. See the global file at /etc/dput.cf
- and the man pages for more info.
-Description-es: Cambia tu archivo de configuracin despus de la instalacin
- El paquete dput ha cambiado el formato de su archivo de configuracin,
- despus de grandes cambios en el cdigo de parseado. Por lo tanto, si
- estabas usando un ~/.dput.cf personal, tienes que actualizarlo al nuevo
- estilo antes de poder usarlo de nuevo. Echa un vistazo al fichero global en
- /etc/dput.cf y las pginas de manual para ms informacin.
diff -Nru dput-0.9.2.10.ori/debian/templates.fr dput-0.9.2.10/debian/templates.fr
--- dput-0.9.2.10.ori/debian/templates.fr	2003-07-04 11:05:27.000000000 +0200
+++ dput-0.9.2.10/debian/templates.fr	1970-01-01 01:00:00.000000000 +0100
@@ -1,16 +0,0 @@
-Template: dput/config-file-format
-Type: note
-Description: Change config file after installation
- The dput package changed the format of it's config file, because
- of some major rewrites in the parser for it. Therefore, if you were
- using a personal ~/.dput.cf, you have to update it to the new style
- before you can use dput again. See the global file at /etc/dput.cf
- and the man pages for more info.
-Description-fr: Changer le fichier de configuration aprs installation
- Le paquet dput a chang de format pour ses fichiers de configuration,
- en raison d'importantes modifications dans l'interprteur desdits
- fichiers.  En consquence, si vous utilisiez un fichier ~/.dput.cf,
- vous devrez le mettre  jour pour qu'il suive le nouveau format avant
- de pouvoir recommencer  utiliser dput.  Pour plus d'information,
- rfrez-vous au fichier de configuration global (/etc/dput.cf) et aux
- pages de manuel.
diff -Nru dput-0.9.2.10.ori/debian/templates.pt_BR dput-0.9.2.10/debian/templates.pt_BR
--- dput-0.9.2.10.ori/debian/templates.pt_BR	2003-07-04 11:05:27.000000000 +0200
+++ dput-0.9.2.10/debian/templates.pt_BR	1970-01-01 01:00:00.000000000 +0100
@@ -1,14 +0,0 @@
-Template: dput/config-file-format
-Type: note
-Description: Change config file after installation
- The dput package changed the format of it's config file, because
- of some major rewrites in the parser for it. Therefore, if you were
- using a personal ~/.dput.cf, you have to update it to the new style
- before you can use dput again. See the global file at /etc/dput.cf
- and the man pages for more info.
-Description-pt_BR: Mudar arquivo de configurao aps instalao
- O pacote dput mudou o formato de seus arquivos de configurao devido          
- a algumas reescritas grandes em seu parser. Assim, se voc estava usando       
- um arquivo ~/.dput.cf pessoal voc precisa atualiz-lo para o novo estilo      
- antes que voc possa usar o dput novamente. Veja o arquivo global em           
- /etc/dput.cf e as pginas de manual para maiores informaes.
diff -Nru dput-0.9.2.10.ori/debian/templates.ru dput-0.9.2.10/debian/templates.ru
--- dput-0.9.2.10.ori/debian/templates.ru	2003-07-04 11:05:27.000000000 +0200
+++ dput-0.9.2.10/debian/templates.ru	1970-01-01 01:00:00.000000000 +0100
@@ -1,15 +0,0 @@
-Template: dput/config-file-format
-Type: note
-Description: Change config file after installation
- The dput package changed the format of it's config file, because
- of some major rewrites in the parser for it. Therefore, if you were
- using a personal ~/.dput.cf, you have to update it to the new style
- before you can use dput again. See the global file at /etc/dput.cf
- and the man pages for more info.
-Description-ru:     
-         dput ,   
-      .  ,      
-     ~/.dput.cf,          
-     ,      dput.  
-  .    /etc/dput.cf   
-
