Bug#350649: Patch for NMU of tftp-hpa

[Luk Claes]

Hi

Attached the patch for the version I uploaded. Please respond if
you think that the attached patch won't work.

Cheers

Luk

-- 
Luk Claes - http://people.debian.org/~luk - GPG key 1024D/9B7C328D
Fingerprint:   D5AF 25FB 316B 53BB 08E7   F999 E544 DE07 9B7C 328D

diff -u tftp-hpa-0.40/debian/control tftp-hpa-0.40/debian/control
--- tftp-hpa-0.40/debian/control
+++ tftp-hpa-0.40/debian/control
@@ -2,7 +2,7 @@
 Section: net
 Priority: extra
 Maintainer: Jaakko Niemi <[EMAIL PROTECTED]>
-Build-Depends: debhelper (>= 4.1.16), libreadline4-dev, libwrap0-dev
+Build-Depends: debhelper (>= 4.1.16), libreadline5-dev, libwrap0-dev
 Standards-Version: 3.6.1.0
 
 Package: tftp-hpa
@@ -18,7 +18,7 @@
 
 Package: tftpd-hpa
 Architecture: any
-Depends: ${shlibs:Depends}, debconf, netbase
+Depends: ${shlibs:Depends}, debconf | debconf-2.0, netbase
 Conflicts: tftpd
 Provides: tftpd
 Description: HPA's tftp server
diff -u tftp-hpa-0.40/debian/changelog tftp-hpa-0.40/debian/changelog
--- tftp-hpa-0.40/debian/changelog
+++ tftp-hpa-0.40/debian/changelog
@@ -1,3 +1,14 @@
+tftp-hpa (0.40-4.2) unstable; urgency=high
+
+  * Non-maintainer upload.
+  * Update readline build-dep to libreadline5-dev (Closes: #350649).
+  * Added Vietnamese debconf translation (Closes: #322296).
+  * Added Swedish debconf translation (Closes: #331595).
+  * Added Portuguese debconf translation (Closes: #335952).
+  * Add debconf-2.0 alternative (Closes: #332116).
+
+ -- Luk Claes <[EMAIL PROTECTED]>  Wed, 15 Feb 2006 12:18:32 +0100
+
 tftp-hpa (0.40-4.1) unstable; urgency=high
 
   * NMU
only in patch2:
unchanged:
--- tftp-hpa-0.40.orig/debian/po/vi.po
+++ tftp-hpa-0.40/debian/po/vi.po
@@ -0,0 +1,32 @@
+# Vietnamese translation for tftp-hpa.
+# Copyright © 2005 Free Software Foundation, Inc.
+# Clytie Siddall <[EMAIL PROTECTED]>, 2005.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: tftp-hpa 0.40-4.1\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2004-10-17 01:13+0300\n"
+"PO-Revision-Date: 2005-08-10 16:26+0930\n"
+"Last-Translator: Clytie Siddall <[EMAIL PROTECTED]>\n"
+"Language-Team: Vietnamese <[EMAIL PROTECTED]>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=utf-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0\n"
+"X-Generator: LocFactoryEditor 1.2.2\n"
+
+#. Type: boolean
+#. Description
+#: ../tftpd-hpa.templates:4
+msgid "Should the server be started by inetd?"
+msgstr "Trình nền inetd nên khởi chạy trình phục vụ không?"
+
+#. Type: boolean
+#. Description
+#: ../tftpd-hpa.templates:4
+msgid ""
+"tftpd-hpa can be started by the inetd superserver or as a daemon and handle "
+"incoming connections by itself. The latter is only recommended for very high "
+"usage servers."
+msgstr "Trình tftpd-hpa có thể được khởi chạy bởi siêu trình 
phục vụ inetd hoặc như là trình nền (dæmon) thì quản lý các 
kết nối gởi đến tự nó. Chỉ khuyên tùy chọn sau cho trình 
phục vụ bận lắm."
only in patch2:
unchanged:
--- tftp-hpa-0.40.orig/debian/po/sv.po
+++ tftp-hpa-0.40/debian/po/sv.po
@@ -0,0 +1,42 @@
+# 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: tftp-hpa 0.40-4.1\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2004-10-17 01:13+0300\n"
+"PO-Revision-Date: 2005-10-05 06:04+0200\n"
+"Last-Translator: Daniel Nylander <[EMAIL PROTECTED]>\n"
+"Language-Team: Swedish <[EMAIL PROTECTED]>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=iso-8859-1\n"
+"Content-Transfer-Encoding: 8bit"
+
+#. Type: boolean
+#. Description
+#: ../tftpd-hpa.templates:4
+msgid "Should the server be started by inetd?"
+msgstr "Ska servern startas via inetd?"
+
+#. Type: boolean
+#. Description
+#: ../tftpd-hpa.templates:4
+msgid ""
+"tftpd-hpa can be started by the inetd superserver or as a daemon and handle "
+"incoming connections by itself. The latter is only recommended for very high "
+"usage servers."
+msgstr ""
+"tftpd-hpa kan startas via inetd superserver eller som en fristående daemon 
och "
+"hantera inkommande anslutningar på egen hand. Den senare är bara 
rekommenderad "
+"för servrar med hög belastning."
+
only in patch2:
unchanged:
--- tftp-hpa-0.40.orig/debian/po/pt.po
+++ tftp-hpa-0.40/debian/po/pt.po
@@ -0,0 +1,35 @@
+# Portuguese translation of tftp-hpa's debconf messages.
+# 2005, Rui Branco <[EMAIL PROTECTED]>>
+#
+# 2005-10-22 - Rui Branco <[EMAIL PROTECTED]>
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: tftp-hpa 0.40-4.1\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2004-10-17 01:13+0300\n"
+"PO-Revision-Date: 2005-10-22 23:17+0100\n"
+"Last-Translator: Rui Branco <[EMAIL PROTECTED]>\n"
+"Language-Team: Portuguese <[EMAIL PROTECTED]>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit"
+
+#. Type: boolean
+#. Description
+#: ../tftpd-hpa.templates:4
+msgid "Should the server be started by inetd?"
+msgstr "Deverá o servidor ser iniciado pelo inetd?"
+
+#. Type: boolean
+#. Description
+#: ../tftpd-hpa.templates:4
+msgid ""
+"tftpd-hpa can be started by the inetd superserver or as a daemon and handle "
+"incoming connections by itself. The latter is only recommended for very high "
+"usage servers."
+msgstr ""
+"O tftp-hpa pode ser iniciado pelo superservidor inetd ou como um "
+"'daemon' encarregando-se ele mesmo de gerir as ligações que chegam. "
+"Este último modo apenas é recomendado para servidores que recebam "
+"muitos utilizadores."

signature.asc
Description: OpenPGP digital signature