Merge ~smoser/ubuntu/+source/tftp-hpa:merge into ~ubuntu-server-dev/ubuntu/+source/tftp-hpa:master

[Scott Moser]

diff --git a/debian/changelog b/debian/changelog
index 3b02321..57fb95c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+tftp-hpa (5.2+20150808-1ubuntu1) UNRELEASED; urgency=medium
+
+  * Merge from Debian unstable. Remaining changes:
+    - debian/tftpd-hpa.templates: Set /var/lib/tftpboot by default instead
+      of /srv/tftp.
+    - Default to listening on both IPv4 and IPv6.
+    - debian/tftpd-hpa.postinst: Add "-s" to /etc/default/tftpd-hpa
+
+ -- Scott Moser <[e-mail]>  Tue, 02 Feb 2016 16:29:36 +0100
+
 tftp-hpa (5.2+20150808-1) unstable; urgency=medium
 
   * Canonicalize all the addresses.  This avoids the situation of trying to
@@ -8,6 +18,17 @@ tftp-hpa (5.2+20150808-1) unstable; urgency=medium
 
  -- Ron Lee <[e-mail]>  Sat, 08 Aug 2015 13:59:11 +0930
 
+tftp-hpa (5.2+20140608-3ubuntu1) vivid; urgency=low
+
+  * Merge from Debian unstable.  Remaining changes:
+    - debian/tftpd-hpa.templates: Set /var/lib/tftpboot by default instead of
+      /srv/tftp.
+    - debian/tftpd-hpa.upstart: Convert to Upstart.
+    - debian/tftpd-hpa.postinst: Add "-s" to /etc/default/tftpd-hpa
+    - Default to listening on both IPv4 and IPv6. (LP: #1228340)
+
+ -- Michael Vogt <[e-mail]>  Tue, 28 Oct 2014 10:26:04 +0100
+
 tftp-hpa (5.2+20140608-3) unstable; urgency=medium
 
   * Fix the Vcs- links to alioth.
@@ -41,6 +62,17 @@ tftp-hpa (5.2-20) unstable; urgency=low
 
  -- Daniel Baumann <[e-mail]>  Fri, 25 Jul 2014 20:57:28 +0200
 
+tftp-hpa (5.2-19ubuntu1) utopic; urgency=medium
+
+  * Merge from Debian unstable. Remaining changes:
+    - debian/tftpd-hpa.templates: Set /var/lib/tftpboot by default instead of
+      /srv/tftp.
+    - debian/tftpd-hpa.upstart: Convert to Upstart.
+    - debian/tftpd-hpa.postinst: Add "-s" to /etc/default/tftpd-hpa
+    - Default to listening on both IPv4 and IPv6. (LP: #1228340)
+
+ -- Stéphane Graber <[e-mail]>  Fri, 02 May 2014 16:28:04 -0400
+
 tftp-hpa (5.2-19) unstable; urgency=low
 
   * Introducing initial support for upstart as wished by Steve Langasek
@@ -48,6 +80,18 @@ tftp-hpa (5.2-19) unstable; urgency=low
 
  -- Daniel Baumann <[e-mail]>  Sun, 04 May 2014 15:16:55 +0200
 
+tftp-hpa (5.2-18ubuntu1) utopic; urgency=medium
+
+  * Merge from Debian unstable. Remaining changes:
+    - debian/tftpd-hpa.templates: Set /var/lib/tftpboot by default instead of
+      /srv/tftp.
+    - debian/tftpd-hpa.upstart: Convert to Upstart.
+    - debian/tftpd-hpa.postinst: Add "-s" to /etc/default/tftpd-hpa
+    - Default to listening on both IPv4 and IPv6. (LP: #1228340)
+  * Reintroduce the Upstart integration.
+
+ -- Stéphane Graber <[e-mail]>  Fri, 02 May 2014 16:28:04 -0400
+
 tftp-hpa (5.2-18) unstable; urgency=low
 
   * Updating year in copyright file.
@@ -132,6 +176,33 @@ tftp-hpa (5.2-8) experimental; urgency=low
 
  -- Daniel Baumann <[e-mail]>  Sun, 31 Mar 2013 16:54:07 +0200
 
+tftp-hpa (5.2-7ubuntu3) saucy; urgency=low
+
+  * Default to listening on both IPv4 and IPv6. (LP: #1228340)
+
+ -- Stéphane Graber <[e-mail]>  Fri, 20 Sep 2013 14:40:13 -0500
+
+tftp-hpa (5.2-7ubuntu2) saucy; urgency=low
+
+  * Update the upstart job to use the same pre-start checks as the init
+    script.
+
+ -- Steve Langasek <[e-mail]>  Wed, 29 May 2013 16:21:28 -0700
+
+tftp-hpa (5.2-7ubuntu1) saucy; urgency=low
+
+  * Merge from Debian unstable, remaining changes:
+    - debian/tftpd-hpa.templates: Set /var/lib/tftpboot by default instead of
+      /srv/tftp.
+    - debian/tftpd-hpa.upstart: Convert to Upstart.
+    - debian/patches/04-use-memcpy-for-header.patch: Fix FORTIFY-detected
+      potential memory corruption.
+    - debian/tftpd-hpa.postinst: Add "-s" to /etc/default/tftpd-hpa
+  * Adjust tftpd-hpa init script to detect upstart, making the upstart
+    patches upstreamable to Debian.
+
+ -- Steve Langasek <[e-mail]>  Sat, 18 May 2013 22:07:57 -0700
+
 tftp-hpa (5.2-7) unstable; urgency=low
 
   * Removing all references to my old email address.
@@ -144,6 +215,18 @@ tftp-hpa (5.2-6) unstable; urgency=low
 
  -- Daniel Baumann <[e-mail]>  Sun, 10 Mar 2013 21:52:27 +0100
 
+tftp-hpa (5.2-5ubuntu1) raring; urgency=low
+
+  * Merge from Debian unstable. Remaining changes:
+    - debian/tftpd-hpa.templates: Set /var/lib/tftpboot by default instead of
+      /srv/tftp.
+    - debian/tftpd-hpa.upstart: Convert to Upstart.
+    - debian/patches/04-use-memcpy-for-header.patch: Fix FORTIFY-detected
+      potential memory corruption.
+    - debian/tftpd-hpa.postinst: Add "-s" to /etc/default/tftpd-hpa
+
+ -- Logan Rosen <[e-mail]>  Sun, 06 Jan 2013 01:01:24 -0600
+
 tftp-hpa (5.2-5) unstable; urgency=low
 
   * Correcting spelling typo in readme, thanks to Adam D. Barratt <adam
@@ -153,6 +236,17 @@ tftp-hpa (5.2-5) unstable; urgency=low
 
  -- Daniel Baumann <[e-mail]>  Sun, 16 Dec 2012 10:46:51 +0100
 
+tftp-hpa (5.2-4ubuntu1) raring; urgency=low
+
+  * Resynchronise with Debian.  Remaining changes:
+    - Set /var/lib/tftpboot by default instead of /srv/tftp.
+    - Decrease priority of tftp path from high to low.
+    - debian/rules, debian/tftpd-hpa.upstart: Convert to Upstart.
+    - debian/patches/04-use-memcpy-for-header.patch: Fix FORTIFY-detected
+      potential memory corruption.
+
+ -- Colin Watson <[e-mail]>  Wed, 28 Nov 2012 02:26:08 +0000
+
 tftp-hpa (5.2-4) unstable; urgency=low
 
   * Adding note to readme about ipv6 kernel support (Closes: #544089).
@@ -177,6 +271,23 @@ tftp-hpa (5.2-2) unstable; urgency=low
 
  -- Daniel Baumann <[e-mail]>  Wed, 14 Mar 2012 07:59:35 +0100
 
+tftp-hpa (5.2-1ubuntu2) quantal; urgency=low
+
+  * Rebuild for new armel compiler default of ARMv5t.
+
+ -- Colin Watson <[e-mail]>  Mon, 08 Oct 2012 23:01:31 +0100
+
+tftp-hpa (5.2-1ubuntu1) precise; urgency=low
+
+  * Merge from Debian testing.  Remaining changes:
+    - Set /var/lib/tftpboot by default instead of /srv/tftp.
+    - Decrease priority of tftp path from high to low.
+    - debian/rules, debain/tftpd-hpa.upstart: Convert to usptart (LP: #522509)
+    - debian/patches/04-use-memcpy-for-header.patch: fix FORTIFY-detected
+      potential memory corruption (LP: #691345)
+
+ -- Chuck Short <[e-mail]>  Mon, 23 Jan 2012 09:24:51 -0500
+
 tftp-hpa (5.2-1) unstable; urgency=low
 
   * Using compression level 9 also for binary packages.
@@ -185,6 +296,30 @@ tftp-hpa (5.2-1) unstable; urgency=low
 
  -- Daniel Baumann <[e-mail]>  Fri, 23 Dec 2011 15:10:17 +0100
 
+tftp-hpa (5.1-3ubuntu3) precise; urgency=low
+
+  * debian/tftpd-hpa.upstart: Fix typo. (LP: #911135) 
+
+ -- Chuck Short <[e-mail]>  Tue, 03 Jan 2012 08:18:01 -0500
+
+tftp-hpa (5.1-3ubuntu2) precise; urgency=low
+
+  * debian/tftpd-hpa.upstart: Fix runlevel transition.
+    (LP: #820698) 
+
+ -- Chuck Short <[e-mail]>  Mon, 02 Jan 2012 10:20:29 -0500
+
+tftp-hpa (5.1-3ubuntu1) precise; urgency=low
+
+  * Merge from debian unstable.  Remaining changes:
+    - Set /var/lib/tftpboot by default instead of /srv/tftp.
+    - Decrease priority of tftp path from high to low.
+    - debian/rules, debain/tftpd-hpa.upstart: Convert to usptart (LP: #522509)
+    - debian/patches/04-use-memcpy-for-header.patch: fix FORTIFY-detected
+      potential memory corruption (LP: #6913
+
+ -- Chuck Short <[e-mail]>  Mon, 17 Oct 2011 18:54:29 +0000
+
 tftp-hpa (5.1-3) unstable; urgency=low
 
   * Adding Brazilian Portuguese debconf translations from Flamarion
@@ -192,6 +327,17 @@ tftp-hpa (5.1-3) unstable; urgency=low
 
  -- Daniel Baumann <[e-mail]>  Wed, 28 Sep 2011 13:52:46 +0200
 
+tftp-hpa (5.1-2ubuntu1) oneiric; urgency=low
+
+  * Merge from debian unstable (LP: #842585). Remaining changes:
+    - Set /var/lib/tftpboot by default instead of /srv/tftp.
+    - Decrease priority of tftp path from high to low.
+    - debian/rules, debain/tftpd-hpa.upstart: Convert to usptart (LP: #522509)
+    - debian/patches/04-use-memcpy-for-header.patch: fix FORTIFY-detected
+      potential memory corruption (LP: #691345)
+
+ -- Mahyuddin Susanto <[e-mail]>  Tue, 06 Sep 2011 18:55:40 +0700
+
 tftp-hpa (5.1-2) unstable; urgency=low
 
   * Applying patch from Chris Lamb <[e-mail]> to correct wrong
@@ -200,6 +346,17 @@ tftp-hpa (5.1-2) unstable; urgency=low
 
  -- Daniel Baumann <[e-mail]>  Sun, 07 Aug 2011 16:43:58 +0200
 
+tftp-hpa (5.1-1ubuntu1) oneiric; urgency=low
+
+  * Merge from debian unstable.  Remaining changes:
+    - Set /var/lib/tftpboot by default instead of /srv/tftp.
+    - Decrease priority of tftp path from high to low.
+    - debian/rules, debain/tftpd-hpa.upstart: Convert to usptart (LP: #522509)
+    - debian/patches/04-use-memcpy-for-header.patch: fix FORTIFY-detected
+      potential memory corruption (LP: #691345)
+
+ -- Chuck Short <[e-mail]>  Mon, 11 Jul 2011 18:51:12 +0100
+
 tftp-hpa (5.1-1) unstable; urgency=low
 
   * Updating standards version to 3.9.2.
@@ -211,6 +368,17 @@ tftp-hpa (5.1-1) unstable; urgency=low
 
  -- Daniel Baumann <[e-mail]>  Sun, 10 Jul 2011 17:18:58 +0200
 
+tftp-hpa (5.0-22ubuntu1) oneiric; urgency=low
+
+  * Merge from debian unstable.  Remaining changes:
+    - Set /var/lib/tftpboot by default instead of /srv/tftp.
+    - Decrease priority of tftp path from high to low.
+    - debian/rules, debain/tftpd-hpa.upstart: Convert to usptart (LP: #522509)
+    - debian/patches/04-use-memcpy-for-header.patch: fix FORTIFY-detected
+      potential memory corruption (LP: #691345).
+
+ -- Chuck Short <[e-mail]>  Wed, 09 Mar 2011 17:36:42 +0000
+
 tftp-hpa (5.0-22) unstable; urgency=low
 
   * Adding support for multiple server directories in packaging files
@@ -221,6 +389,24 @@ tftp-hpa (5.0-22) unstable; urgency=low
 
  -- Daniel Baumann <[e-mail]>  Sun, 20 Feb 2011 00:18:01 +0100
 
+tftp-hpa (5.0-21ubuntu2) natty; urgency=low
+
+  * Clean up debian/patches and re-add dropped patch,
+    04-use-memcpy-for-header.patch (LP: #727356)
+
+ -- Chuck Short <[e-mail]>  Tue, 01 Mar 2011 14:24:12 -0500
+
+tftp-hpa (5.0-21ubuntu1) natty; urgency=low
+
+  * Merge from debian unstable.  Remaining changes:
+    - Set /var/lib/tftpboot by default instead of /srv/tftp.
+    - Decrease priority of tftp path from high to low.
+    - debian/rules, debian/tftpd-hpa.upstart: Convert to upstart (LP: #522509)
+    - debian/patches/04-use-memcpy-for-header.patch: fix FORTIFY-detected
+      potential memory corruption (LP: #691345).
+
+ -- Chuck Short <[e-mail]>  Mon, 07 Feb 2011 06:07:31 +0000
+
 tftp-hpa (5.0-21) unstable; urgency=low
 
   * Updating maintainer and uploaders fields.
@@ -248,6 +434,22 @@ tftp-hpa (5.0-19) experimental; urgency=low
 
  -- Daniel Baumann <[e-mail]>  Sun, 19 Dec 2010 21:02:26 +0100
 
+tftp-hpa (5.0-18ubuntu2) natty; urgency=low
+
+  * debian/patches/04-use-memcpy-for-header.patch: fix FORTIFY-detected
+    potential memory corruption (LP: #691345).
+
+ -- Kees Cook <[e-mail]>  Thu, 16 Dec 2010 17:44:44 -0800
+
+tftp-hpa (5.0-18ubuntu1) natty; urgency=low
+
+  * Merge from debian unstable.  Remaining changes:
+    - Set /var/lib/tftpboot by default instead of /srv/tftp.
+    - Decrease priority of tftp path from high to low.
+    - debian/rules, debian/tftpd-hpa.upstart: Convert to upstart (LP: #522509)
+
+ -- Chuck Short <[e-mail]>  Tue, 07 Dec 2010 08:17:22 +0000
+
 tftp-hpa (5.0-18) unstable; urgency=medium
 
   * Making greps for tftp username in postinst more robust.
@@ -262,6 +464,15 @@ tftp-hpa (5.0-17) experimental; urgency=low
 
  -- Daniel Baumann <[e-mail]>  Sat, 25 Sep 2010 22:38:41 +0200
 
+tftp-hpa (5.0-16ubuntu1) natty; urgency=low
+
+  * Merge from debian unstable.  Remaining changes:
+    - Set /var/lib/tftpboot by default instead of /srv/tftp.
+    - Decrease priority of tftp path from hight to low
+    - debian/rules, debian/tftpd-hpa.upstart: Convert to upstart (LP: #522509)
+
+ -- Chuck Short <[e-mail]>  Tue, 12 Oct 2010 12:17:05 +0100
+
 tftp-hpa (5.0-16) unstable; urgency=low
 
   * Adding updated debconf translations from Vincenzo Campanella
@@ -279,6 +490,15 @@ tftp-hpa (5.0-15) unstable; urgency=low
 
  -- Daniel Baumann <[e-mail]>  Thu, 05 Aug 2010 17:13:47 +0200
 
+tftp-hpa (5.0-14ubuntu1) maverick; urgency=low
+
+  * Merge from debian unstable:
+    - Set /var/lib/tftpboot by default instead of /srv/tftp
+    - Decrease priority of tftp path from hight to low
+    - debian/rules, debian/tftpd-hpa.upstart: Convert to upstart (LP: #522509
+
+ -- Chuck Short <[e-mail]>  Mon, 12 Jul 2010 09:15:56 -0400
+
 tftp-hpa (5.0-14) unstable; urgency=medium
 
   * Updating standards version to 3.9.0.
@@ -288,6 +508,15 @@ tftp-hpa (5.0-14) unstable; urgency=medium
 
  -- Daniel Baumann <[e-mail]>  Sat, 10 Jul 2010 18:16:58 +0200
 
+tftp-hpa (5.0-13ubuntu1) maverick; urgency=low
+
+  * Merge from debian unstable:
+    * Set /var/lib/tftpboot by default instead of /srv/tftp
+    * Decrease priority of tftp path from hight to log
+    * debian/rules, debian/tftpd-hpa.upstart: Convert to upstart (LP: #522509)
+
+ -- Chuck Short <[e-mail]>  Mon, 21 Jun 2010 14:46:15 -0400
+
 tftp-hpa (5.0-13) unstable; urgency=low
 
   * Not failing if removal of server directory in postinst isn't
@@ -310,6 +539,23 @@ tftp-hpa (5.0-12) unstable; urgency=low
 
  -- Daniel Baumann <[e-mail]>  Wed, 07 Apr 2010 09:59:35 +0200
 
+tftp-hpa (5.0-11ubuntu2) lucid; urgency=low
+
+  * debian/rules, debian/tftpd-hpa.upstart: Convert to upstart.
+    (LP: #522509) 
+  * debian/tftpd-hpa.postinst: Add "-s" to /etc/default/tftpd-hpa.
+    (LP: #531123)
+
+ -- Chuck Short <[e-mail]>  Thu, 11 Mar 2010 12:40:07 -0500
+
+tftp-hpa (5.0-11ubuntu1) lucid; urgency=low
+
+  * Revert to pre-Lucid behavior (LP: #518815):
+   * Set /var/lib/tftpboot by default instead of /srv/tftp/
+   * Decrease priority of tftp path from high to low
+
+ -- Stéphane Graber <[e-mail]>  Wed, 10 Feb 2010 10:05:01 -0500
+
 tftp-hpa (5.0-11) unstable; urgency=medium
 
   * Removing explicit LDFLAGS, did apparently not fix the FTBFS on
@@ -692,3 +938,4 @@ tftp-hpa (0.14-1) unstable; urgency=low
   * Initial Debian release
 
  -- Wichert Akkerman <[e-mail]>  Fri, 17 Nov 2000 10:41:09 +0000
+
diff --git a/debian/control b/debian/control
index 3c1d7b2..9d5a804 100644
--- a/debian/control
+++ b/debian/control
@@ -1,7 +1,8 @@
 Source: tftp-hpa
 Section: net
 Priority: extra
-Maintainer: Ron Lee <[e-mail]>
+Maintainer: Ubuntu Developers <[e-mail]>
+XSBC-Original-Maintainer: Ron Lee <[e-mail]>
 Build-Depends: debhelper (>= 9), autoconf, autotools-dev, libwrap0-dev, po-debconf
 Standards-Version: 3.9.6.1
 Homepage: http://git.kernel.org/cgit/network/tftp/tftp-hpa.git
diff --git a/debian/po/cs.po b/debian/po/cs.po
index 1789e3d..df3a29d 100644
--- a/debian/po/cs.po
+++ b/debian/po/cs.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: tftp-hpa 5.0-14\n"
 "Report-Msgid-Bugs-To: [e-mail]\n"
-"POT-Creation-Date: 2009-11-10 11:05+0100\n"
+"POT-Creation-Date: 2014-10-28 10:26+0100\n"
 "PO-Revision-Date: 2010-07-20 05:54+0200\n"
 "Last-Translator: Vitezslav Kotrla <[e-mail]>\n"
 "Language-Team: Czech <[e-mail]>\n"
@@ -72,10 +72,10 @@ msgstr ""
 #: ../tftpd-hpa.templates:3001
 msgid ""
 "By default, the TFTP server listens to port 69 on all addresses and all "
-"interfaces (0.0.0.0:69). If no port is specified, it defaults to 69."
+"interfaces ([::]:69). If no port is specified, it defaults to 69."
 msgstr ""
 "Ve výchozím nastavení TFTP server naslouchá na portu 69 na všech adresách a "
-"všech síťových rozhraních (0.0.0.0:69). Pokud nebude zadán port, použije se "
+"všech síťových rozhraních ([::]:69). Pokud nebude zadán port, použije se "
 "výchozí hodnota 69."
 
 #. Type: string
@@ -115,3 +115,11 @@ msgstr ""
 "Jiné volby než doporučované '--secure' nejsou obvykle potřeba a využijete je "
 "pouze ve speciálních situacích. Pokud nevíte, ponechejte doporučenou výchozí "
 "hodnotu."
+
+#~ msgid ""
+#~ "By default, the TFTP server listens to port 69 on all addresses and all "
+#~ "interfaces (0.0.0.0:69). If no port is specified, it defaults to 69."
+#~ msgstr ""
+#~ "Ve výchozím nastavení TFTP server naslouchá na portu 69 na všech adresách "
+#~ "a všech síťových rozhraních (0.0.0.0:69). Pokud nebude zadán port, "
+#~ "použije se výchozí hodnota 69."
diff --git a/debian/po/da.po b/debian/po/da.po
index fb9cd89..945578b 100644
--- a/debian/po/da.po
+++ b/debian/po/da.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: tftp-hpa\n"
 "Report-Msgid-Bugs-To: [e-mail]\n"
-"POT-Creation-Date: 2009-11-10 11:05+0100\n"
+"POT-Creation-Date: 2014-10-28 10:26+0100\n"
 "PO-Revision-Date: 2010-09-25 17:30+01:00\n"
 "Last-Translator: Joe Hansen <[e-mail]>\n"
 "Language-Team: Danish <[e-mail]> \n"
@@ -71,10 +71,10 @@ msgstr ""
 #: ../tftpd-hpa.templates:3001
 msgid ""
 "By default, the TFTP server listens to port 69 on all addresses and all "
-"interfaces (0.0.0.0:69). If no port is specified, it defaults to 69."
+"interfaces ([::]:69). If no port is specified, it defaults to 69."
 msgstr ""
 "Som standard, lytter TFTP-serveren på port 69 for alle adresser og alle "
-"grænseflader (0.0.0.0:69). Hvis ingen port er angivet, er standarden 69."
+"grænseflader ([::]:69). Hvis ingen port er angivet, er standarden 69."
 
 #. Type: string
 #. Description
@@ -113,3 +113,10 @@ msgid ""
 msgstr ""
 "Tilvalg udover den anbefalede '--secure' er sjældent nødvendigt og kun til "
 "specielle situationer. Hvis usikker, behold den anbefalede standardværdi."
+
+#~ msgid ""
+#~ "By default, the TFTP server listens to port 69 on all addresses and all "
+#~ "interfaces (0.0.0.0:69). If no port is specified, it defaults to 69."
+#~ msgstr ""
+#~ "Som standard, lytter TFTP-serveren på port 69 for alle adresser og alle "
+#~ "grænseflader (0.0.0.0:69). Hvis ingen port er angivet, er standarden 69."
diff --git a/debian/po/de.po b/debian/po/de.po
index 7ede720..879a9a9 100644
--- a/debian/po/de.po
+++ b/debian/po/de.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: tftp-hpa 5.0-14\n"
 "Report-Msgid-Bugs-To: [e-mail]\n"
-"POT-Creation-Date: 2009-11-10 11:05+0100\n"
+"POT-Creation-Date: 2014-10-28 10:26+0100\n"
 "PO-Revision-Date: 2010-07-20 05:54+0200\n"
 "Last-Translator: Daniel Baumann <[e-mail]>\n"
 "Language-Team: none\n"
@@ -76,10 +76,10 @@ msgstr ""
 #: ../tftpd-hpa.templates:3001
 msgid ""
 "By default, the TFTP server listens to port 69 on all addresses and all "
-"interfaces (0.0.0.0:69). If no port is specified, it defaults to 69."
+"interfaces ([::]:69). If no port is specified, it defaults to 69."
 msgstr ""
 "Standardmässig wartet der TFTP-Server auf Port 69 auf allen Adressen und "
-"allen Schnittstellen (0.0.0.0:69). Ohne Port-Angabe wird die Vorgabe 69 "
+"allen Schnittstellen ([::]:69). Ohne Port-Angabe wird die Vorgabe 69 "
 "verwendet."
 
 #. Type: string
@@ -121,3 +121,11 @@ msgstr ""
 "Andere als die empfohlene Option \"--secure\" werden selten und nur für "
 "besondere Situationen benötigt. Falls Sie sich unsicher sind, belassen Sie "
 "den Vorgabewert."
+
+#~ msgid ""
+#~ "By default, the TFTP server listens to port 69 on all addresses and all "
+#~ "interfaces (0.0.0.0:69). If no port is specified, it defaults to 69."
+#~ msgstr ""
+#~ "Standardmässig wartet der TFTP-Server auf Port 69 auf allen Adressen und "
+#~ "allen Schnittstellen (0.0.0.0:69). Ohne Port-Angabe wird die Vorgabe 69 "
+#~ "verwendet."
diff --git a/debian/po/es.po b/debian/po/es.po
index 2656588..8c4a247 100644
--- a/debian/po/es.po
+++ b/debian/po/es.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: tftpd-hpa 5.0-14\n"
 "Report-Msgid-Bugs-To: [e-mail]\n"
-"POT-Creation-Date: 2009-11-10 11:05+0100\n"
+"POT-Creation-Date: 2014-10-28 10:26+0100\n"
 "PO-Revision-Date: 2010-07-18 10:38+0200\n"
 "Last-Translator: Omar Campagne <[e-mail]>\n"
 "Language-Team: Spanish <[e-mail]>\n"
@@ -76,11 +76,11 @@ msgstr ""
 #: ../tftpd-hpa.templates:3001
 msgid ""
 "By default, the TFTP server listens to port 69 on all addresses and all "
-"interfaces (0.0.0.0:69). If no port is specified, it defaults to 69."
+"interfaces ([::]:69). If no port is specified, it defaults to 69."
 msgstr ""
 "Por omisión, el servidor de TFTP escucha en el puerto 69 de todas las "
-"direcciones e interfaces (0.0.0.0:69). Si no se especifica un puerto, el "
-"valor por omisión es 69."
+"direcciones e interfaces ([::]:69). Si no se especifica un puerto, el valor "
+"por omisión es 69."
 
 #. Type: string
 #. Description
@@ -120,3 +120,11 @@ msgstr ""
 "Rara vez, y sólo en situaciones especiales, necesitará otras opciones más "
 "allá de la recomendada, «--secure». Si no está seguro, deje el valor "
 "recomendado por omisión."
+
+#~ msgid ""
+#~ "By default, the TFTP server listens to port 69 on all addresses and all "
+#~ "interfaces (0.0.0.0:69). If no port is specified, it defaults to 69."
+#~ msgstr ""
+#~ "Por omisión, el servidor de TFTP escucha en el puerto 69 de todas las "
+#~ "direcciones e interfaces (0.0.0.0:69). Si no se especifica un puerto, el "
+#~ "valor por omisión es 69."
diff --git a/debian/po/fi.po b/debian/po/fi.po
index 4ceaac0..77a88c6 100644
--- a/debian/po/fi.po
+++ b/debian/po/fi.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: tftp-hpa 5.0-14\n"
 "Report-Msgid-Bugs-To: [e-mail]\n"
-"POT-Creation-Date: 2009-11-10 11:05+0100\n"
+"POT-Creation-Date: 2014-10-28 10:26+0100\n"
 "PO-Revision-Date: 2009-04-07 22:19+0300\n"
 "Last-Translator: Esko Arajärvi <[e-mail]>\n"
 "Language-Team: Finnish <[e-mail]>\n"
@@ -71,7 +71,7 @@ msgstr ""
 #: ../tftpd-hpa.templates:3001
 msgid ""
 "By default, the TFTP server listens to port 69 on all addresses and all "
-"interfaces (0.0.0.0:69). If no port is specified, it defaults to 69."
+"interfaces ([::]:69). If no port is specified, it defaults to 69."
 msgstr ""
 
 #. Type: string
diff --git a/debian/po/fr.po b/debian/po/fr.po
index 4c7dee6..5f315de 100644
--- a/debian/po/fr.po
+++ b/debian/po/fr.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: tftp-hpa 5.0-14\n"
 "Report-Msgid-Bugs-To: [e-mail]\n"
-"POT-Creation-Date: 2009-11-10 11:05+0100\n"
+"POT-Creation-Date: 2014-10-28 10:26+0100\n"
 "PO-Revision-Date: 2009-03-26 01:12+0100\n"
 "Last-Translator: Steve Petruzzello <[e-mail]>\n"
 "Language-Team: French <[e-mail]>\n"
@@ -72,10 +72,10 @@ msgstr ""
 #: ../tftpd-hpa.templates:3001
 msgid ""
 "By default, the TFTP server listens to port 69 on all addresses and all "
-"interfaces (0.0.0.0:69). If no port is specified, it defaults to 69."
+"interfaces ([::]:69). If no port is specified, it defaults to 69."
 msgstr ""
 "Le serveur TFTP écoute par défaut sur le port 69 pour toutes les adresses et "
-"toutes les interfaces (0.0.0.0:69). Si aucun port n'est indiqué, le port par "
+"toutes les interfaces ([::]:69). Si aucun port n'est indiqué, le port par "
 "défaut sera le port 69."
 
 #. Type: string
@@ -116,3 +116,11 @@ msgstr ""
 "À part l'option « --secure » qui est recommandée, les autres sont rarement "
 "nécessaires et ne sont utilisées que pour des situations très spéciales. "
 "Dans le doute, vous devriez laisser les valeurs par défaut."
+
+#~ msgid ""
+#~ "By default, the TFTP server listens to port 69 on all addresses and all "
+#~ "interfaces (0.0.0.0:69). If no port is specified, it defaults to 69."
+#~ msgstr ""
+#~ "Le serveur TFTP écoute par défaut sur le port 69 pour toutes les adresses "
+#~ "et toutes les interfaces (0.0.0.0:69). Si aucun port n'est indiqué, le "
+#~ "port par défaut sera le port 69."
diff --git a/debian/po/gl.po b/debian/po/gl.po
index 76336b8..e3db314 100644
--- a/debian/po/gl.po
+++ b/debian/po/gl.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: tftp-hpa 5.0-14\n"
 "Report-Msgid-Bugs-To: [e-mail]\n"
-"POT-Creation-Date: 2009-11-10 11:05+0100\n"
+"POT-Creation-Date: 2014-10-28 10:26+0100\n"
 "PO-Revision-Date: 2009-04-15 21:32+0200\n"
 "Last-Translator: marce villarino <[e-mail]>\n"
 "Language-Team: Galician <[e-mail]>\n"
@@ -72,7 +72,7 @@ msgstr ""
 #: ../tftpd-hpa.templates:3001
 msgid ""
 "By default, the TFTP server listens to port 69 on all addresses and all "
-"interfaces (0.0.0.0:69). If no port is specified, it defaults to 69."
+"interfaces ([::]:69). If no port is specified, it defaults to 69."
 msgstr ""
 
 #. Type: string
diff --git a/debian/po/it.po b/debian/po/it.po
index 09cef58..b3d4ad8 100644
--- a/debian/po/it.po
+++ b/debian/po/it.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: tftp-hpa 5.0-15\n"
 "Report-Msgid-Bugs-To: [e-mail]\n"
-"POT-Creation-Date: 2009-11-10 11:05+0100\n"
+"POT-Creation-Date: 2014-10-28 10:26+0100\n"
 "PO-Revision-Date: 2010-09-17 13:35+0100\n"
 "Last-Translator: Vincenzo Campanella <[e-mail]>\n"
 "Language-Team: Italian <[e-mail]>\n"
@@ -72,10 +72,10 @@ msgstr ""
 #: ../tftpd-hpa.templates:3001
 msgid ""
 "By default, the TFTP server listens to port 69 on all addresses and all "
-"interfaces (0.0.0.0:69). If no port is specified, it defaults to 69."
+"interfaces ([::]:69). If no port is specified, it defaults to 69."
 msgstr ""
 "In modo predefinito il server TFTP si pone in ascolto sulla posta 69 su "
-"tutti gli indirizzi e tutte le interfacce (0.0.0.0:69). Se non viene "
+"tutti gli indirizzi e tutte le interfacce ([::]:69). Se non viene "
 "specificata alcuna porta viene utilizzata quella predefinita (la 69)."
 
 #. Type: string
@@ -117,3 +117,11 @@ msgstr ""
 "Opzioni all'infuori di quella, raccomandata, «--secure» sono raramente "
 "necessarie e solo per situazioni particolari. In caso di dubbio, lasciare il "
 "valore predefinito."
+
+#~ msgid ""
+#~ "By default, the TFTP server listens to port 69 on all addresses and all "
+#~ "interfaces (0.0.0.0:69). If no port is specified, it defaults to 69."
+#~ msgstr ""
+#~ "In modo predefinito il server TFTP si pone in ascolto sulla posta 69 su "
+#~ "tutti gli indirizzi e tutte le interfacce (0.0.0.0:69). Se non viene "
+#~ "specificata alcuna porta viene utilizzata quella predefinita (la 69)."
diff --git a/debian/po/ja.po b/debian/po/ja.po
index c59569c..c479434 100644
--- a/debian/po/ja.po
+++ b/debian/po/ja.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: tftp-hpa 5.0-14\n"
 "Report-Msgid-Bugs-To: [e-mail]\n"
-"POT-Creation-Date: 2009-11-10 11:05+0100\n"
+"POT-Creation-Date: 2014-10-28 10:26+0100\n"
 "PO-Revision-Date: 2010-05-04 07:21+0200\n"
 "Last-Translator: Hideki Yamane (Debian-JP) <[e-mail]>\n"
 "Language-Team: Japanese <[e-mail]>\n"
@@ -72,11 +72,11 @@ msgstr ""
 #: ../tftpd-hpa.templates:3001
 msgid ""
 "By default, the TFTP server listens to port 69 on all addresses and all "
-"interfaces (0.0.0.0:69). If no port is specified, it defaults to 69."
+"interfaces ([::]:69). If no port is specified, it defaults to 69."
 msgstr ""
 "デフォルトでは、TFTP サーバは全てのアドレス上の69番ポートと、全てのインター"
-"フェイス上で listen します (0.0.0.0:69)。ポートが指定されない場合は、デフォル"
-"ト値は 69 です。"
+"フェイス上で listen します ([::]:69)。ポートが指定されない場合は、デフォルト"
+"値は 69 です。"
 
 #. Type: string
 #. Description
@@ -115,3 +115,11 @@ msgstr ""
 "推奨されている '--secure' 以外のオプションが必要なことは稀で、特定の状況にの"
 "み必要とされます。良く分からない場合は、推奨であるデフォルト値のままにしてお"
 "いてください。"
+
+#~ msgid ""
+#~ "By default, the TFTP server listens to port 69 on all addresses and all "
+#~ "interfaces (0.0.0.0:69). If no port is specified, it defaults to 69."
+#~ msgstr ""
+#~ "デフォルトでは、TFTP サーバは全てのアドレス上の69番ポートと、全てのイン"
+#~ "ターフェイス上で listen します (0.0.0.0:69)。ポートが指定されない場合は、"
+#~ "デフォルト値は 69 です。"
diff --git a/debian/po/nl.po b/debian/po/nl.po
index 808c1ae..118bfbd 100644
--- a/debian/po/nl.po
+++ b/debian/po/nl.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: tftp-hpa 5.2\n"
 "Report-Msgid-Bugs-To: [e-mail]\n"
-"POT-Creation-Date: 2009-11-10 11:05+0100\n"
+"POT-Creation-Date: 2014-10-28 10:26+0100\n"
 "PO-Revision-Date: 2012-01-12 14:42+0100\n"
 "Last-Translator: Jeroen Schot <[e-mail]>\n"
 "Language-Team: Debian l10n Dutch <[e-mail]>\n"
@@ -72,10 +72,10 @@ msgstr ""
 #: ../tftpd-hpa.templates:3001
 msgid ""
 "By default, the TFTP server listens to port 69 on all addresses and all "
-"interfaces (0.0.0.0:69). If no port is specified, it defaults to 69."
+"interfaces ([::]:69). If no port is specified, it defaults to 69."
 msgstr ""
 "Standaard luistert de TFTP-server op poort 69 van alle adressen en "
-"interfaces (0.0.0.0:69). Als u geen poort opgeeft, zal de standaardwaarde 69 "
+"interfaces ([::]:69). Als u geen poort opgeeft, zal de standaardwaarde 69 "
 "worden gebruikt."
 
 #. Type: string
@@ -116,3 +116,11 @@ msgstr ""
 "Andere opties dan de aanbevolen '--secure' zijn zelden nodig en alleen voor "
 "speciale omstandigheden. Als u twijfelt, laat dit dan op de aanbevolen "
 "standaard waarde."
+
+#~ msgid ""
+#~ "By default, the TFTP server listens to port 69 on all addresses and all "
+#~ "interfaces (0.0.0.0:69). If no port is specified, it defaults to 69."
+#~ msgstr ""
+#~ "Standaard luistert de TFTP-server op poort 69 van alle adressen en "
+#~ "interfaces (0.0.0.0:69). Als u geen poort opgeeft, zal de standaardwaarde "
+#~ "69 worden gebruikt."
diff --git a/debian/po/pt.po b/debian/po/pt.po
index d2897c1..afd0c95 100644
--- a/debian/po/pt.po
+++ b/debian/po/pt.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: tftp-hpa 5.0-14\n"
 "Report-Msgid-Bugs-To: [e-mail]\n"
-"POT-Creation-Date: 2009-11-10 11:05+0100\n"
+"POT-Creation-Date: 2014-10-28 10:26+0100\n"
 "PO-Revision-Date: 2009-11-14 01:07+0000\n"
 "Last-Translator: Américo Monteiro <[e-mail]>\n"
 "Language-Team: Portuguese <[e-mail]>\n"
@@ -75,11 +75,11 @@ msgstr ""
 #: ../tftpd-hpa.templates:3001
 msgid ""
 "By default, the TFTP server listens to port 69 on all addresses and all "
-"interfaces (0.0.0.0:69). If no port is specified, it defaults to 69."
+"interfaces ([::]:69). If no port is specified, it defaults to 69."
 msgstr ""
 "Por predefinição, o servidor TFTP escuta no porto 69 em todos os endereços e "
-"todas as interfaces (0.0.0.0:69). Se nenhum porto for especificado, será "
-"usado o 69."
+"todas as interfaces ([::]:69). Se nenhum porto for especificado, será usado "
+"o 69."
 
 #. Type: string
 #. Description
@@ -120,3 +120,11 @@ msgstr ""
 "Opções além da recomendada '--secure' são raramente necessárias e apenas "
 "para situações especiais. Em caso de dúvidas, deixe no valor predefinido e "
 "recomendado."
+
+#~ msgid ""
+#~ "By default, the TFTP server listens to port 69 on all addresses and all "
+#~ "interfaces (0.0.0.0:69). If no port is specified, it defaults to 69."
+#~ msgstr ""
+#~ "Por predefinição, o servidor TFTP escuta no porto 69 em todos os "
+#~ "endereços e todas as interfaces (0.0.0.0:69). Se nenhum porto for "
+#~ "especificado, será usado o 69."
diff --git a/debian/po/pt_BR.po b/debian/po/pt_BR.po
index e1bf650..89b8405 100644
--- a/debian/po/pt_BR.po
+++ b/debian/po/pt_BR.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: tftp-hpa 5.0-22\n"
 "Report-Msgid-Bugs-To: [e-mail]\n"
-"POT-Creation-Date: 2009-11-10 11:05+0100\n"
+"POT-Creation-Date: 2014-10-28 10:26+0100\n"
 "PO-Revision-Date: 2011-06-04 15:25-0300\n"
 "Last-Translator: Flamarion Jorge <[e-mail]>\n"
 "Language-Team: Brazilian Portuguese <[e-mail]."
@@ -76,10 +76,10 @@ msgstr ""
 #: ../tftpd-hpa.templates:3001
 msgid ""
 "By default, the TFTP server listens to port 69 on all addresses and all "
-"interfaces (0.0.0.0:69). If no port is specified, it defaults to 69."
+"interfaces ([::]:69). If no port is specified, it defaults to 69."
 msgstr ""
 "Por padrão, o servidor TFTP escuta na porta 69 em todos os endereços de "
-"todas as interfaces (0.0.0.0:69). Se a porta não for especificada, o padrão "
+"todas as interfaces ([::]:69). Se a porta não for especificada, o padrão "
 "será a 69."
 
 #. Type: string
@@ -120,3 +120,11 @@ msgstr ""
 "Outras opções além da recomendada '--secure' raramente são necessárias e "
 "somente em situações especiais. Se não tiver certeza, é recomendado deixar o "
 "valor padrão."
+
+#~ msgid ""
+#~ "By default, the TFTP server listens to port 69 on all addresses and all "
+#~ "interfaces (0.0.0.0:69). If no port is specified, it defaults to 69."
+#~ msgstr ""
+#~ "Por padrão, o servidor TFTP escuta na porta 69 em todos os endereços de "
+#~ "todas as interfaces (0.0.0.0:69). Se a porta não for especificada, o "
+#~ "padrão será a 69."
diff --git a/debian/po/ru.po b/debian/po/ru.po
index add2fea..494e977 100644
--- a/debian/po/ru.po
+++ b/debian/po/ru.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: tftp-hpa 5.0-14\n"
 "Report-Msgid-Bugs-To: [e-mail]\n"
-"POT-Creation-Date: 2009-11-10 11:05+0100\n"
+"POT-Creation-Date: 2014-10-28 10:26+0100\n"
 "PO-Revision-Date: 2009-12-30 19:18+0300\n"
 "Last-Translator: Yuri Kozlov <[e-mail]>\n"
 "Language-Team: Russian <[e-mail]>\n"
@@ -76,10 +76,10 @@ msgstr "Укажите прослушиваемый адрес и порт в в
 #: ../tftpd-hpa.templates:3001
 msgid ""
 "By default, the TFTP server listens to port 69 on all addresses and all "
-"interfaces (0.0.0.0:69). If no port is specified, it defaults to 69."
+"interfaces ([::]:69). If no port is specified, it defaults to 69."
 msgstr ""
 "По умолчанию, сервер TFTP прослушивает порт 69 на всех адресах и интерфейсах "
-"(0.0.0.0:69). Если порт не указан, то по умолчанию используется 69."
+"([::]:69). Если порт не указан, то по умолчанию используется 69."
 
 #. Type: string
 #. Description
@@ -118,3 +118,11 @@ msgstr ""
 "Кроме рекомендуемого параметра '--secure' все остальные используются редко и "
 "в определённых ситуациях. Если не уверены, оставьте рекомендуемое значение "
 "по умолчанию."
+
+#~ msgid ""
+#~ "By default, the TFTP server listens to port 69 on all addresses and all "
+#~ "interfaces (0.0.0.0:69). If no port is specified, it defaults to 69."
+#~ msgstr ""
+#~ "По умолчанию, сервер TFTP прослушивает порт 69 на всех адресах и "
+#~ "интерфейсах (0.0.0.0:69). Если порт не указан, то по умолчанию "
+#~ "используется 69."
diff --git a/debian/po/sk.po b/debian/po/sk.po
index eddb74a..167e260 100644
--- a/debian/po/sk.po
+++ b/debian/po/sk.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: tftp-hpa 5.2-4\n"
 "Report-Msgid-Bugs-To: [e-mail]\n"
-"POT-Creation-Date: 2009-11-10 11:05+0100\n"
+"POT-Creation-Date: 2014-10-28 10:26+0100\n"
 "PO-Revision-Date: 2013-03-28 19:21+0100\n"
 "Last-Translator: Slavko <[e-mail]>\n"
 "Language-Team: slovenčina <[e-mail]>\n"
@@ -70,9 +70,13 @@ msgstr "Prosím, zadajte adresu a port načúvania vo forme [adresa][:port]."
 #. Type: string
 #. Description
 #: ../tftpd-hpa.templates:3001
+#, fuzzy
+#| msgid ""
+#| "By default, the TFTP server listens to port 69 on all addresses and all "
+#| "interfaces (0.0.0.0:69). If no port is specified, it defaults to 69."
 msgid ""
 "By default, the TFTP server listens to port 69 on all addresses and all "
-"interfaces (0.0.0.0:69). If no port is specified, it defaults to 69."
+"interfaces ([::]:69). If no port is specified, it defaults to 69."
 msgstr ""
 "Predvolene server TFTP načúva na porte 69 na všetkých adresách a všetkých "
 "rozhraniach (0.0.0.0:69). Ak nie je zadaný port, je predvolene použitý port "
diff --git a/debian/po/sv.po b/debian/po/sv.po
index 52fb032..261cbcc 100644
--- a/debian/po/sv.po
+++ b/debian/po/sv.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: tftp-hpa 5.0-14\n"
 "Report-Msgid-Bugs-To: [e-mail]\n"
-"POT-Creation-Date: 2009-11-10 11:05+0100\n"
+"POT-Creation-Date: 2014-10-28 10:26+0100\n"
 "PO-Revision-Date: 2009-11-16 23:01+0100\n"
 "Last-Translator: Martin Bagge <[e-mail]>\n"
 "Language-Team: swedish <[e-mail]>\n"
@@ -70,11 +70,11 @@ msgstr ""
 #: ../tftpd-hpa.templates:3001
 msgid ""
 "By default, the TFTP server listens to port 69 on all addresses and all "
-"interfaces (0.0.0.0:69). If no port is specified, it defaults to 69."
+"interfaces ([::]:69). If no port is specified, it defaults to 69."
 msgstr ""
 "Standardvärdet är att TFTP-servern lyssnar på port 69 på alla adress och "
-"alla gränssnitt (0.0.0.0:69). Om ingen port anges kommer standardporten 69 "
-"att användas."
+"alla gränssnitt ([::]:69). Om ingen port anges kommer standardporten 69 att "
+"användas."
 
 #. Type: string
 #. Description
@@ -113,3 +113,11 @@ msgstr ""
 "Särskilda inställningar utöver den rekomenderade \"--secure\" används nästan "
 "aldrig och kräver vanligen mycket speciella omständigheter. Använd de "
 "rekomenderade inställningarna om du är osäker."
+
+#~ msgid ""
+#~ "By default, the TFTP server listens to port 69 on all addresses and all "
+#~ "interfaces (0.0.0.0:69). If no port is specified, it defaults to 69."
+#~ msgstr ""
+#~ "Standardvärdet är att TFTP-servern lyssnar på port 69 på alla adress och "
+#~ "alla gränssnitt (0.0.0.0:69). Om ingen port anges kommer standardporten "
+#~ "69 att användas."
diff --git a/debian/po/templates.pot b/debian/po/templates.pot
index e944d6f..e5e2603 100644
--- a/debian/po/templates.pot
+++ b/debian/po/templates.pot
@@ -6,12 +6,13 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: tftp-hpa VERSION\n"
+"Project-Id-Version: tftp-hpa\n"
 "Report-Msgid-Bugs-To: [e-mail]\n"
-"POT-Creation-Date: 2009-11-10 11:05+0100\n"
+"POT-Creation-Date: 2014-10-28 10:26+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[e-mail]>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -68,7 +69,7 @@ msgstr ""
 #: ../tftpd-hpa.templates:3001
 msgid ""
 "By default, the TFTP server listens to port 69 on all addresses and all "
-"interfaces (0.0.0.0:69). If no port is specified, it defaults to 69."
+"interfaces ([::]:69). If no port is specified, it defaults to 69."
 msgstr ""
 
 #. Type: string
diff --git a/debian/po/zh_CN.po b/debian/po/zh_CN.po
index b273995..e4a175a 100644
--- a/debian/po/zh_CN.po
+++ b/debian/po/zh_CN.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: tftp-hpa 5.0-14\n"
 "Report-Msgid-Bugs-To: [e-mail]\n"
-"POT-Creation-Date: 2009-11-10 11:05+0100\n"
+"POT-Creation-Date: 2014-10-28 10:26+0100\n"
 "PO-Revision-Date: 2009-03-26 16:48+0800\n"
 "Last-Translator: Deng Xiyue <[e-mail]>\n"
 "Language-Team: Debian Chinese GB <[e-mail]>\n"
@@ -69,7 +69,7 @@ msgstr ""
 #: ../tftpd-hpa.templates:3001
 msgid ""
 "By default, the TFTP server listens to port 69 on all addresses and all "
-"interfaces (0.0.0.0:69). If no port is specified, it defaults to 69."
+"interfaces ([::]:69). If no port is specified, it defaults to 69."
 msgstr ""
 
 #. Type: string
diff --git a/debian/tftpd-hpa.config b/debian/tftpd-hpa.config
index 89bbcb1..b1486c7 100644
--- a/debian/tftpd-hpa.config
+++ b/debian/tftpd-hpa.config
@@ -10,6 +10,12 @@ if [ -e "${CONFFILE}" ]
 then
 	. ${CONFFILE} || true
 
+	# Move from IPv4-only to dual-stack
+	if [ "${TFTP_ADDRESS}" = "0.0.0.0:69" ] && \
+        dpkg --compare-versions $2 lt 5.2-7ubuntu3; then
+		TFTP_ADDRESS="[::]:69"
+	fi
+
 	db_set tftpd-hpa/username "${TFTP_USERNAME}"
 	db_set tftpd-hpa/directory "${TFTP_DIRECTORY}"
 	db_set tftpd-hpa/address "${TFTP_ADDRESS}"
diff --git a/debian/tftpd-hpa.postinst b/debian/tftpd-hpa.postinst
index 845ac8b..3f4e2db 100644
--- a/debian/tftpd-hpa.postinst
+++ b/debian/tftpd-hpa.postinst
@@ -15,7 +15,7 @@ case "${1}" in
 		TFTP_DIRECTORY="${RET:-/srv/tftp}"
 
 		db_get tftpd-hpa/address
-		TFTP_ADDRESS="${RET:-0.0.0.0:69}"
+		TFTP_ADDRESS="${RET:-[::]:69}"
 
 		db_get tftpd-hpa/options
 		TFTP_OPTIONS="${RET}" # is ok when empty
@@ -31,7 +31,7 @@ cat > "${CONFFILE}" << EOF
 TFTP_USERNAME="${TFTP_USERNAME}"
 TFTP_DIRECTORY="${TFTP_DIRECTORY}"
 TFTP_ADDRESS="${TFTP_ADDRESS}"
-TFTP_OPTIONS="${TFTP_OPTIONS}"
+TFTP_OPTIONS="${TFTP_OPTIONS} -s"
 EOF
 		fi
 
diff --git a/debian/tftpd-hpa.templates b/debian/tftpd-hpa.templates
index 3df810a..643be89 100644
--- a/debian/tftpd-hpa.templates
+++ b/debian/tftpd-hpa.templates
@@ -10,20 +10,20 @@ _Description: Dedicated system account for the tftpd-hpa TFTP daemon:
 
 Template: tftpd-hpa/directory
 Type: string
-Default: /srv/tftp
+Default: /var/lib/tftpboot
 _Description: TFTP root directory:
  Please specify the directory that will be used as root for the
  TFTP server.
 
 Template: tftpd-hpa/address
 Type: string
-Default: 0.0.0.0:69
+Default: [::]:69
 _Description: TFTP server address and port:
  Please specify an address and port to listen to in the form of
  [address][:port].
  .
  By default, the TFTP server listens to port 69 on all addresses and all
- interfaces (0.0.0.0:69). If no port is specified, it defaults to 69.
+ interfaces ([::]:69). If no port is specified, it defaults to 69.
  .
  Please note that numeric IPv6 addresses must be enclosed in square brackets
  to avoid ambiguity with the optional port information.