Merge ~smoser/ubuntu/+source/tftp-hpa:merge into ~ubuntu-server-dev/ubuntu/+source/tftp-hpa:master
- Git
- lp:~smoser/ubuntu/+source/tftp-hpa
- merge
- Merge into master
Proposed by
Scott Moser
Status: | Merged |
---|---|
Merged at revision: | 2727a8f6752a3a961a237a417b96b14d447e2102 |
Proposed branch: | ~smoser/ubuntu/+source/tftp-hpa:merge |
Merge into: | ~ubuntu-server-dev/ubuntu/+source/tftp-hpa:master |
Diff against target: |
1045 lines (+411/-57) 22 files modified
debian/changelog (+247/-0) debian/control (+2/-1) debian/po/cs.po (+11/-3) debian/po/da.po (+10/-3) debian/po/de.po (+11/-3) debian/po/es.po (+12/-4) debian/po/fi.po (+2/-2) debian/po/fr.po (+11/-3) debian/po/gl.po (+2/-2) debian/po/it.po (+11/-3) debian/po/ja.po (+12/-4) debian/po/nl.po (+11/-3) debian/po/pt.po (+12/-4) debian/po/pt_BR.po (+11/-3) debian/po/ru.po (+11/-3) debian/po/sk.po (+6/-2) debian/po/sv.po (+12/-4) debian/po/templates.pot (+4/-3) debian/po/zh_CN.po (+2/-2) debian/tftpd-hpa.config (+6/-0) debian/tftpd-hpa.postinst (+2/-2) debian/tftpd-hpa.templates (+3/-3) |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Kick In | Pending | ||
Robie Basak | Pending | ||
Review via email: mp+284751@code.launchpad.net |
Commit message
Description of the change
To post a comment you must log in.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1 | diff --git a/debian/changelog b/debian/changelog |
2 | index 3b02321..57fb95c 100644 |
3 | --- a/debian/changelog |
4 | +++ b/debian/changelog |
5 | @@ -1,3 +1,13 @@ |
6 | +tftp-hpa (5.2+20150808-1ubuntu1) UNRELEASED; urgency=medium |
7 | + |
8 | + * Merge from Debian unstable. Remaining changes: |
9 | + - debian/tftpd-hpa.templates: Set /var/lib/tftpboot by default instead |
10 | + of /srv/tftp. |
11 | + - Default to listening on both IPv4 and IPv6. |
12 | + - debian/tftpd-hpa.postinst: Add "-s" to /etc/default/tftpd-hpa |
13 | + |
14 | + -- Scott Moser <smoser@brickies.net> Tue, 02 Feb 2016 16:29:36 +0100 |
15 | + |
16 | tftp-hpa (5.2+20150808-1) unstable; urgency=medium |
17 | |
18 | * Canonicalize all the addresses. This avoids the situation of trying to |
19 | @@ -8,6 +18,17 @@ tftp-hpa (5.2+20150808-1) unstable; urgency=medium |
20 | |
21 | -- Ron Lee <ron@debian.org> Sat, 08 Aug 2015 13:59:11 +0930 |
22 | |
23 | +tftp-hpa (5.2+20140608-3ubuntu1) vivid; urgency=low |
24 | + |
25 | + * Merge from Debian unstable. Remaining changes: |
26 | + - debian/tftpd-hpa.templates: Set /var/lib/tftpboot by default instead of |
27 | + /srv/tftp. |
28 | + - debian/tftpd-hpa.upstart: Convert to Upstart. |
29 | + - debian/tftpd-hpa.postinst: Add "-s" to /etc/default/tftpd-hpa |
30 | + - Default to listening on both IPv4 and IPv6. (LP: #1228340) |
31 | + |
32 | + -- Michael Vogt <michael.vogt@ubuntu.com> Tue, 28 Oct 2014 10:26:04 +0100 |
33 | + |
34 | tftp-hpa (5.2+20140608-3) unstable; urgency=medium |
35 | |
36 | * Fix the Vcs- links to alioth. |
37 | @@ -41,6 +62,17 @@ tftp-hpa (5.2-20) unstable; urgency=low |
38 | |
39 | -- Daniel Baumann <mail@daniel-baumann.ch> Fri, 25 Jul 2014 20:57:28 +0200 |
40 | |
41 | +tftp-hpa (5.2-19ubuntu1) utopic; urgency=medium |
42 | + |
43 | + * Merge from Debian unstable. Remaining changes: |
44 | + - debian/tftpd-hpa.templates: Set /var/lib/tftpboot by default instead of |
45 | + /srv/tftp. |
46 | + - debian/tftpd-hpa.upstart: Convert to Upstart. |
47 | + - debian/tftpd-hpa.postinst: Add "-s" to /etc/default/tftpd-hpa |
48 | + - Default to listening on both IPv4 and IPv6. (LP: #1228340) |
49 | + |
50 | + -- Stéphane Graber <stgraber@ubuntu.com> Fri, 02 May 2014 16:28:04 -0400 |
51 | + |
52 | tftp-hpa (5.2-19) unstable; urgency=low |
53 | |
54 | * Introducing initial support for upstart as wished by Steve Langasek |
55 | @@ -48,6 +80,18 @@ tftp-hpa (5.2-19) unstable; urgency=low |
56 | |
57 | -- Daniel Baumann <mail@daniel-baumann.ch> Sun, 04 May 2014 15:16:55 +0200 |
58 | |
59 | +tftp-hpa (5.2-18ubuntu1) utopic; urgency=medium |
60 | + |
61 | + * Merge from Debian unstable. Remaining changes: |
62 | + - debian/tftpd-hpa.templates: Set /var/lib/tftpboot by default instead of |
63 | + /srv/tftp. |
64 | + - debian/tftpd-hpa.upstart: Convert to Upstart. |
65 | + - debian/tftpd-hpa.postinst: Add "-s" to /etc/default/tftpd-hpa |
66 | + - Default to listening on both IPv4 and IPv6. (LP: #1228340) |
67 | + * Reintroduce the Upstart integration. |
68 | + |
69 | + -- Stéphane Graber <stgraber@ubuntu.com> Fri, 02 May 2014 16:28:04 -0400 |
70 | + |
71 | tftp-hpa (5.2-18) unstable; urgency=low |
72 | |
73 | * Updating year in copyright file. |
74 | @@ -132,6 +176,33 @@ tftp-hpa (5.2-8) experimental; urgency=low |
75 | |
76 | -- Daniel Baumann <mail@daniel-baumann.ch> Sun, 31 Mar 2013 16:54:07 +0200 |
77 | |
78 | +tftp-hpa (5.2-7ubuntu3) saucy; urgency=low |
79 | + |
80 | + * Default to listening on both IPv4 and IPv6. (LP: #1228340) |
81 | + |
82 | + -- Stéphane Graber <stgraber@ubuntu.com> Fri, 20 Sep 2013 14:40:13 -0500 |
83 | + |
84 | +tftp-hpa (5.2-7ubuntu2) saucy; urgency=low |
85 | + |
86 | + * Update the upstart job to use the same pre-start checks as the init |
87 | + script. |
88 | + |
89 | + -- Steve Langasek <steve.langasek@ubuntu.com> Wed, 29 May 2013 16:21:28 -0700 |
90 | + |
91 | +tftp-hpa (5.2-7ubuntu1) saucy; urgency=low |
92 | + |
93 | + * Merge from Debian unstable, remaining changes: |
94 | + - debian/tftpd-hpa.templates: Set /var/lib/tftpboot by default instead of |
95 | + /srv/tftp. |
96 | + - debian/tftpd-hpa.upstart: Convert to Upstart. |
97 | + - debian/patches/04-use-memcpy-for-header.patch: Fix FORTIFY-detected |
98 | + potential memory corruption. |
99 | + - debian/tftpd-hpa.postinst: Add "-s" to /etc/default/tftpd-hpa |
100 | + * Adjust tftpd-hpa init script to detect upstart, making the upstart |
101 | + patches upstreamable to Debian. |
102 | + |
103 | + -- Steve Langasek <steve.langasek@ubuntu.com> Sat, 18 May 2013 22:07:57 -0700 |
104 | + |
105 | tftp-hpa (5.2-7) unstable; urgency=low |
106 | |
107 | * Removing all references to my old email address. |
108 | @@ -144,6 +215,18 @@ tftp-hpa (5.2-6) unstable; urgency=low |
109 | |
110 | -- Daniel Baumann <mail@daniel-baumann.ch> Sun, 10 Mar 2013 21:52:27 +0100 |
111 | |
112 | +tftp-hpa (5.2-5ubuntu1) raring; urgency=low |
113 | + |
114 | + * Merge from Debian unstable. Remaining changes: |
115 | + - debian/tftpd-hpa.templates: Set /var/lib/tftpboot by default instead of |
116 | + /srv/tftp. |
117 | + - debian/tftpd-hpa.upstart: Convert to Upstart. |
118 | + - debian/patches/04-use-memcpy-for-header.patch: Fix FORTIFY-detected |
119 | + potential memory corruption. |
120 | + - debian/tftpd-hpa.postinst: Add "-s" to /etc/default/tftpd-hpa |
121 | + |
122 | + -- Logan Rosen <logatronico@gmail.com> Sun, 06 Jan 2013 01:01:24 -0600 |
123 | + |
124 | tftp-hpa (5.2-5) unstable; urgency=low |
125 | |
126 | * Correcting spelling typo in readme, thanks to Adam D. Barratt <adam |
127 | @@ -153,6 +236,17 @@ tftp-hpa (5.2-5) unstable; urgency=low |
128 | |
129 | -- Daniel Baumann <mail@daniel-baumann.ch> Sun, 16 Dec 2012 10:46:51 +0100 |
130 | |
131 | +tftp-hpa (5.2-4ubuntu1) raring; urgency=low |
132 | + |
133 | + * Resynchronise with Debian. Remaining changes: |
134 | + - Set /var/lib/tftpboot by default instead of /srv/tftp. |
135 | + - Decrease priority of tftp path from high to low. |
136 | + - debian/rules, debian/tftpd-hpa.upstart: Convert to Upstart. |
137 | + - debian/patches/04-use-memcpy-for-header.patch: Fix FORTIFY-detected |
138 | + potential memory corruption. |
139 | + |
140 | + -- Colin Watson <cjwatson@ubuntu.com> Wed, 28 Nov 2012 02:26:08 +0000 |
141 | + |
142 | tftp-hpa (5.2-4) unstable; urgency=low |
143 | |
144 | * Adding note to readme about ipv6 kernel support (Closes: #544089). |
145 | @@ -177,6 +271,23 @@ tftp-hpa (5.2-2) unstable; urgency=low |
146 | |
147 | -- Daniel Baumann <mail@daniel-baumann.ch> Wed, 14 Mar 2012 07:59:35 +0100 |
148 | |
149 | +tftp-hpa (5.2-1ubuntu2) quantal; urgency=low |
150 | + |
151 | + * Rebuild for new armel compiler default of ARMv5t. |
152 | + |
153 | + -- Colin Watson <cjwatson@ubuntu.com> Mon, 08 Oct 2012 23:01:31 +0100 |
154 | + |
155 | +tftp-hpa (5.2-1ubuntu1) precise; urgency=low |
156 | + |
157 | + * Merge from Debian testing. Remaining changes: |
158 | + - Set /var/lib/tftpboot by default instead of /srv/tftp. |
159 | + - Decrease priority of tftp path from high to low. |
160 | + - debian/rules, debain/tftpd-hpa.upstart: Convert to usptart (LP: #522509) |
161 | + - debian/patches/04-use-memcpy-for-header.patch: fix FORTIFY-detected |
162 | + potential memory corruption (LP: #691345) |
163 | + |
164 | + -- Chuck Short <zulcss@ubuntu.com> Mon, 23 Jan 2012 09:24:51 -0500 |
165 | + |
166 | tftp-hpa (5.2-1) unstable; urgency=low |
167 | |
168 | * Using compression level 9 also for binary packages. |
169 | @@ -185,6 +296,30 @@ tftp-hpa (5.2-1) unstable; urgency=low |
170 | |
171 | -- Daniel Baumann <mail@daniel-baumann.ch> Fri, 23 Dec 2011 15:10:17 +0100 |
172 | |
173 | +tftp-hpa (5.1-3ubuntu3) precise; urgency=low |
174 | + |
175 | + * debian/tftpd-hpa.upstart: Fix typo. (LP: #911135) |
176 | + |
177 | + -- Chuck Short <zulcss@ubuntu.com> Tue, 03 Jan 2012 08:18:01 -0500 |
178 | + |
179 | +tftp-hpa (5.1-3ubuntu2) precise; urgency=low |
180 | + |
181 | + * debian/tftpd-hpa.upstart: Fix runlevel transition. |
182 | + (LP: #820698) |
183 | + |
184 | + -- Chuck Short <zulcss@ubuntu.com> Mon, 02 Jan 2012 10:20:29 -0500 |
185 | + |
186 | +tftp-hpa (5.1-3ubuntu1) precise; urgency=low |
187 | + |
188 | + * Merge from debian unstable. Remaining changes: |
189 | + - Set /var/lib/tftpboot by default instead of /srv/tftp. |
190 | + - Decrease priority of tftp path from high to low. |
191 | + - debian/rules, debain/tftpd-hpa.upstart: Convert to usptart (LP: #522509) |
192 | + - debian/patches/04-use-memcpy-for-header.patch: fix FORTIFY-detected |
193 | + potential memory corruption (LP: #6913 |
194 | + |
195 | + -- Chuck Short <zulcss@ubuntu.com> Mon, 17 Oct 2011 18:54:29 +0000 |
196 | + |
197 | tftp-hpa (5.1-3) unstable; urgency=low |
198 | |
199 | * Adding Brazilian Portuguese debconf translations from Flamarion |
200 | @@ -192,6 +327,17 @@ tftp-hpa (5.1-3) unstable; urgency=low |
201 | |
202 | -- Daniel Baumann <mail@daniel-baumann.ch> Wed, 28 Sep 2011 13:52:46 +0200 |
203 | |
204 | +tftp-hpa (5.1-2ubuntu1) oneiric; urgency=low |
205 | + |
206 | + * Merge from debian unstable (LP: #842585). Remaining changes: |
207 | + - Set /var/lib/tftpboot by default instead of /srv/tftp. |
208 | + - Decrease priority of tftp path from high to low. |
209 | + - debian/rules, debain/tftpd-hpa.upstart: Convert to usptart (LP: #522509) |
210 | + - debian/patches/04-use-memcpy-for-header.patch: fix FORTIFY-detected |
211 | + potential memory corruption (LP: #691345) |
212 | + |
213 | + -- Mahyuddin Susanto <udienz@ubuntu.com> Tue, 06 Sep 2011 18:55:40 +0700 |
214 | + |
215 | tftp-hpa (5.1-2) unstable; urgency=low |
216 | |
217 | * Applying patch from Chris Lamb <lamby@debian.org> to correct wrong |
218 | @@ -200,6 +346,17 @@ tftp-hpa (5.1-2) unstable; urgency=low |
219 | |
220 | -- Daniel Baumann <mail@daniel-baumann.ch> Sun, 07 Aug 2011 16:43:58 +0200 |
221 | |
222 | +tftp-hpa (5.1-1ubuntu1) oneiric; urgency=low |
223 | + |
224 | + * Merge from debian unstable. Remaining changes: |
225 | + - Set /var/lib/tftpboot by default instead of /srv/tftp. |
226 | + - Decrease priority of tftp path from high to low. |
227 | + - debian/rules, debain/tftpd-hpa.upstart: Convert to usptart (LP: #522509) |
228 | + - debian/patches/04-use-memcpy-for-header.patch: fix FORTIFY-detected |
229 | + potential memory corruption (LP: #691345) |
230 | + |
231 | + -- Chuck Short <zulcss@ubuntu.com> Mon, 11 Jul 2011 18:51:12 +0100 |
232 | + |
233 | tftp-hpa (5.1-1) unstable; urgency=low |
234 | |
235 | * Updating standards version to 3.9.2. |
236 | @@ -211,6 +368,17 @@ tftp-hpa (5.1-1) unstable; urgency=low |
237 | |
238 | -- Daniel Baumann <mail@daniel-baumann.ch> Sun, 10 Jul 2011 17:18:58 +0200 |
239 | |
240 | +tftp-hpa (5.0-22ubuntu1) oneiric; urgency=low |
241 | + |
242 | + * Merge from debian unstable. Remaining changes: |
243 | + - Set /var/lib/tftpboot by default instead of /srv/tftp. |
244 | + - Decrease priority of tftp path from high to low. |
245 | + - debian/rules, debain/tftpd-hpa.upstart: Convert to usptart (LP: #522509) |
246 | + - debian/patches/04-use-memcpy-for-header.patch: fix FORTIFY-detected |
247 | + potential memory corruption (LP: #691345). |
248 | + |
249 | + -- Chuck Short <zulcss@ubuntu.com> Wed, 09 Mar 2011 17:36:42 +0000 |
250 | + |
251 | tftp-hpa (5.0-22) unstable; urgency=low |
252 | |
253 | * Adding support for multiple server directories in packaging files |
254 | @@ -221,6 +389,24 @@ tftp-hpa (5.0-22) unstable; urgency=low |
255 | |
256 | -- Daniel Baumann <mail@daniel-baumann.ch> Sun, 20 Feb 2011 00:18:01 +0100 |
257 | |
258 | +tftp-hpa (5.0-21ubuntu2) natty; urgency=low |
259 | + |
260 | + * Clean up debian/patches and re-add dropped patch, |
261 | + 04-use-memcpy-for-header.patch (LP: #727356) |
262 | + |
263 | + -- Chuck Short <zulcss@ubuntu.com> Tue, 01 Mar 2011 14:24:12 -0500 |
264 | + |
265 | +tftp-hpa (5.0-21ubuntu1) natty; urgency=low |
266 | + |
267 | + * Merge from debian unstable. Remaining changes: |
268 | + - Set /var/lib/tftpboot by default instead of /srv/tftp. |
269 | + - Decrease priority of tftp path from high to low. |
270 | + - debian/rules, debian/tftpd-hpa.upstart: Convert to upstart (LP: #522509) |
271 | + - debian/patches/04-use-memcpy-for-header.patch: fix FORTIFY-detected |
272 | + potential memory corruption (LP: #691345). |
273 | + |
274 | + -- Chuck Short <zulcss@ubuntu.com> Mon, 07 Feb 2011 06:07:31 +0000 |
275 | + |
276 | tftp-hpa (5.0-21) unstable; urgency=low |
277 | |
278 | * Updating maintainer and uploaders fields. |
279 | @@ -248,6 +434,22 @@ tftp-hpa (5.0-19) experimental; urgency=low |
280 | |
281 | -- Daniel Baumann <mail@daniel-baumann.ch> Sun, 19 Dec 2010 21:02:26 +0100 |
282 | |
283 | +tftp-hpa (5.0-18ubuntu2) natty; urgency=low |
284 | + |
285 | + * debian/patches/04-use-memcpy-for-header.patch: fix FORTIFY-detected |
286 | + potential memory corruption (LP: #691345). |
287 | + |
288 | + -- Kees Cook <kees@ubuntu.com> Thu, 16 Dec 2010 17:44:44 -0800 |
289 | + |
290 | +tftp-hpa (5.0-18ubuntu1) natty; urgency=low |
291 | + |
292 | + * Merge from debian unstable. Remaining changes: |
293 | + - Set /var/lib/tftpboot by default instead of /srv/tftp. |
294 | + - Decrease priority of tftp path from high to low. |
295 | + - debian/rules, debian/tftpd-hpa.upstart: Convert to upstart (LP: #522509) |
296 | + |
297 | + -- Chuck Short <zulcss@ubuntu.com> Tue, 07 Dec 2010 08:17:22 +0000 |
298 | + |
299 | tftp-hpa (5.0-18) unstable; urgency=medium |
300 | |
301 | * Making greps for tftp username in postinst more robust. |
302 | @@ -262,6 +464,15 @@ tftp-hpa (5.0-17) experimental; urgency=low |
303 | |
304 | -- Daniel Baumann <mail@daniel-baumann.ch> Sat, 25 Sep 2010 22:38:41 +0200 |
305 | |
306 | +tftp-hpa (5.0-16ubuntu1) natty; urgency=low |
307 | + |
308 | + * Merge from debian unstable. Remaining changes: |
309 | + - Set /var/lib/tftpboot by default instead of /srv/tftp. |
310 | + - Decrease priority of tftp path from hight to low |
311 | + - debian/rules, debian/tftpd-hpa.upstart: Convert to upstart (LP: #522509) |
312 | + |
313 | + -- Chuck Short <zulcss@ubuntu.com> Tue, 12 Oct 2010 12:17:05 +0100 |
314 | + |
315 | tftp-hpa (5.0-16) unstable; urgency=low |
316 | |
317 | * Adding updated debconf translations from Vincenzo Campanella |
318 | @@ -279,6 +490,15 @@ tftp-hpa (5.0-15) unstable; urgency=low |
319 | |
320 | -- Daniel Baumann <mail@daniel-baumann.ch> Thu, 05 Aug 2010 17:13:47 +0200 |
321 | |
322 | +tftp-hpa (5.0-14ubuntu1) maverick; urgency=low |
323 | + |
324 | + * Merge from debian unstable: |
325 | + - Set /var/lib/tftpboot by default instead of /srv/tftp |
326 | + - Decrease priority of tftp path from hight to low |
327 | + - debian/rules, debian/tftpd-hpa.upstart: Convert to upstart (LP: #522509 |
328 | + |
329 | + -- Chuck Short <zulcss@ubuntu.com> Mon, 12 Jul 2010 09:15:56 -0400 |
330 | + |
331 | tftp-hpa (5.0-14) unstable; urgency=medium |
332 | |
333 | * Updating standards version to 3.9.0. |
334 | @@ -288,6 +508,15 @@ tftp-hpa (5.0-14) unstable; urgency=medium |
335 | |
336 | -- Daniel Baumann <mail@daniel-baumann.ch> Sat, 10 Jul 2010 18:16:58 +0200 |
337 | |
338 | +tftp-hpa (5.0-13ubuntu1) maverick; urgency=low |
339 | + |
340 | + * Merge from debian unstable: |
341 | + * Set /var/lib/tftpboot by default instead of /srv/tftp |
342 | + * Decrease priority of tftp path from hight to log |
343 | + * debian/rules, debian/tftpd-hpa.upstart: Convert to upstart (LP: #522509) |
344 | + |
345 | + -- Chuck Short <zulcss@ubuntu.com> Mon, 21 Jun 2010 14:46:15 -0400 |
346 | + |
347 | tftp-hpa (5.0-13) unstable; urgency=low |
348 | |
349 | * Not failing if removal of server directory in postinst isn't |
350 | @@ -310,6 +539,23 @@ tftp-hpa (5.0-12) unstable; urgency=low |
351 | |
352 | -- Daniel Baumann <mail@daniel-baumann.ch> Wed, 07 Apr 2010 09:59:35 +0200 |
353 | |
354 | +tftp-hpa (5.0-11ubuntu2) lucid; urgency=low |
355 | + |
356 | + * debian/rules, debian/tftpd-hpa.upstart: Convert to upstart. |
357 | + (LP: #522509) |
358 | + * debian/tftpd-hpa.postinst: Add "-s" to /etc/default/tftpd-hpa. |
359 | + (LP: #531123) |
360 | + |
361 | + -- Chuck Short <zulcss@ubuntu.com> Thu, 11 Mar 2010 12:40:07 -0500 |
362 | + |
363 | +tftp-hpa (5.0-11ubuntu1) lucid; urgency=low |
364 | + |
365 | + * Revert to pre-Lucid behavior (LP: #518815): |
366 | + * Set /var/lib/tftpboot by default instead of /srv/tftp/ |
367 | + * Decrease priority of tftp path from high to low |
368 | + |
369 | + -- Stéphane Graber <stgraber@ubuntu.com> Wed, 10 Feb 2010 10:05:01 -0500 |
370 | + |
371 | tftp-hpa (5.0-11) unstable; urgency=medium |
372 | |
373 | * Removing explicit LDFLAGS, did apparently not fix the FTBFS on |
374 | @@ -692,3 +938,4 @@ tftp-hpa (0.14-1) unstable; urgency=low |
375 | * Initial Debian release |
376 | |
377 | -- Wichert Akkerman <wakkerma@debian.org> Fri, 17 Nov 2000 10:41:09 +0000 |
378 | + |
379 | diff --git a/debian/control b/debian/control |
380 | index 3c1d7b2..9d5a804 100644 |
381 | --- a/debian/control |
382 | +++ b/debian/control |
383 | @@ -1,7 +1,8 @@ |
384 | Source: tftp-hpa |
385 | Section: net |
386 | Priority: extra |
387 | -Maintainer: Ron Lee <ron@debian.org> |
388 | +Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com> |
389 | +XSBC-Original-Maintainer: Ron Lee <ron@debian.org> |
390 | Build-Depends: debhelper (>= 9), autoconf, autotools-dev, libwrap0-dev, po-debconf |
391 | Standards-Version: 3.9.6.1 |
392 | Homepage: http://git.kernel.org/cgit/network/tftp/tftp-hpa.git |
393 | diff --git a/debian/po/cs.po b/debian/po/cs.po |
394 | index 1789e3d..df3a29d 100644 |
395 | --- a/debian/po/cs.po |
396 | +++ b/debian/po/cs.po |
397 | @@ -6,7 +6,7 @@ msgid "" |
398 | msgstr "" |
399 | "Project-Id-Version: tftp-hpa 5.0-14\n" |
400 | "Report-Msgid-Bugs-To: tftp-hpa@packages.debian.org\n" |
401 | -"POT-Creation-Date: 2009-11-10 11:05+0100\n" |
402 | +"POT-Creation-Date: 2014-10-28 10:26+0100\n" |
403 | "PO-Revision-Date: 2010-07-20 05:54+0200\n" |
404 | "Last-Translator: Vitezslav Kotrla <vitezslav.kotrla@gmail.com>\n" |
405 | "Language-Team: Czech <debian-l10n-czech@lists.debian.org>\n" |
406 | @@ -72,10 +72,10 @@ msgstr "" |
407 | #: ../tftpd-hpa.templates:3001 |
408 | msgid "" |
409 | "By default, the TFTP server listens to port 69 on all addresses and all " |
410 | -"interfaces (0.0.0.0:69). If no port is specified, it defaults to 69." |
411 | +"interfaces ([::]:69). If no port is specified, it defaults to 69." |
412 | msgstr "" |
413 | "Ve výchozím nastavení TFTP server naslouchá na portu 69 na všech adresách a " |
414 | -"všech síťových rozhraních (0.0.0.0:69). Pokud nebude zadán port, použije se " |
415 | +"všech síťových rozhraních ([::]:69). Pokud nebude zadán port, použije se " |
416 | "výchozí hodnota 69." |
417 | |
418 | #. Type: string |
419 | @@ -115,3 +115,11 @@ msgstr "" |
420 | "Jiné volby než doporučované '--secure' nejsou obvykle potřeba a využijete je " |
421 | "pouze ve speciálních situacích. Pokud nevíte, ponechejte doporučenou výchozí " |
422 | "hodnotu." |
423 | + |
424 | +#~ msgid "" |
425 | +#~ "By default, the TFTP server listens to port 69 on all addresses and all " |
426 | +#~ "interfaces (0.0.0.0:69). If no port is specified, it defaults to 69." |
427 | +#~ msgstr "" |
428 | +#~ "Ve výchozím nastavení TFTP server naslouchá na portu 69 na všech adresách " |
429 | +#~ "a všech síťových rozhraních (0.0.0.0:69). Pokud nebude zadán port, " |
430 | +#~ "použije se výchozí hodnota 69." |
431 | diff --git a/debian/po/da.po b/debian/po/da.po |
432 | index fb9cd89..945578b 100644 |
433 | --- a/debian/po/da.po |
434 | +++ b/debian/po/da.po |
435 | @@ -6,7 +6,7 @@ msgid "" |
436 | msgstr "" |
437 | "Project-Id-Version: tftp-hpa\n" |
438 | "Report-Msgid-Bugs-To: tftp-hpa@packages.debian.org\n" |
439 | -"POT-Creation-Date: 2009-11-10 11:05+0100\n" |
440 | +"POT-Creation-Date: 2014-10-28 10:26+0100\n" |
441 | "PO-Revision-Date: 2010-09-25 17:30+01:00\n" |
442 | "Last-Translator: Joe Hansen <joedalton2@yahoo.dk>\n" |
443 | "Language-Team: Danish <debian-l10n-danish@lists.debian.org> \n" |
444 | @@ -71,10 +71,10 @@ msgstr "" |
445 | #: ../tftpd-hpa.templates:3001 |
446 | msgid "" |
447 | "By default, the TFTP server listens to port 69 on all addresses and all " |
448 | -"interfaces (0.0.0.0:69). If no port is specified, it defaults to 69." |
449 | +"interfaces ([::]:69). If no port is specified, it defaults to 69." |
450 | msgstr "" |
451 | "Som standard, lytter TFTP-serveren på port 69 for alle adresser og alle " |
452 | -"grænseflader (0.0.0.0:69). Hvis ingen port er angivet, er standarden 69." |
453 | +"grænseflader ([::]:69). Hvis ingen port er angivet, er standarden 69." |
454 | |
455 | #. Type: string |
456 | #. Description |
457 | @@ -113,3 +113,10 @@ msgid "" |
458 | msgstr "" |
459 | "Tilvalg udover den anbefalede '--secure' er sjældent nødvendigt og kun til " |
460 | "specielle situationer. Hvis usikker, behold den anbefalede standardværdi." |
461 | + |
462 | +#~ msgid "" |
463 | +#~ "By default, the TFTP server listens to port 69 on all addresses and all " |
464 | +#~ "interfaces (0.0.0.0:69). If no port is specified, it defaults to 69." |
465 | +#~ msgstr "" |
466 | +#~ "Som standard, lytter TFTP-serveren på port 69 for alle adresser og alle " |
467 | +#~ "grænseflader (0.0.0.0:69). Hvis ingen port er angivet, er standarden 69." |
468 | diff --git a/debian/po/de.po b/debian/po/de.po |
469 | index 7ede720..879a9a9 100644 |
470 | --- a/debian/po/de.po |
471 | +++ b/debian/po/de.po |
472 | @@ -8,7 +8,7 @@ msgid "" |
473 | msgstr "" |
474 | "Project-Id-Version: tftp-hpa 5.0-14\n" |
475 | "Report-Msgid-Bugs-To: tftp-hpa@packages.debian.org\n" |
476 | -"POT-Creation-Date: 2009-11-10 11:05+0100\n" |
477 | +"POT-Creation-Date: 2014-10-28 10:26+0100\n" |
478 | "PO-Revision-Date: 2010-07-20 05:54+0200\n" |
479 | "Last-Translator: Daniel Baumann <mail@daniel-baumann.ch>\n" |
480 | "Language-Team: none\n" |
481 | @@ -76,10 +76,10 @@ msgstr "" |
482 | #: ../tftpd-hpa.templates:3001 |
483 | msgid "" |
484 | "By default, the TFTP server listens to port 69 on all addresses and all " |
485 | -"interfaces (0.0.0.0:69). If no port is specified, it defaults to 69." |
486 | +"interfaces ([::]:69). If no port is specified, it defaults to 69." |
487 | msgstr "" |
488 | "Standardmässig wartet der TFTP-Server auf Port 69 auf allen Adressen und " |
489 | -"allen Schnittstellen (0.0.0.0:69). Ohne Port-Angabe wird die Vorgabe 69 " |
490 | +"allen Schnittstellen ([::]:69). Ohne Port-Angabe wird die Vorgabe 69 " |
491 | "verwendet." |
492 | |
493 | #. Type: string |
494 | @@ -121,3 +121,11 @@ msgstr "" |
495 | "Andere als die empfohlene Option \"--secure\" werden selten und nur für " |
496 | "besondere Situationen benötigt. Falls Sie sich unsicher sind, belassen Sie " |
497 | "den Vorgabewert." |
498 | + |
499 | +#~ msgid "" |
500 | +#~ "By default, the TFTP server listens to port 69 on all addresses and all " |
501 | +#~ "interfaces (0.0.0.0:69). If no port is specified, it defaults to 69." |
502 | +#~ msgstr "" |
503 | +#~ "Standardmässig wartet der TFTP-Server auf Port 69 auf allen Adressen und " |
504 | +#~ "allen Schnittstellen (0.0.0.0:69). Ohne Port-Angabe wird die Vorgabe 69 " |
505 | +#~ "verwendet." |
506 | diff --git a/debian/po/es.po b/debian/po/es.po |
507 | index 2656588..8c4a247 100644 |
508 | --- a/debian/po/es.po |
509 | +++ b/debian/po/es.po |
510 | @@ -8,7 +8,7 @@ msgid "" |
511 | msgstr "" |
512 | "Project-Id-Version: tftpd-hpa 5.0-14\n" |
513 | "Report-Msgid-Bugs-To: tftp-hpa@packages.debian.org\n" |
514 | -"POT-Creation-Date: 2009-11-10 11:05+0100\n" |
515 | +"POT-Creation-Date: 2014-10-28 10:26+0100\n" |
516 | "PO-Revision-Date: 2010-07-18 10:38+0200\n" |
517 | "Last-Translator: Omar Campagne <ocampagne@gmail.com>\n" |
518 | "Language-Team: Spanish <debian-l10n-spanish@lists.debian.org>\n" |
519 | @@ -76,11 +76,11 @@ msgstr "" |
520 | #: ../tftpd-hpa.templates:3001 |
521 | msgid "" |
522 | "By default, the TFTP server listens to port 69 on all addresses and all " |
523 | -"interfaces (0.0.0.0:69). If no port is specified, it defaults to 69." |
524 | +"interfaces ([::]:69). If no port is specified, it defaults to 69." |
525 | msgstr "" |
526 | "Por omisión, el servidor de TFTP escucha en el puerto 69 de todas las " |
527 | -"direcciones e interfaces (0.0.0.0:69). Si no se especifica un puerto, el " |
528 | -"valor por omisión es 69." |
529 | +"direcciones e interfaces ([::]:69). Si no se especifica un puerto, el valor " |
530 | +"por omisión es 69." |
531 | |
532 | #. Type: string |
533 | #. Description |
534 | @@ -120,3 +120,11 @@ msgstr "" |
535 | "Rara vez, y sólo en situaciones especiales, necesitará otras opciones más " |
536 | "allá de la recomendada, «--secure». Si no está seguro, deje el valor " |
537 | "recomendado por omisión." |
538 | + |
539 | +#~ msgid "" |
540 | +#~ "By default, the TFTP server listens to port 69 on all addresses and all " |
541 | +#~ "interfaces (0.0.0.0:69). If no port is specified, it defaults to 69." |
542 | +#~ msgstr "" |
543 | +#~ "Por omisión, el servidor de TFTP escucha en el puerto 69 de todas las " |
544 | +#~ "direcciones e interfaces (0.0.0.0:69). Si no se especifica un puerto, el " |
545 | +#~ "valor por omisión es 69." |
546 | diff --git a/debian/po/fi.po b/debian/po/fi.po |
547 | index 4ceaac0..77a88c6 100644 |
548 | --- a/debian/po/fi.po |
549 | +++ b/debian/po/fi.po |
550 | @@ -6,7 +6,7 @@ msgid "" |
551 | msgstr "" |
552 | "Project-Id-Version: tftp-hpa 5.0-14\n" |
553 | "Report-Msgid-Bugs-To: tftp-hpa@packages.debian.org\n" |
554 | -"POT-Creation-Date: 2009-11-10 11:05+0100\n" |
555 | +"POT-Creation-Date: 2014-10-28 10:26+0100\n" |
556 | "PO-Revision-Date: 2009-04-07 22:19+0300\n" |
557 | "Last-Translator: Esko Arajärvi <edu@iki.fi>\n" |
558 | "Language-Team: Finnish <debian-l10n-finnish@lists.debian.org>\n" |
559 | @@ -71,7 +71,7 @@ msgstr "" |
560 | #: ../tftpd-hpa.templates:3001 |
561 | msgid "" |
562 | "By default, the TFTP server listens to port 69 on all addresses and all " |
563 | -"interfaces (0.0.0.0:69). If no port is specified, it defaults to 69." |
564 | +"interfaces ([::]:69). If no port is specified, it defaults to 69." |
565 | msgstr "" |
566 | |
567 | #. Type: string |
568 | diff --git a/debian/po/fr.po b/debian/po/fr.po |
569 | index 4c7dee6..5f315de 100644 |
570 | --- a/debian/po/fr.po |
571 | +++ b/debian/po/fr.po |
572 | @@ -6,7 +6,7 @@ msgid "" |
573 | msgstr "" |
574 | "Project-Id-Version: tftp-hpa 5.0-14\n" |
575 | "Report-Msgid-Bugs-To: tftp-hpa@packages.debian.org\n" |
576 | -"POT-Creation-Date: 2009-11-10 11:05+0100\n" |
577 | +"POT-Creation-Date: 2014-10-28 10:26+0100\n" |
578 | "PO-Revision-Date: 2009-03-26 01:12+0100\n" |
579 | "Last-Translator: Steve Petruzzello <dlist@bluewin.ch>\n" |
580 | "Language-Team: French <debian-l10n-french@lists.debian.org>\n" |
581 | @@ -72,10 +72,10 @@ msgstr "" |
582 | #: ../tftpd-hpa.templates:3001 |
583 | msgid "" |
584 | "By default, the TFTP server listens to port 69 on all addresses and all " |
585 | -"interfaces (0.0.0.0:69). If no port is specified, it defaults to 69." |
586 | +"interfaces ([::]:69). If no port is specified, it defaults to 69." |
587 | msgstr "" |
588 | "Le serveur TFTP écoute par défaut sur le port 69 pour toutes les adresses et " |
589 | -"toutes les interfaces (0.0.0.0:69). Si aucun port n'est indiqué, le port par " |
590 | +"toutes les interfaces ([::]:69). Si aucun port n'est indiqué, le port par " |
591 | "défaut sera le port 69." |
592 | |
593 | #. Type: string |
594 | @@ -116,3 +116,11 @@ msgstr "" |
595 | "À part l'option « --secure » qui est recommandée, les autres sont rarement " |
596 | "nécessaires et ne sont utilisées que pour des situations très spéciales. " |
597 | "Dans le doute, vous devriez laisser les valeurs par défaut." |
598 | + |
599 | +#~ msgid "" |
600 | +#~ "By default, the TFTP server listens to port 69 on all addresses and all " |
601 | +#~ "interfaces (0.0.0.0:69). If no port is specified, it defaults to 69." |
602 | +#~ msgstr "" |
603 | +#~ "Le serveur TFTP écoute par défaut sur le port 69 pour toutes les adresses " |
604 | +#~ "et toutes les interfaces (0.0.0.0:69). Si aucun port n'est indiqué, le " |
605 | +#~ "port par défaut sera le port 69." |
606 | diff --git a/debian/po/gl.po b/debian/po/gl.po |
607 | index 76336b8..e3db314 100644 |
608 | --- a/debian/po/gl.po |
609 | +++ b/debian/po/gl.po |
610 | @@ -6,7 +6,7 @@ msgid "" |
611 | msgstr "" |
612 | "Project-Id-Version: tftp-hpa 5.0-14\n" |
613 | "Report-Msgid-Bugs-To: tftp-hpa@packages.debian.org\n" |
614 | -"POT-Creation-Date: 2009-11-10 11:05+0100\n" |
615 | +"POT-Creation-Date: 2014-10-28 10:26+0100\n" |
616 | "PO-Revision-Date: 2009-04-15 21:32+0200\n" |
617 | "Last-Translator: marce villarino <mvillarino@users.sourceforge.net>\n" |
618 | "Language-Team: Galician <proxecto@trasno.ent>\n" |
619 | @@ -72,7 +72,7 @@ msgstr "" |
620 | #: ../tftpd-hpa.templates:3001 |
621 | msgid "" |
622 | "By default, the TFTP server listens to port 69 on all addresses and all " |
623 | -"interfaces (0.0.0.0:69). If no port is specified, it defaults to 69." |
624 | +"interfaces ([::]:69). If no port is specified, it defaults to 69." |
625 | msgstr "" |
626 | |
627 | #. Type: string |
628 | diff --git a/debian/po/it.po b/debian/po/it.po |
629 | index 09cef58..b3d4ad8 100644 |
630 | --- a/debian/po/it.po |
631 | +++ b/debian/po/it.po |
632 | @@ -6,7 +6,7 @@ msgid "" |
633 | msgstr "" |
634 | "Project-Id-Version: tftp-hpa 5.0-15\n" |
635 | "Report-Msgid-Bugs-To: tftp-hpa@packages.debian.org\n" |
636 | -"POT-Creation-Date: 2009-11-10 11:05+0100\n" |
637 | +"POT-Creation-Date: 2014-10-28 10:26+0100\n" |
638 | "PO-Revision-Date: 2010-09-17 13:35+0100\n" |
639 | "Last-Translator: Vincenzo Campanella <vinz65@gmail.com>\n" |
640 | "Language-Team: Italian <tp@lists.linux.it>\n" |
641 | @@ -72,10 +72,10 @@ msgstr "" |
642 | #: ../tftpd-hpa.templates:3001 |
643 | msgid "" |
644 | "By default, the TFTP server listens to port 69 on all addresses and all " |
645 | -"interfaces (0.0.0.0:69). If no port is specified, it defaults to 69." |
646 | +"interfaces ([::]:69). If no port is specified, it defaults to 69." |
647 | msgstr "" |
648 | "In modo predefinito il server TFTP si pone in ascolto sulla posta 69 su " |
649 | -"tutti gli indirizzi e tutte le interfacce (0.0.0.0:69). Se non viene " |
650 | +"tutti gli indirizzi e tutte le interfacce ([::]:69). Se non viene " |
651 | "specificata alcuna porta viene utilizzata quella predefinita (la 69)." |
652 | |
653 | #. Type: string |
654 | @@ -117,3 +117,11 @@ msgstr "" |
655 | "Opzioni all'infuori di quella, raccomandata, «--secure» sono raramente " |
656 | "necessarie e solo per situazioni particolari. In caso di dubbio, lasciare il " |
657 | "valore predefinito." |
658 | + |
659 | +#~ msgid "" |
660 | +#~ "By default, the TFTP server listens to port 69 on all addresses and all " |
661 | +#~ "interfaces (0.0.0.0:69). If no port is specified, it defaults to 69." |
662 | +#~ msgstr "" |
663 | +#~ "In modo predefinito il server TFTP si pone in ascolto sulla posta 69 su " |
664 | +#~ "tutti gli indirizzi e tutte le interfacce (0.0.0.0:69). Se non viene " |
665 | +#~ "specificata alcuna porta viene utilizzata quella predefinita (la 69)." |
666 | diff --git a/debian/po/ja.po b/debian/po/ja.po |
667 | index c59569c..c479434 100644 |
668 | --- a/debian/po/ja.po |
669 | +++ b/debian/po/ja.po |
670 | @@ -6,7 +6,7 @@ msgid "" |
671 | msgstr "" |
672 | "Project-Id-Version: tftp-hpa 5.0-14\n" |
673 | "Report-Msgid-Bugs-To: tftp-hpa@packages.debian.org\n" |
674 | -"POT-Creation-Date: 2009-11-10 11:05+0100\n" |
675 | +"POT-Creation-Date: 2014-10-28 10:26+0100\n" |
676 | "PO-Revision-Date: 2010-05-04 07:21+0200\n" |
677 | "Last-Translator: Hideki Yamane (Debian-JP) <henrich@debian.or.jp>\n" |
678 | "Language-Team: Japanese <debian-japanese@lists.debian.org>\n" |
679 | @@ -72,11 +72,11 @@ msgstr "" |
680 | #: ../tftpd-hpa.templates:3001 |
681 | msgid "" |
682 | "By default, the TFTP server listens to port 69 on all addresses and all " |
683 | -"interfaces (0.0.0.0:69). If no port is specified, it defaults to 69." |
684 | +"interfaces ([::]:69). If no port is specified, it defaults to 69." |
685 | msgstr "" |
686 | "デフォルトでは、TFTP サーバは全てのアドレス上の69番ポートと、全てのインター" |
687 | -"フェイス上で listen します (0.0.0.0:69)。ポートが指定されない場合は、デフォル" |
688 | -"ト値は 69 です。" |
689 | +"フェイス上で listen します ([::]:69)。ポートが指定されない場合は、デフォルト" |
690 | +"値は 69 です。" |
691 | |
692 | #. Type: string |
693 | #. Description |
694 | @@ -115,3 +115,11 @@ msgstr "" |
695 | "推奨されている '--secure' 以外のオプションが必要なことは稀で、特定の状況にの" |
696 | "み必要とされます。良く分からない場合は、推奨であるデフォルト値のままにしてお" |
697 | "いてください。" |
698 | + |
699 | +#~ msgid "" |
700 | +#~ "By default, the TFTP server listens to port 69 on all addresses and all " |
701 | +#~ "interfaces (0.0.0.0:69). If no port is specified, it defaults to 69." |
702 | +#~ msgstr "" |
703 | +#~ "デフォルトでは、TFTP サーバは全てのアドレス上の69番ポートと、全てのイン" |
704 | +#~ "ターフェイス上で listen します (0.0.0.0:69)。ポートが指定されない場合は、" |
705 | +#~ "デフォルト値は 69 です。" |
706 | diff --git a/debian/po/nl.po b/debian/po/nl.po |
707 | index 808c1ae..118bfbd 100644 |
708 | --- a/debian/po/nl.po |
709 | +++ b/debian/po/nl.po |
710 | @@ -6,7 +6,7 @@ msgid "" |
711 | msgstr "" |
712 | "Project-Id-Version: tftp-hpa 5.2\n" |
713 | "Report-Msgid-Bugs-To: tftp-hpa@packages.debian.org\n" |
714 | -"POT-Creation-Date: 2009-11-10 11:05+0100\n" |
715 | +"POT-Creation-Date: 2014-10-28 10:26+0100\n" |
716 | "PO-Revision-Date: 2012-01-12 14:42+0100\n" |
717 | "Last-Translator: Jeroen Schot <schot@a-eskwadraat.nl>\n" |
718 | "Language-Team: Debian l10n Dutch <debian-l10n-dutch@lists.debian.org>\n" |
719 | @@ -72,10 +72,10 @@ msgstr "" |
720 | #: ../tftpd-hpa.templates:3001 |
721 | msgid "" |
722 | "By default, the TFTP server listens to port 69 on all addresses and all " |
723 | -"interfaces (0.0.0.0:69). If no port is specified, it defaults to 69." |
724 | +"interfaces ([::]:69). If no port is specified, it defaults to 69." |
725 | msgstr "" |
726 | "Standaard luistert de TFTP-server op poort 69 van alle adressen en " |
727 | -"interfaces (0.0.0.0:69). Als u geen poort opgeeft, zal de standaardwaarde 69 " |
728 | +"interfaces ([::]:69). Als u geen poort opgeeft, zal de standaardwaarde 69 " |
729 | "worden gebruikt." |
730 | |
731 | #. Type: string |
732 | @@ -116,3 +116,11 @@ msgstr "" |
733 | "Andere opties dan de aanbevolen '--secure' zijn zelden nodig en alleen voor " |
734 | "speciale omstandigheden. Als u twijfelt, laat dit dan op de aanbevolen " |
735 | "standaard waarde." |
736 | + |
737 | +#~ msgid "" |
738 | +#~ "By default, the TFTP server listens to port 69 on all addresses and all " |
739 | +#~ "interfaces (0.0.0.0:69). If no port is specified, it defaults to 69." |
740 | +#~ msgstr "" |
741 | +#~ "Standaard luistert de TFTP-server op poort 69 van alle adressen en " |
742 | +#~ "interfaces (0.0.0.0:69). Als u geen poort opgeeft, zal de standaardwaarde " |
743 | +#~ "69 worden gebruikt." |
744 | diff --git a/debian/po/pt.po b/debian/po/pt.po |
745 | index d2897c1..afd0c95 100644 |
746 | --- a/debian/po/pt.po |
747 | +++ b/debian/po/pt.po |
748 | @@ -6,7 +6,7 @@ msgid "" |
749 | msgstr "" |
750 | "Project-Id-Version: tftp-hpa 5.0-14\n" |
751 | "Report-Msgid-Bugs-To: tftp-hpa@packages.debian.org\n" |
752 | -"POT-Creation-Date: 2009-11-10 11:05+0100\n" |
753 | +"POT-Creation-Date: 2014-10-28 10:26+0100\n" |
754 | "PO-Revision-Date: 2009-11-14 01:07+0000\n" |
755 | "Last-Translator: Américo Monteiro <a_monteiro@netcabo.pt>\n" |
756 | "Language-Team: Portuguese <traduz@debianpt.org>\n" |
757 | @@ -75,11 +75,11 @@ msgstr "" |
758 | #: ../tftpd-hpa.templates:3001 |
759 | msgid "" |
760 | "By default, the TFTP server listens to port 69 on all addresses and all " |
761 | -"interfaces (0.0.0.0:69). If no port is specified, it defaults to 69." |
762 | +"interfaces ([::]:69). If no port is specified, it defaults to 69." |
763 | msgstr "" |
764 | "Por predefinição, o servidor TFTP escuta no porto 69 em todos os endereços e " |
765 | -"todas as interfaces (0.0.0.0:69). Se nenhum porto for especificado, será " |
766 | -"usado o 69." |
767 | +"todas as interfaces ([::]:69). Se nenhum porto for especificado, será usado " |
768 | +"o 69." |
769 | |
770 | #. Type: string |
771 | #. Description |
772 | @@ -120,3 +120,11 @@ msgstr "" |
773 | "Opções além da recomendada '--secure' são raramente necessárias e apenas " |
774 | "para situações especiais. Em caso de dúvidas, deixe no valor predefinido e " |
775 | "recomendado." |
776 | + |
777 | +#~ msgid "" |
778 | +#~ "By default, the TFTP server listens to port 69 on all addresses and all " |
779 | +#~ "interfaces (0.0.0.0:69). If no port is specified, it defaults to 69." |
780 | +#~ msgstr "" |
781 | +#~ "Por predefinição, o servidor TFTP escuta no porto 69 em todos os " |
782 | +#~ "endereços e todas as interfaces (0.0.0.0:69). Se nenhum porto for " |
783 | +#~ "especificado, será usado o 69." |
784 | diff --git a/debian/po/pt_BR.po b/debian/po/pt_BR.po |
785 | index e1bf650..89b8405 100644 |
786 | --- a/debian/po/pt_BR.po |
787 | +++ b/debian/po/pt_BR.po |
788 | @@ -6,7 +6,7 @@ msgid "" |
789 | msgstr "" |
790 | "Project-Id-Version: tftp-hpa 5.0-22\n" |
791 | "Report-Msgid-Bugs-To: tftp-hpa@packages.debian.org\n" |
792 | -"POT-Creation-Date: 2009-11-10 11:05+0100\n" |
793 | +"POT-Creation-Date: 2014-10-28 10:26+0100\n" |
794 | "PO-Revision-Date: 2011-06-04 15:25-0300\n" |
795 | "Last-Translator: Flamarion Jorge <jorge.flamarion@gmail.com>\n" |
796 | "Language-Team: Brazilian Portuguese <debian-l10n-portuguese@lists.debian." |
797 | @@ -76,10 +76,10 @@ msgstr "" |
798 | #: ../tftpd-hpa.templates:3001 |
799 | msgid "" |
800 | "By default, the TFTP server listens to port 69 on all addresses and all " |
801 | -"interfaces (0.0.0.0:69). If no port is specified, it defaults to 69." |
802 | +"interfaces ([::]:69). If no port is specified, it defaults to 69." |
803 | msgstr "" |
804 | "Por padrão, o servidor TFTP escuta na porta 69 em todos os endereços de " |
805 | -"todas as interfaces (0.0.0.0:69). Se a porta não for especificada, o padrão " |
806 | +"todas as interfaces ([::]:69). Se a porta não for especificada, o padrão " |
807 | "será a 69." |
808 | |
809 | #. Type: string |
810 | @@ -120,3 +120,11 @@ msgstr "" |
811 | "Outras opções além da recomendada '--secure' raramente são necessárias e " |
812 | "somente em situações especiais. Se não tiver certeza, é recomendado deixar o " |
813 | "valor padrão." |
814 | + |
815 | +#~ msgid "" |
816 | +#~ "By default, the TFTP server listens to port 69 on all addresses and all " |
817 | +#~ "interfaces (0.0.0.0:69). If no port is specified, it defaults to 69." |
818 | +#~ msgstr "" |
819 | +#~ "Por padrão, o servidor TFTP escuta na porta 69 em todos os endereços de " |
820 | +#~ "todas as interfaces (0.0.0.0:69). Se a porta não for especificada, o " |
821 | +#~ "padrão será a 69." |
822 | diff --git a/debian/po/ru.po b/debian/po/ru.po |
823 | index add2fea..494e977 100644 |
824 | --- a/debian/po/ru.po |
825 | +++ b/debian/po/ru.po |
826 | @@ -7,7 +7,7 @@ msgid "" |
827 | msgstr "" |
828 | "Project-Id-Version: tftp-hpa 5.0-14\n" |
829 | "Report-Msgid-Bugs-To: tftp-hpa@packages.debian.org\n" |
830 | -"POT-Creation-Date: 2009-11-10 11:05+0100\n" |
831 | +"POT-Creation-Date: 2014-10-28 10:26+0100\n" |
832 | "PO-Revision-Date: 2009-12-30 19:18+0300\n" |
833 | "Last-Translator: Yuri Kozlov <yuray@komyakino.ru>\n" |
834 | "Language-Team: Russian <debian-l10n-russian@lists.debian.org>\n" |
835 | @@ -76,10 +76,10 @@ msgstr "Укажите прослушиваемый адрес и порт в в |
836 | #: ../tftpd-hpa.templates:3001 |
837 | msgid "" |
838 | "By default, the TFTP server listens to port 69 on all addresses and all " |
839 | -"interfaces (0.0.0.0:69). If no port is specified, it defaults to 69." |
840 | +"interfaces ([::]:69). If no port is specified, it defaults to 69." |
841 | msgstr "" |
842 | "По умолчанию, сервер TFTP прослушивает порт 69 на всех адресах и интерфейсах " |
843 | -"(0.0.0.0:69). Если порт не указан, то по умолчанию используется 69." |
844 | +"([::]:69). Если порт не указан, то по умолчанию используется 69." |
845 | |
846 | #. Type: string |
847 | #. Description |
848 | @@ -118,3 +118,11 @@ msgstr "" |
849 | "Кроме рекомендуемого параметра '--secure' все остальные используются редко и " |
850 | "в определённых ситуациях. Если не уверены, оставьте рекомендуемое значение " |
851 | "по умолчанию." |
852 | + |
853 | +#~ msgid "" |
854 | +#~ "By default, the TFTP server listens to port 69 on all addresses and all " |
855 | +#~ "interfaces (0.0.0.0:69). If no port is specified, it defaults to 69." |
856 | +#~ msgstr "" |
857 | +#~ "По умолчанию, сервер TFTP прослушивает порт 69 на всех адресах и " |
858 | +#~ "интерфейсах (0.0.0.0:69). Если порт не указан, то по умолчанию " |
859 | +#~ "используется 69." |
860 | diff --git a/debian/po/sk.po b/debian/po/sk.po |
861 | index eddb74a..167e260 100644 |
862 | --- a/debian/po/sk.po |
863 | +++ b/debian/po/sk.po |
864 | @@ -6,7 +6,7 @@ msgid "" |
865 | msgstr "" |
866 | "Project-Id-Version: tftp-hpa 5.2-4\n" |
867 | "Report-Msgid-Bugs-To: tftp-hpa@packages.debian.org\n" |
868 | -"POT-Creation-Date: 2009-11-10 11:05+0100\n" |
869 | +"POT-Creation-Date: 2014-10-28 10:26+0100\n" |
870 | "PO-Revision-Date: 2013-03-28 19:21+0100\n" |
871 | "Last-Translator: Slavko <linux@slavino.sk>\n" |
872 | "Language-Team: slovenčina <debian-l10n-slovak@lists.debian.org>\n" |
873 | @@ -70,9 +70,13 @@ msgstr "Prosím, zadajte adresu a port načúvania vo forme [adresa][:port]." |
874 | #. Type: string |
875 | #. Description |
876 | #: ../tftpd-hpa.templates:3001 |
877 | +#, fuzzy |
878 | +#| msgid "" |
879 | +#| "By default, the TFTP server listens to port 69 on all addresses and all " |
880 | +#| "interfaces (0.0.0.0:69). If no port is specified, it defaults to 69." |
881 | msgid "" |
882 | "By default, the TFTP server listens to port 69 on all addresses and all " |
883 | -"interfaces (0.0.0.0:69). If no port is specified, it defaults to 69." |
884 | +"interfaces ([::]:69). If no port is specified, it defaults to 69." |
885 | msgstr "" |
886 | "Predvolene server TFTP načúva na porte 69 na všetkých adresách a všetkých " |
887 | "rozhraniach (0.0.0.0:69). Ak nie je zadaný port, je predvolene použitý port " |
888 | diff --git a/debian/po/sv.po b/debian/po/sv.po |
889 | index 52fb032..261cbcc 100644 |
890 | --- a/debian/po/sv.po |
891 | +++ b/debian/po/sv.po |
892 | @@ -6,7 +6,7 @@ msgid "" |
893 | msgstr "" |
894 | "Project-Id-Version: tftp-hpa 5.0-14\n" |
895 | "Report-Msgid-Bugs-To: tftp-hpa@packages.debian.org\n" |
896 | -"POT-Creation-Date: 2009-11-10 11:05+0100\n" |
897 | +"POT-Creation-Date: 2014-10-28 10:26+0100\n" |
898 | "PO-Revision-Date: 2009-11-16 23:01+0100\n" |
899 | "Last-Translator: Martin Bagge <brother@bsnet.se>\n" |
900 | "Language-Team: swedish <debian-l10n-swedish@lists.debian.org>\n" |
901 | @@ -70,11 +70,11 @@ msgstr "" |
902 | #: ../tftpd-hpa.templates:3001 |
903 | msgid "" |
904 | "By default, the TFTP server listens to port 69 on all addresses and all " |
905 | -"interfaces (0.0.0.0:69). If no port is specified, it defaults to 69." |
906 | +"interfaces ([::]:69). If no port is specified, it defaults to 69." |
907 | msgstr "" |
908 | "Standardvärdet är att TFTP-servern lyssnar på port 69 på alla adress och " |
909 | -"alla gränssnitt (0.0.0.0:69). Om ingen port anges kommer standardporten 69 " |
910 | -"att användas." |
911 | +"alla gränssnitt ([::]:69). Om ingen port anges kommer standardporten 69 att " |
912 | +"användas." |
913 | |
914 | #. Type: string |
915 | #. Description |
916 | @@ -113,3 +113,11 @@ msgstr "" |
917 | "Särskilda inställningar utöver den rekomenderade \"--secure\" används nästan " |
918 | "aldrig och kräver vanligen mycket speciella omständigheter. Använd de " |
919 | "rekomenderade inställningarna om du är osäker." |
920 | + |
921 | +#~ msgid "" |
922 | +#~ "By default, the TFTP server listens to port 69 on all addresses and all " |
923 | +#~ "interfaces (0.0.0.0:69). If no port is specified, it defaults to 69." |
924 | +#~ msgstr "" |
925 | +#~ "Standardvärdet är att TFTP-servern lyssnar på port 69 på alla adress och " |
926 | +#~ "alla gränssnitt (0.0.0.0:69). Om ingen port anges kommer standardporten " |
927 | +#~ "69 att användas." |
928 | diff --git a/debian/po/templates.pot b/debian/po/templates.pot |
929 | index e944d6f..e5e2603 100644 |
930 | --- a/debian/po/templates.pot |
931 | +++ b/debian/po/templates.pot |
932 | @@ -6,12 +6,13 @@ |
933 | #, fuzzy |
934 | msgid "" |
935 | msgstr "" |
936 | -"Project-Id-Version: tftp-hpa VERSION\n" |
937 | +"Project-Id-Version: tftp-hpa\n" |
938 | "Report-Msgid-Bugs-To: tftp-hpa@packages.debian.org\n" |
939 | -"POT-Creation-Date: 2009-11-10 11:05+0100\n" |
940 | +"POT-Creation-Date: 2014-10-28 10:26+0100\n" |
941 | "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" |
942 | "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" |
943 | "Language-Team: LANGUAGE <LL@li.org>\n" |
944 | +"Language: \n" |
945 | "MIME-Version: 1.0\n" |
946 | "Content-Type: text/plain; charset=CHARSET\n" |
947 | "Content-Transfer-Encoding: 8bit\n" |
948 | @@ -68,7 +69,7 @@ msgstr "" |
949 | #: ../tftpd-hpa.templates:3001 |
950 | msgid "" |
951 | "By default, the TFTP server listens to port 69 on all addresses and all " |
952 | -"interfaces (0.0.0.0:69). If no port is specified, it defaults to 69." |
953 | +"interfaces ([::]:69). If no port is specified, it defaults to 69." |
954 | msgstr "" |
955 | |
956 | #. Type: string |
957 | diff --git a/debian/po/zh_CN.po b/debian/po/zh_CN.po |
958 | index b273995..e4a175a 100644 |
959 | --- a/debian/po/zh_CN.po |
960 | +++ b/debian/po/zh_CN.po |
961 | @@ -6,7 +6,7 @@ msgid "" |
962 | msgstr "" |
963 | "Project-Id-Version: tftp-hpa 5.0-14\n" |
964 | "Report-Msgid-Bugs-To: tftp-hpa@packages.debian.org\n" |
965 | -"POT-Creation-Date: 2009-11-10 11:05+0100\n" |
966 | +"POT-Creation-Date: 2014-10-28 10:26+0100\n" |
967 | "PO-Revision-Date: 2009-03-26 16:48+0800\n" |
968 | "Last-Translator: Deng Xiyue <manphiz-guest@users.alioth.debian.org>\n" |
969 | "Language-Team: Debian Chinese GB <debian-chinese-gb@lists.debian.org>\n" |
970 | @@ -69,7 +69,7 @@ msgstr "" |
971 | #: ../tftpd-hpa.templates:3001 |
972 | msgid "" |
973 | "By default, the TFTP server listens to port 69 on all addresses and all " |
974 | -"interfaces (0.0.0.0:69). If no port is specified, it defaults to 69." |
975 | +"interfaces ([::]:69). If no port is specified, it defaults to 69." |
976 | msgstr "" |
977 | |
978 | #. Type: string |
979 | diff --git a/debian/tftpd-hpa.config b/debian/tftpd-hpa.config |
980 | index 89bbcb1..b1486c7 100644 |
981 | --- a/debian/tftpd-hpa.config |
982 | +++ b/debian/tftpd-hpa.config |
983 | @@ -10,6 +10,12 @@ if [ -e "${CONFFILE}" ] |
984 | then |
985 | . ${CONFFILE} || true |
986 | |
987 | + # Move from IPv4-only to dual-stack |
988 | + if [ "${TFTP_ADDRESS}" = "0.0.0.0:69" ] && \ |
989 | + dpkg --compare-versions $2 lt 5.2-7ubuntu3; then |
990 | + TFTP_ADDRESS="[::]:69" |
991 | + fi |
992 | + |
993 | db_set tftpd-hpa/username "${TFTP_USERNAME}" |
994 | db_set tftpd-hpa/directory "${TFTP_DIRECTORY}" |
995 | db_set tftpd-hpa/address "${TFTP_ADDRESS}" |
996 | diff --git a/debian/tftpd-hpa.postinst b/debian/tftpd-hpa.postinst |
997 | index 845ac8b..3f4e2db 100644 |
998 | --- a/debian/tftpd-hpa.postinst |
999 | +++ b/debian/tftpd-hpa.postinst |
1000 | @@ -15,7 +15,7 @@ case "${1}" in |
1001 | TFTP_DIRECTORY="${RET:-/srv/tftp}" |
1002 | |
1003 | db_get tftpd-hpa/address |
1004 | - TFTP_ADDRESS="${RET:-0.0.0.0:69}" |
1005 | + TFTP_ADDRESS="${RET:-[::]:69}" |
1006 | |
1007 | db_get tftpd-hpa/options |
1008 | TFTP_OPTIONS="${RET}" # is ok when empty |
1009 | @@ -31,7 +31,7 @@ cat > "${CONFFILE}" << EOF |
1010 | TFTP_USERNAME="${TFTP_USERNAME}" |
1011 | TFTP_DIRECTORY="${TFTP_DIRECTORY}" |
1012 | TFTP_ADDRESS="${TFTP_ADDRESS}" |
1013 | -TFTP_OPTIONS="${TFTP_OPTIONS}" |
1014 | +TFTP_OPTIONS="${TFTP_OPTIONS} -s" |
1015 | EOF |
1016 | fi |
1017 | |
1018 | diff --git a/debian/tftpd-hpa.templates b/debian/tftpd-hpa.templates |
1019 | index 3df810a..643be89 100644 |
1020 | --- a/debian/tftpd-hpa.templates |
1021 | +++ b/debian/tftpd-hpa.templates |
1022 | @@ -10,20 +10,20 @@ _Description: Dedicated system account for the tftpd-hpa TFTP daemon: |
1023 | |
1024 | Template: tftpd-hpa/directory |
1025 | Type: string |
1026 | -Default: /srv/tftp |
1027 | +Default: /var/lib/tftpboot |
1028 | _Description: TFTP root directory: |
1029 | Please specify the directory that will be used as root for the |
1030 | TFTP server. |
1031 | |
1032 | Template: tftpd-hpa/address |
1033 | Type: string |
1034 | -Default: 0.0.0.0:69 |
1035 | +Default: [::]:69 |
1036 | _Description: TFTP server address and port: |
1037 | Please specify an address and port to listen to in the form of |
1038 | [address][:port]. |
1039 | . |
1040 | By default, the TFTP server listens to port 69 on all addresses and all |
1041 | - interfaces (0.0.0.0:69). If no port is specified, it defaults to 69. |
1042 | + interfaces ([::]:69). If no port is specified, it defaults to 69. |
1043 | . |
1044 | Please note that numeric IPv6 addresses must be enclosed in square brackets |
1045 | to avoid ambiguity with the optional port information. |