diff -Nru ifupdown-0.6.8ubuntu29/debian/changelog ifupdown-0.6.9ubuntu1~nmt1~lucid/debian/changelog --- ifupdown-0.6.8ubuntu29/debian/changelog 2010-02-20 04:30:21.000000000 +0000 +++ ifupdown-0.6.9ubuntu1~nmt1~lucid/debian/changelog 2010-03-09 02:31:46.000000000 +0000 @@ -1,3 +1,87 @@ +ifupdown (0.6.9ubuntu1~nmt1~lucid) lucid; urgency=low + + * Merge from Debian testing, remaining changes: (LP: #532739) + - add upstart scripts + - add udev rules + - add iniparser functions to handle NetworkManager's managed mode config + - keep state in /var/run/network/ifstate, not /etc/network/run/ifstate + - debian/control: + - Bump build-dependency on debhelper for Upstart-aware dh_installinit + - Add versioned dependency on a version of netbase that actually does + indicate that it has been configured. + - Add Breaks to ensure the right version of udev is used. + - debian/preinst: remove the loopback init script + - debian/rules: + - Due to debhelper always adding /etc/init.d symlinks, we must + manually remove /etc/init.d/networking for as long as netbase + still provides it. + - ifupdown.nw: + - modprobe ipv6 before configuring it. + - Add 'ipv4ll' method which uses avahi-autoipd to bring up an + interface with an IPv4 link-layer address from 169.254.0.0/16 (aka + 'Zeroconf'). See https://wiki.ubuntu.com/ZeroConfNetworking for details. + - use 100 as default route metric unless an explicit metric + parameter is set in /etc/network/interface + - Add a new query interface, 'ifquery', used by upstart hooks + * drop conversions from 0.6.7 and prior versions. + - update debian/postinst + - remove debian/upgrade-from-0.5.x.pl + - remove debian/upgrade-from-hotplug.pl + + -- Mathieu Trudel Sat, 06 Mar 2010 22:22:59 -0500 + +ifupdown (0.6.9) unstable; urgency=low + + * Fix typo subsytems -> subsystems in interfaces(5) manual page + (Closes: #390086). Thanks to A. Costa for the patch. + * Fix typo iterface -> interface in init.d/ifupdown-clean (Closes: + #458347). Patch from Trent W. Buck. + * Fix bashism in example script get-mac-address.sh (Closes: + #518924). Patch from Simon Descarpentries. + * Remove obsolete debconf template translations (Closes: #520007, + #534553). + * Fix gramatically incorrect message from ifupdown (Closes: + #501554). Patch from Łukasz Stelmach. + * Updated standards-version from 3.7.2 to 3.8.3. No change needed. + * Make sure postrm script fail on errors. Thanks lintian. + * Upgrade to debhelper version 7. + * Acknowledge NMUs (Closes: #428084, #441673, #448416, #471804, + #544371). + + -- Petter Reinholdtsen Sun, 06 Sep 2009 12:11:11 +0200 + +ifupdown (0.6.8+nmu3) unstable; urgency=low + + * Non-maintainer upload. (with maintainer's consent) + * Correctly make the modification in 0.6.8+nmu2 + * Also adjust the way /sbin/dhclient is killed to be comparable to how + /sbin/dhclient is stopped + * Invoke dhclient with -v to maintain equivalent verbosity to dhclient3 + * Conflict with dhcp-client v2 + + -- Andrew Pollock Thu, 03 Sep 2009 21:50:47 -0700 + +ifupdown (0.6.8+nmu2) unstable; urgency=low + + * Non-maintainer upload. (with maintainer's consent) + * Invoke /sbin/dhclient without the -e option in preparation for DHCP v4 + (closes: #544371) + + -- Andrew Pollock Wed, 02 Sep 2009 21:20:37 -0700 + +ifupdown (0.6.8+nmu1) unstable; urgency=low + + * Non-maintainer upload to fix pending l10n issues. + * Drop debconf support that dealt with a very old transition + Closes: #428084, #441673, #448416, #471804 + * [Lintian] No longer ignore errors by "make clean" + * [Lintian] No longer include empty /usr/bin and /usr/sbin + * [Lintian] Removed debian/conffiles that only contained files + from /etc, that are added automatically by debhelper + * [Lintian] Raise debhelper compatibility level to 4 + + -- Christian Perrier Sat, 12 Apr 2008 13:32:24 +0200 + ifupdown (0.6.8ubuntu29) lucid; urgency=low * debian/postinst: if the loopback interface is missing from the config in diff -Nru ifupdown-0.6.8ubuntu29/debian/compat ifupdown-0.6.9ubuntu1~nmt1~lucid/debian/compat --- ifupdown-0.6.8ubuntu29/debian/compat 1970-01-01 01:00:00.000000000 +0100 +++ ifupdown-0.6.9ubuntu1~nmt1~lucid/debian/compat 2010-03-09 02:31:46.000000000 +0000 @@ -0,0 +1 @@ +7 diff -Nru ifupdown-0.6.8ubuntu29/debian/config ifupdown-0.6.9ubuntu1~nmt1~lucid/debian/config --- ifupdown-0.6.8ubuntu29/debian/config 2010-02-20 04:30:21.000000000 +0000 +++ ifupdown-0.6.9ubuntu1~nmt1~lucid/debian/config 1970-01-01 01:00:00.000000000 +0100 @@ -1,15 +0,0 @@ -#!/bin/sh -set -e - -# Source debconf library -[ -e /usr/share/debconf/confmodule ] || exit 0 -. /usr/share/debconf/confmodule - -if [ "$1" = "configure" ] && [ "$2" != "" ]; then - if dpkg --compare-versions "$2" lt "0.6"; then - db_input low ifupdown/convert-interfaces || true - db_go - fi -fi - -db_stop diff -Nru ifupdown-0.6.8ubuntu29/debian/control ifupdown-0.6.9ubuntu1~nmt1~lucid/debian/control --- ifupdown-0.6.8ubuntu29/debian/control 2010-02-20 04:30:21.000000000 +0000 +++ ifupdown-0.6.9ubuntu1~nmt1~lucid/debian/control 2010-03-09 02:31:46.000000000 +0000 @@ -4,7 +4,7 @@ Maintainer: Ubuntu Core Developers XSBC-Original-Maintainer: Anthony Towns Uploaders: Petter Reinholdtsen -Standards-Version: 3.7.2 +Standards-Version: 3.8.3 Build-Depends: debhelper (>= 7.3.15ubuntu2), nowebm Package: ifupdown @@ -13,6 +13,7 @@ Suggests: iproute, dhcp3-client | dhcp-client, ppp Replaces: netbase (<< 4.00) Breaks: udev (<< 136-1) +Conflicts: dhcp-client (<< 3.0) Description: high level tools to configure network interfaces This package provides the tools ifup and ifdown which may be used to configure (or, respectively, deconfigure) network interfaces based on diff -Nru ifupdown-0.6.8ubuntu29/debian/dirs ifupdown-0.6.9ubuntu1~nmt1~lucid/debian/dirs --- ifupdown-0.6.8ubuntu29/debian/dirs 2010-02-20 04:30:21.000000000 +0000 +++ ifupdown-0.6.9ubuntu1~nmt1~lucid/debian/dirs 2010-03-09 02:31:46.000000000 +0000 @@ -1,5 +1,3 @@ -usr/bin -usr/sbin usr/share/doc/ifupdown/examples usr/share/ifupdown usr/share/man/man5 diff -Nru ifupdown-0.6.8ubuntu29/debian/ifupdown-clean.init ifupdown-0.6.9ubuntu1~nmt1~lucid/debian/ifupdown-clean.init --- ifupdown-0.6.8ubuntu29/debian/ifupdown-clean.init 2010-02-20 04:30:21.000000000 +0000 +++ ifupdown-0.6.9ubuntu1~nmt1~lucid/debian/ifupdown-clean.init 2010-03-09 02:31:46.000000000 +0000 @@ -5,7 +5,7 @@ # Required-Stop: # Default-Start: S # Default-Stop: -# Short-Description: Clean old iterface status info during boot. +# Short-Description: Clean old interface status info during boot. ### END INIT INFO set -e diff -Nru ifupdown-0.6.8ubuntu29/debian/po/ca.po ifupdown-0.6.9ubuntu1~nmt1~lucid/debian/po/ca.po --- ifupdown-0.6.8ubuntu29/debian/po/ca.po 2010-02-20 04:30:21.000000000 +0000 +++ ifupdown-0.6.9ubuntu1~nmt1~lucid/debian/po/ca.po 1970-01-01 01:00:00.000000000 +0100 @@ -1,36 +0,0 @@ -# ifupdown (debconf) translation to Catalan. -# Copyright (C) 2004 Free Software Foundation, Inc. -# Aleix Badia i Bosch , 2004 -# Matt Bonner , 2004 -# Jordi Mallach , 2004 -# -msgid "" -msgstr "" -"Project-Id-Version: ifupdown-0.6.4-4.6_templates\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2004-08-04 17:16+0200\n" -"PO-Revision-Date: 2004-02-28 19:46GMT\n" -"Last-Translator: Aleix Badia i Bosch \n" -"Language-Team: Debian L10n Catalan \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" - -#. Type: boolean -#. Description -#: ../templates.master:4 -msgid "Update /etc/network/interfaces?" -msgstr "Voleu actualitzar el fitxer /etc/network/interfaces?" - -#. Type: boolean -#. Description -#: ../templates.master:4 -msgid "" -"The format of /etc/network/interfaces has had a minor but incompatible " -"change made between version 0.5.x and 0.6.x of ifupdown. It is however " -"possible to automatically convert from the old format to the new in almost " -"all cases." -msgstr "" -"El format del fitxer /etc/network/interfaces de l'ifupdown s'ha modificat " -"entre les versions 0.5.x i 0.6.x. Tot i això, en la majoria dels casos es " -"pot actualitzar automàticament del format vell al nou." diff -Nru ifupdown-0.6.8ubuntu29/debian/po/cs.po ifupdown-0.6.9ubuntu1~nmt1~lucid/debian/po/cs.po --- ifupdown-0.6.8ubuntu29/debian/po/cs.po 2010-02-20 04:30:21.000000000 +0000 +++ ifupdown-0.6.9ubuntu1~nmt1~lucid/debian/po/cs.po 1970-01-01 01:00:00.000000000 +0100 @@ -1,43 +0,0 @@ -# -# 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. -# -msgid "" -msgstr "" -"Project-Id-Version: ifupdown\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2004-08-04 17:16+0200\n" -"PO-Revision-Date: 2004-02-09 20:09+0100\n" -"Last-Translator: Miroslav Kure \n" -"Language-Team: Czech \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=ISO-8859-2\n" -"Content-Transfer-Encoding: 8bit\n" - -#. Type: boolean -#. Description -#: ../templates.master:4 -msgid "Update /etc/network/interfaces?" -msgstr "Aktualizovat /etc/network/interfaces?" - -#. Type: boolean -#. Description -#: ../templates.master:4 -msgid "" -"The format of /etc/network/interfaces has had a minor but incompatible " -"change made between version 0.5.x and 0.6.x of ifupdown. It is however " -"possible to automatically convert from the old format to the new in almost " -"all cases." -msgstr "" -"Mezi verzemi 0.5.x a 0.6 programu ifupdown dolo k mal, ale nekompatibiln " -"zmn formtu souboru /etc/network/interfaces. V tm vech ppadech lze " -"pevst data ze starho formtu do novho zcela automaticky." diff -Nru ifupdown-0.6.8ubuntu29/debian/po/da.po ifupdown-0.6.9ubuntu1~nmt1~lucid/debian/po/da.po --- ifupdown-0.6.8ubuntu29/debian/po/da.po 2010-02-20 04:30:21.000000000 +0000 +++ ifupdown-0.6.9ubuntu1~nmt1~lucid/debian/po/da.po 1970-01-01 01:00:00.000000000 +0100 @@ -1,44 +0,0 @@ -# -# 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. -# -msgid "" -msgstr "" -"Project-Id-Version: ifupdown 0.6.4\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2004-08-04 17:16+0200\n" -"PO-Revision-Date: 2004-03-31 14:37+0200\n" -"Last-Translator: Morten Brix Pedersen \n" -"Language-Team: Danish \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" - -#. Type: boolean -#. Description -#: ../templates.master:4 -msgid "Update /etc/network/interfaces?" -msgstr "Opdatér /etc/network/interfaces?" - -#. Type: boolean -#. Description -#: ../templates.master:4 -msgid "" -"The format of /etc/network/interfaces has had a minor but incompatible " -"change made between version 0.5.x and 0.6.x of ifupdown. It is however " -"possible to automatically convert from the old format to the new in almost " -"all cases." -msgstr "" -"Formatet i filen /etc/network/interfaces har fået lavet en mindre men " -"inkompatibel ændring mellem version 0.5.x og 0.6.x af ifupdown. Det er dog " -"muligt at automatisk konvertere fra det gamle format til det nye i næsten " -"alle tilfælde." diff -Nru ifupdown-0.6.8ubuntu29/debian/po/de.po ifupdown-0.6.9ubuntu1~nmt1~lucid/debian/po/de.po --- ifupdown-0.6.8ubuntu29/debian/po/de.po 2010-02-20 04:30:21.000000000 +0000 +++ ifupdown-0.6.9ubuntu1~nmt1~lucid/debian/po/de.po 1970-01-01 01:00:00.000000000 +0100 @@ -1,45 +0,0 @@ -# -# Translators, if you are not familiar with the PO format, gettext -# documentation is worth reading, especially sections dedicated to -# this format, e.g. by running: -# info -n '(gettext)PO Files' -# info -n '(gettext)Header Entry' -# -# Some information specific to po-debconf are available at -# /usr/share/doc/po-debconf/README-trans -# or http://www.debian.org/intl/l10n/po-debconf/README-trans -# -# Developers do not need to manually edit POT or PO files. -# -#, fuzzy -msgid "" -msgstr "" -"Project-Id-Version: PACKAGE VERSION\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2004-08-04 17:16+0200\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME \n" -"Language-Team: LANGUAGE \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=ISO-8859-15\n" -"Content-Transfer-Encoding: 8bit\n" - -#. Type: boolean -#. Description -#: ../templates.master:4 -msgid "Update /etc/network/interfaces?" -msgstr "Soll /etc/network/interfaces erneuert werden?" - -#. Type: boolean -#. Description -#: ../templates.master:4 -msgid "" -"The format of /etc/network/interfaces has had a minor but incompatible " -"change made between version 0.5.x and 0.6.x of ifupdown. It is however " -"possible to automatically convert from the old format to the new in almost " -"all cases." -msgstr "" -"Das Format von /etc/network/interfaces hat eine kleinere aber inkompatible " -"nderung zwischen Version 0.5.x und 0.6.x von ifupdown erfahren. Es ist " -"jedoch in fast allen Fllen mglich, automatisch vom alten in das neue " -"Format zu konvertieren." diff -Nru ifupdown-0.6.8ubuntu29/debian/po/el.po ifupdown-0.6.9ubuntu1~nmt1~lucid/debian/po/el.po --- ifupdown-0.6.8ubuntu29/debian/po/el.po 2010-02-20 04:30:21.000000000 +0000 +++ ifupdown-0.6.9ubuntu1~nmt1~lucid/debian/po/el.po 1970-01-01 01:00:00.000000000 +0100 @@ -1,45 +0,0 @@ -# translation of el.po to Greek -# translation of templates.po to Greek -# -# 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. -# Konstantinos Margaritis , 2004. -# -msgid "" -msgstr "" -"Project-Id-Version: el\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2004-08-04 17:16+0200\n" -"PO-Revision-Date: 2004-01-15 22:04EEST\n" -"Last-Translator: Konstantinos Margaritis \n" -"Language-Team: Greek \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"X-Generator: KBabel 1.0.2\n" - -#. Type: boolean -#. Description -#: ../templates.master:4 -msgid "Update /etc/network/interfaces?" -msgstr "Να γίνει διόρθωση του /etc/network/interfaces;" - -#. Type: boolean -#. Description -#: ../templates.master:4 -msgid "" -"The format of /etc/network/interfaces has had a minor but incompatible " -"change made between version 0.5.x and 0.6.x of ifupdown. It is however " -"possible to automatically convert from the old format to the new in almost " -"all cases." -msgstr "" -"Η δομή του /etc/network/interfaces άλλαξε με ένα μικρό αλλά ασύμβατο τρόπο " -"από την έκδοση του πακέτου ifupdown 0.5.x και 0.6.x. Ωστόσο, είναι δυνατή η " -"αυτόματη μετατροπή της παλιάς δομής στη νέα για σχεδόν όλες τις περιπτώσεις." diff -Nru ifupdown-0.6.8ubuntu29/debian/po/es.po ifupdown-0.6.9ubuntu1~nmt1~lucid/debian/po/es.po --- ifupdown-0.6.8ubuntu29/debian/po/es.po 2010-02-20 04:30:21.000000000 +0000 +++ ifupdown-0.6.9ubuntu1~nmt1~lucid/debian/po/es.po 1970-01-01 01:00:00.000000000 +0100 @@ -1,46 +0,0 @@ -# -# 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. -# -# Carlos Valdivia Yage , 2003 -# -msgid "" -msgstr "" -"Project-Id-Version: ifupdown 0.6.4\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2004-08-04 17:16+0200\n" -"PO-Revision-Date: 2003-08-29 01:00+0200\n" -"Last-Translator: Carlos Valdivia Yage \n" -"Language-Team: Debian L10n Spanish \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=ISO-8859-15\n" -"Content-Transfer-Encoding: 8bit\n" - -#. Type: boolean -#. Description -#: ../templates.master:4 -msgid "Update /etc/network/interfaces?" -msgstr "Actualizar /etc/network/interfaces" - -#. Type: boolean -#. Description -#: ../templates.master:4 -msgid "" -"The format of /etc/network/interfaces has had a minor but incompatible " -"change made between version 0.5.x and 0.6.x of ifupdown. It is however " -"possible to automatically convert from the old format to the new in almost " -"all cases." -msgstr "" -"El formato de /etc/network/interfaces ha sufrido un cambio pequeo pero " -"incompatible entre las versiones 0.5.x y 0.6.x de ifupdown. No obstante, en " -"casi todos los casos es posible realizar la conversin automticamente entre " -"el formato antiguo y el nuevo." diff -Nru ifupdown-0.6.8ubuntu29/debian/po/fr.po ifupdown-0.6.9ubuntu1~nmt1~lucid/debian/po/fr.po --- ifupdown-0.6.8ubuntu29/debian/po/fr.po 2010-02-20 04:30:21.000000000 +0000 +++ ifupdown-0.6.9ubuntu1~nmt1~lucid/debian/po/fr.po 1970-01-01 01:00:00.000000000 +0100 @@ -1,44 +0,0 @@ -# -# 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. -# -msgid "" -msgstr "" -"Project-Id-Version: ifupdown 0.6.4\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2004-08-04 17:16+0200\n" -"PO-Revision-Date: 2003-07-10 19:52+0100\n" -"Last-Translator: Thomas Morin \n" -"Language-Team: French \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=ISO-8859-15\n" -"Content-Transfer-Encoding: 8bit\n" - -#. Type: boolean -#. Description -#: ../templates.master:4 -msgid "Update /etc/network/interfaces?" -msgstr "Mettre jour /etc/network/interfaces?" - -#. Type: boolean -#. Description -#: ../templates.master:4 -msgid "" -"The format of /etc/network/interfaces has had a minor but incompatible " -"change made between version 0.5.x and 0.6.x of ifupdown. It is however " -"possible to automatically convert from the old format to the new in almost " -"all cases." -msgstr "" -"Le format du fichier /etc/network/interfaces a subi un changement mineur " -"mais incompatible entre les versions 0.5.x et 0.6.x d'ifupdown. Il est " -"nanmoins possible de convertir automatiquement ce fichier de l'ancien " -"format au nouveau, dans la plupart des cas." diff -Nru ifupdown-0.6.8ubuntu29/debian/po/gl.po ifupdown-0.6.9ubuntu1~nmt1~lucid/debian/po/gl.po --- ifupdown-0.6.8ubuntu29/debian/po/gl.po 2010-02-20 04:30:21.000000000 +0000 +++ ifupdown-0.6.9ubuntu1~nmt1~lucid/debian/po/gl.po 1970-01-01 01:00:00.000000000 +0100 @@ -1,43 +0,0 @@ -# -# 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. -# -msgid "" -msgstr "" -"Project-Id-Version: ifupdown\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2004-08-04 17:16+0200\n" -"PO-Revision-Date: 2006-04-12 09:13+0200\n" -"Last-Translator: Jacobo Tarrio \n" -"Language-Team: Galician \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" - -#. Type: boolean -#. Description -#: ../templates.master:4 -msgid "Update /etc/network/interfaces?" -msgstr "¿Actualizar /etc/network/interfaces?" - -#. Type: boolean -#. Description -#: ../templates.master:4 -msgid "" -"The format of /etc/network/interfaces has had a minor but incompatible " -"change made between version 0.5.x and 0.6.x of ifupdown. It is however " -"possible to automatically convert from the old format to the new in almost " -"all cases." -msgstr "" -"O formato de /etc/network/interfaces tivo un cambio menor pero incompatible " -"entre as versións 0.5.x e 0.6.x de ifupdown. Nembargantes, é posible " -"converter automáticamente do formato antigo ao novo en case tódolos casos." diff -Nru ifupdown-0.6.8ubuntu29/debian/po/it.po ifupdown-0.6.9ubuntu1~nmt1~lucid/debian/po/it.po --- ifupdown-0.6.8ubuntu29/debian/po/it.po 2010-02-20 04:30:21.000000000 +0000 +++ ifupdown-0.6.9ubuntu1~nmt1~lucid/debian/po/it.po 1970-01-01 01:00:00.000000000 +0100 @@ -1,36 +0,0 @@ -# ifupdown po-debconf translation to italian -# Copyright (C) 2004 Software in the Public Interest -# This file is distributed under the same license as the ifupdown package. -# Luca Monducci, 2004. -# -msgid "" -msgstr "" -"Project-Id-Version: ifupdown 0.6.4-4.10\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2004-08-04 17:16+0200\n" -"PO-Revision-Date: 2004-11-21 16:02+0100\n" -"Last-Translator: Luca Monducci \n" -"Language-Team: Italian \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" - -#. Type: boolean -#. Description -#: ../templates.master:4 -msgid "Update /etc/network/interfaces?" -msgstr "Aggiornare /etc/network/interfaces?" - -#. Type: boolean -#. Description -#: ../templates.master:4 -msgid "" -"The format of /etc/network/interfaces has had a minor but incompatible " -"change made between version 0.5.x and 0.6.x of ifupdown. It is however " -"possible to automatically convert from the old format to the new in almost " -"all cases." -msgstr "" -"Il formato del file /etc/network/interfaces ha subito un piccolo cambiamento " -"che lo rende incompatibile fra le versioni 0.5.x e 0.6.x di ifupdown. " -"Comunque, nella maggior parte dei casi, è possibile convertire " -"automaticamente il file dal vecchio formato al nuovo." diff -Nru ifupdown-0.6.8ubuntu29/debian/po/ja.po ifupdown-0.6.9ubuntu1~nmt1~lucid/debian/po/ja.po --- ifupdown-0.6.8ubuntu29/debian/po/ja.po 2010-02-20 04:30:21.000000000 +0000 +++ ifupdown-0.6.9ubuntu1~nmt1~lucid/debian/po/ja.po 1970-01-01 01:00:00.000000000 +0100 @@ -1,43 +0,0 @@ -# -# 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. -# -msgid "" -msgstr "" -"Project-Id-Version: PACKAGE VERSION\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2004-08-04 17:16+0200\n" -"PO-Revision-Date: 2003-09-11 23:13+0900\n" -"Last-Translator: Kenshi Muto \n" -"Language-Team: Japanese \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=EUC-JP\n" -"Content-Transfer-Encoding: 8bit\n" - -#. Type: boolean -#. Description -#: ../templates.master:4 -msgid "Update /etc/network/interfaces?" -msgstr "/etc/network/interfaces 򹹿ޤ?" - -#. Type: boolean -#. Description -#: ../templates.master:4 -msgid "" -"The format of /etc/network/interfaces has had a minor but incompatible " -"change made between version 0.5.x and 0.6.x of ifupdown. It is however " -"possible to automatically convert from the old format to the new in almost " -"all cases." -msgstr "" -"/etc/network/interfaces ηϡifupdown 0.5.x 0.6.x ΤǺ٤" -"ʡߴѹԤޤۤܤ٤Ƥξ硢Ť鿷" -"ؼưŪѴǤޤ" diff -Nru ifupdown-0.6.8ubuntu29/debian/po/lt.po ifupdown-0.6.9ubuntu1~nmt1~lucid/debian/po/lt.po --- ifupdown-0.6.8ubuntu29/debian/po/lt.po 2010-02-20 04:30:21.000000000 +0000 +++ ifupdown-0.6.9ubuntu1~nmt1~lucid/debian/po/lt.po 1970-01-01 01:00:00.000000000 +0100 @@ -1,33 +0,0 @@ -# translation of ifupdown debconf templates to Lithuanian -# Copyright (C) 2004 Free Software Foundation, Inc. -# Gintautas Miliauskas , 2004. -msgid "" -msgstr "" -"Project-Id-Version: pcmcia-cs\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2004-08-04 17:16+0200\n" -"PO-Revision-Date: 2004-05-16 11:05+0300\n" -"Last-Translator: Gintautas Miliauskas \n" -"Language-Team: Lithuanian \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" - -#. Type: boolean -#. Description -#: ../templates.master:4 -msgid "Update /etc/network/interfaces?" -msgstr "Atnaujinti /etc/network/interfaces?" - -#. Type: boolean -#. Description -#: ../templates.master:4 -msgid "" -"The format of /etc/network/interfaces has had a minor but incompatible " -"change made between version 0.5.x and 0.6.x of ifupdown. It is however " -"possible to automatically convert from the old format to the new in almost " -"all cases." -msgstr "" -"Failo /etc/network/interfaces formatas nežymiai, bet nesuderinamai skiriasi " -"tarp ifupdown versijų 0.5.x ir 0.6.x, tačiau beveik visais atvejais galima " -"automatiškai konvertuoti iš seno formato į naują." diff -Nru ifupdown-0.6.8ubuntu29/debian/po/nb.po ifupdown-0.6.9ubuntu1~nmt1~lucid/debian/po/nb.po --- ifupdown-0.6.8ubuntu29/debian/po/nb.po 2010-02-20 04:30:21.000000000 +0000 +++ ifupdown-0.6.9ubuntu1~nmt1~lucid/debian/po/nb.po 1970-01-01 01:00:00.000000000 +0100 @@ -1,44 +0,0 @@ -# translation of nb.po to Norwegian Bokmål -# -# 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. -# Petter Reinholdtsen , 2006. -# -msgid "" -msgstr "" -"Project-Id-Version: nb\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2004-08-04 17:16+0200\n" -"PO-Revision-Date: 2006-09-14 14:57MET\n" -"Last-Translator: Petter Reinholdtsen \n" -"Language-Team: Norwegian Bokmål \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"X-Generator: KBabel 1.9.1\n" - -#. Type: boolean -#. Description -#: ../templates.master:4 -msgid "Update /etc/network/interfaces?" -msgstr "Oppdatere /etc/network/interfaces?" - -#. Type: boolean -#. Description -#: ../templates.master:4 -msgid "" -"The format of /etc/network/interfaces has had a minor but incompatible " -"change made between version 0.5.x and 0.6.x of ifupdown. It is however " -"possible to automatically convert from the old format to the new in almost " -"all cases." -msgstr "" -"Formatet til /etc/network/interfaces gjennomgikk en mindreikke-kompatibel " -"endring mellom versjon 0.5.x og 0.6.x av ifupdown.Det er mulig a automatisk " -"konvertere fra det gamle til det nyeformatet i nesten alle tilfeller." diff -Nru ifupdown-0.6.8ubuntu29/debian/po/nl.po ifupdown-0.6.9ubuntu1~nmt1~lucid/debian/po/nl.po --- ifupdown-0.6.8ubuntu29/debian/po/nl.po 2010-02-20 04:30:21.000000000 +0000 +++ ifupdown-0.6.9ubuntu1~nmt1~lucid/debian/po/nl.po 1970-01-01 01:00:00.000000000 +0100 @@ -1,44 +0,0 @@ -# -# 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. -# -msgid "" -msgstr "" -"Project-Id-Version: ifupdown 0.6.4-4.6\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2004-08-04 17:16+0200\n" -"PO-Revision-Date: 2003-09-20 00:44+0100\n" -"Last-Translator: Tim Dijkstra \n" -"Language-Team: Dutch \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=iso-8859-15\n" -"Content-Transfer-Encoding: 8bit\n" - -#. Type: boolean -#. Description -#: ../templates.master:4 -msgid "Update /etc/network/interfaces?" -msgstr "/etc/network/interfaces bijwerken?" - -#. Type: boolean -#. Description -#: ../templates.master:4 -msgid "" -"The format of /etc/network/interfaces has had a minor but incompatible " -"change made between version 0.5.x and 0.6.x of ifupdown. It is however " -"possible to automatically convert from the old format to the new in almost " -"all cases." -msgstr "" -"De indeling van /etc/network/interfaces heeft tussen versie 0.5.x en 0.6.x " -"van ifupdown een kleine, maar incompatibele verandering ondergaan. In bijna " -"alle gevallen is het echter mogelijk om automatisch het oude format naar het " -"nieuwe om te zetten." diff -Nru ifupdown-0.6.8ubuntu29/debian/po/pl.po ifupdown-0.6.9ubuntu1~nmt1~lucid/debian/po/pl.po --- ifupdown-0.6.8ubuntu29/debian/po/pl.po 2010-02-20 04:30:21.000000000 +0000 +++ ifupdown-0.6.9ubuntu1~nmt1~lucid/debian/po/pl.po 1970-01-01 01:00:00.000000000 +0100 @@ -1,46 +0,0 @@ -# -# Translators, if you are not familiar with the PO format, gettext -# documentation is worth reading, especially sections dedicated to -# this format, e.g. by running: -# info -n '(gettext)PO Files' -# info -n '(gettext)Header Entry' -# -# Some information specific to po-debconf are available at -# /usr/share/doc/po-debconf/README-trans -# or http://www.debian.org/intl/l10n/po-debconf/README-trans -# -# Developers do not need to manually edit POT or PO files. -# -#, fuzzy -msgid "" -msgstr "" -"Project-Id-Version: PACKAGE VERSION\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2004-08-04 17:16+0200\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME \n" -"Language-Team: LANGUAGE \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=ISO-8859-2\n" -"Content-Transfer-Encoding: 8bit\n" - -#. Type: boolean -#. Description -#: ../templates.master:4 -msgid "Update /etc/network/interfaces?" -msgstr "Uaktualni /etc/network/interfaces?" - -#. Type: boolean -#. Description -#: ../templates.master:4 -msgid "" -"The format of /etc/network/interfaces has had a minor but incompatible " -"change made between version 0.5.x and 0.6.x of ifupdown. It is however " -"possible to automatically convert from the old format to the new in almost " -"all cases." -msgstr "" -"W porwnaniu z wersj 0.5.x, wersja 0.6.x programu ifupdown wprowadza drobne " -"zmiany, ktre jednak powoduj, e stara wersja pliku /etc/network/interfaces " -"moe nie pasowa do nowej konfiguracji. Istnieje jednak moliwo " -"automatycznej konwersji (w praktycznie wszystkich przypadkach) ze starego " -"formatu do nowego." diff -Nru ifupdown-0.6.8ubuntu29/debian/po/POTFILES.in ifupdown-0.6.9ubuntu1~nmt1~lucid/debian/po/POTFILES.in --- ifupdown-0.6.8ubuntu29/debian/po/POTFILES.in 2010-02-20 04:30:21.000000000 +0000 +++ ifupdown-0.6.9ubuntu1~nmt1~lucid/debian/po/POTFILES.in 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -[type: gettext/rfc822deb] templates.master diff -Nru ifupdown-0.6.8ubuntu29/debian/po/pt_BR.po ifupdown-0.6.9ubuntu1~nmt1~lucid/debian/po/pt_BR.po --- ifupdown-0.6.8ubuntu29/debian/po/pt_BR.po 2010-02-20 04:30:21.000000000 +0000 +++ ifupdown-0.6.9ubuntu1~nmt1~lucid/debian/po/pt_BR.po 1970-01-01 01:00:00.000000000 +0100 @@ -1,45 +0,0 @@ -# -# Translators, if you are not familiar with the PO format, gettext -# documentation is worth reading, especially sections dedicated to -# this format, e.g. by running: -# info -n '(gettext)PO Files' -# info -n '(gettext)Header Entry' -# -# Some information specific to po-debconf are available at -# /usr/share/doc/po-debconf/README-trans -# or http://www.debian.org/intl/l10n/po-debconf/README-trans -# -# Developers do not need to manually edit POT or PO files. -# -#, fuzzy -msgid "" -msgstr "" -"Project-Id-Version: PACKAGE VERSION\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2004-08-04 17:16+0200\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME \n" -"Language-Team: LANGUAGE \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=ISO-8859-1\n" -"Content-Transfer-Encoding: 8bit\n" - -#. Type: boolean -#. Description -#: ../templates.master:4 -msgid "Update /etc/network/interfaces?" -msgstr "Atualizar /etc/network/interfaces?" - -#. Type: boolean -#. Description -#: ../templates.master:4 -msgid "" -"The format of /etc/network/interfaces has had a minor but incompatible " -"change made between version 0.5.x and 0.6.x of ifupdown. It is however " -"possible to automatically convert from the old format to the new in almost " -"all cases." -msgstr "" -"O formato do arquivo /etc/network/interfaces sofreu uma mudana menor mas " -"incompatvel entre as verses 0.5.x e 0.6.x do pacote ifupdown. Porm " -"possvel converter a partir do formato antigo para o novo formato na maioria " -"dos casos." diff -Nru ifupdown-0.6.8ubuntu29/debian/po/pt.po ifupdown-0.6.9ubuntu1~nmt1~lucid/debian/po/pt.po --- ifupdown-0.6.8ubuntu29/debian/po/pt.po 2010-02-20 04:30:21.000000000 +0000 +++ ifupdown-0.6.9ubuntu1~nmt1~lucid/debian/po/pt.po 1970-01-01 01:00:00.000000000 +0100 @@ -1,32 +0,0 @@ -# Simão Pedro Cardoso, pthell@gmail.com, first translation on 01/11/2005 -msgid "" -msgstr "" -"Project-Id-Version: ifupdown 0.6.7\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2004-08-04 17:16+0200\n" -"PO-Revision-Date: 2005-11-01 19:02+0000\n" -"Last-Translator: Simão Pedro Cardoso \n" -"Language-Team: Portuguese \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" - -#. Type: boolean -#. Description -#: ../templates.master:4 -msgid "Update /etc/network/interfaces?" -msgstr "Actualizar /etc/network/interfaces?" - -#. Type: boolean -#. Description -#: ../templates.master:4 -msgid "" -"The format of /etc/network/interfaces has had a minor but incompatible " -"change made between version 0.5.x and 0.6.x of ifupdown. It is however " -"possible to automatically convert from the old format to the new in almost " -"all cases." -msgstr "" -"O formato de /etc/network/interfaces teve uma modificação menor mas " -"incompatível entre as versões 0.5.x e 0.6.x do ifupdown. É no entanto, " -"possível converter automaticamente a partir do velho para o novo formato na " -"maioria dos casos." diff -Nru ifupdown-0.6.8ubuntu29/debian/po/ru.po ifupdown-0.6.9ubuntu1~nmt1~lucid/debian/po/ru.po --- ifupdown-0.6.8ubuntu29/debian/po/ru.po 2010-02-20 04:30:21.000000000 +0000 +++ ifupdown-0.6.9ubuntu1~nmt1~lucid/debian/po/ru.po 1970-01-01 01:00:00.000000000 +0100 @@ -1,44 +0,0 @@ -# -# Translators, if you are not familiar with the PO format, gettext -# documentation is worth reading, especially sections dedicated to -# this format, e.g. by running: -# info -n '(gettext)PO Files' -# info -n '(gettext)Header Entry' -# -# Some information specific to po-debconf are available at -# /usr/share/doc/po-debconf/README-trans -# or http://www.debian.org/intl/l10n/po-debconf/README-trans -# -# Developers do not need to manually edit POT or PO files. -# -#, fuzzy -msgid "" -msgstr "" -"Project-Id-Version: PACKAGE VERSION\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2004-08-04 17:16+0200\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME \n" -"Language-Team: LANGUAGE \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=KOI8-R\n" -"Content-Transfer-Encoding: 8bit\n" - -#. Type: boolean -#. Description -#: ../templates.master:4 -msgid "Update /etc/network/interfaces?" -msgstr " /etc/network/interfaces?" - -#. Type: boolean -#. Description -#: ../templates.master:4 -msgid "" -"The format of /etc/network/interfaces has had a minor but incompatible " -"change made between version 0.5.x and 0.6.x of ifupdown. It is however " -"possible to automatically convert from the old format to the new in almost " -"all cases." -msgstr "" -" /etc/network/interfaces , " -" 0.5.x 0.6.x ifupdown. " -" ." diff -Nru ifupdown-0.6.8ubuntu29/debian/po/sv.po ifupdown-0.6.9ubuntu1~nmt1~lucid/debian/po/sv.po --- ifupdown-0.6.8ubuntu29/debian/po/sv.po 2010-02-20 04:30:21.000000000 +0000 +++ ifupdown-0.6.9ubuntu1~nmt1~lucid/debian/po/sv.po 1970-01-01 01:00:00.000000000 +0100 @@ -1,46 +0,0 @@ -# -# 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. -# -msgid "" -msgstr "" -"Project-Id-Version: ifupdown 0.6.7\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2004-08-04 17:16+0200\n" -"PO-Revision-Date: 2005-11-13 12:23+0100\n" -"Last-Translator: Daniel Nylander \n" -"Language-Team: Swedish \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=ISO-8859-1\n" -"Content-Transfer-Encoding: 8bit\n" -"X-Poedit-Language: swe\n" -"X-Poedit-Country: swe\n" - -#. Type: boolean -#. Description -#: ../templates.master:4 -msgid "Update /etc/network/interfaces?" -msgstr "Uppdatera /etc/network/interfaces?" - -#. Type: boolean -#. Description -#: ../templates.master:4 -msgid "" -"The format of /etc/network/interfaces has had a minor but incompatible " -"change made between version 0.5.x and 0.6.x of ifupdown. It is however " -"possible to automatically convert from the old format to the new in almost " -"all cases." -msgstr "" -"Formatet p /etc/network/interfaces har genomgtt en liten ndring som gr " -"att versionerna 0.5.x och 0.6.x av ifupdown blivit inkompatibla. Dock r det " -"mjligt att nstan alltid automatiskt konvertera frn det gamla formatet " -"till det nya." diff -Nru ifupdown-0.6.8ubuntu29/debian/po/templates.pot ifupdown-0.6.9ubuntu1~nmt1~lucid/debian/po/templates.pot --- ifupdown-0.6.8ubuntu29/debian/po/templates.pot 2010-02-20 04:30:21.000000000 +0000 +++ ifupdown-0.6.9ubuntu1~nmt1~lucid/debian/po/templates.pot 1970-01-01 01:00:00.000000000 +0100 @@ -1,50 +0,0 @@ -# -# Translators, if you are not familiar with the PO format, gettext -# documentation is worth reading, especially sections dedicated to -# this format, e.g. by running: -# info -n '(gettext)PO Files' -# info -n '(gettext)Header Entry' -# -# Some information specific to po-debconf are available at -# /usr/share/doc/po-debconf/README-trans -# or http://www.debian.org/intl/l10n/po-debconf/README-trans -# -# Developers do not need to manually edit POT or PO files. -# -#, fuzzy -msgid "" -msgstr "" -"Project-Id-Version: PACKAGE VERSION\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2004-08-04 17:16+0200\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME \n" -"Language-Team: LANGUAGE \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=CHARSET\n" -"Content-Transfer-Encoding: 8bit\n" - -#. Type: boolean -#. Description -#: ../templates.master:4 -msgid "Update /etc/network/interfaces?" -msgstr "" - -#. Type: boolean -#. Description -#: ../templates.master:4 -msgid "" -"The format of /etc/network/interfaces has had a minor but incompatible " -"change made between version 0.5.x and 0.6.x of ifupdown. It is however " -"possible to automatically convert from the old format to the new in almost " -"all cases." -msgstr "" - -#. Type: boolean -#. Description -#: ../templates.master:13 -msgid "" -"The format of /etc/network/interfaces has had a minor but incompatible " -"change made for dapper. It is however possible to automatically convert from " -"the old format to the new in almost all cases." -msgstr "" diff -Nru ifupdown-0.6.8ubuntu29/debian/po/tr.po ifupdown-0.6.9ubuntu1~nmt1~lucid/debian/po/tr.po --- ifupdown-0.6.8ubuntu29/debian/po/tr.po 2010-02-20 04:30:21.000000000 +0000 +++ ifupdown-0.6.9ubuntu1~nmt1~lucid/debian/po/tr.po 1970-01-01 01:00:00.000000000 +0100 @@ -1,37 +0,0 @@ -# Turkish translation of ifupdown. -# This file is distributed under the same license as the ifupdown package. -# Mehmet Turker , 2004. -# -msgid "" -msgstr "" -"Project-Id-Version: ifupdown\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2004-08-04 17:16+0200\n" -"PO-Revision-Date: 2004-03-21 03:22+0200\n" -"Last-Translator: Mehmet Turker \n" -"Language-Team: Turkish \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"X-Generator: KBabel 1.3.1\n" -"Plural-Forms: nplurals=1; plural=0;\n" - -#. Type: boolean -#. Description -#: ../templates.master:4 -msgid "Update /etc/network/interfaces?" -msgstr "/etc/network/interfaces güncellensin mi?" - -#. Type: boolean -#. Description -#: ../templates.master:4 -msgid "" -"The format of /etc/network/interfaces has had a minor but incompatible " -"change made between version 0.5.x and 0.6.x of ifupdown. It is however " -"possible to automatically convert from the old format to the new in almost " -"all cases." -msgstr "" -"/etc/network/interfaces dosya biçeminde 0.5.x'den 0.6.x sürümüne geçişte " -"küçük fakat uyumsuzluk yaratan bir değişiklik oldu. Bununla birlikte eski " -"biçemin otomatik olarak yenisine dönüştürülmesi neredeyse her durumda " -"mümkündür." diff -Nru ifupdown-0.6.8ubuntu29/debian/po/vi.po ifupdown-0.6.9ubuntu1~nmt1~lucid/debian/po/vi.po --- ifupdown-0.6.8ubuntu29/debian/po/vi.po 2010-02-20 04:30:21.000000000 +0000 +++ ifupdown-0.6.9ubuntu1~nmt1~lucid/debian/po/vi.po 1970-01-01 01:00:00.000000000 +0100 @@ -1,36 +0,0 @@ -# Vietnamese Translation for ifupdown. -# Copyright © 2005 Free Software Foundation, Inc. -# Clytie Siddall , 2005. -# -msgid "" -msgstr "" -"Project-Id-Version: ifupdown 0.6.7\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2004-08-04 17:16+0200\n" -"PO-Revision-Date: 2005-06-04 20:49+0930\n" -"Last-Translator: Clytie Siddall \n" -"Language-Team: Vietnamese \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" - -#. Type: boolean -#. Description -#: ../templates.master:4 -msgid "Update /etc/network/interfaces?" -msgstr "Cập nhật «/etc/network/interfaces» không?" - -#. Type: boolean -#. Description -#: ../templates.master:4 -msgid "" -"The format of /etc/network/interfaces has had a minor but incompatible " -"change made between version 0.5.x and 0.6.x of ifupdown. It is however " -"possible to automatically convert from the old format to the new in almost " -"all cases." -msgstr "" -"Khuôn dạng của «/etc/network/interfaces» đã thay đổi một cách nhỏ nhưng " -"không tương thích giữa phiên bản 0.5.x và 0.6.x của trình ifupdown. Tuy " -"nhiên, có thể tự động chuyển đổi từ khuôn dạng cũ sang điều mới trong gần " -"tất cả trường hợp." diff -Nru ifupdown-0.6.8ubuntu29/debian/po/zh_CN.po ifupdown-0.6.9ubuntu1~nmt1~lucid/debian/po/zh_CN.po --- ifupdown-0.6.8ubuntu29/debian/po/zh_CN.po 2010-02-20 04:30:21.000000000 +0000 +++ ifupdown-0.6.9ubuntu1~nmt1~lucid/debian/po/zh_CN.po 1970-01-01 01:00:00.000000000 +0100 @@ -1,42 +0,0 @@ -# -# 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. -# -msgid "" -msgstr "" -"Project-Id-Version: ifupdown 0.6.4\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2004-08-04 17:16+0200\n" -"PO-Revision-Date: 2004-02-06 17:45+0800\n" -"Last-Translator: Hiei Xu \n" -"Language-Team: Chinese/Simplified \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" - -#. Type: boolean -#. Description -#: ../templates.master:4 -msgid "Update /etc/network/interfaces?" -msgstr "更新 /etc/network/interfaces 吗？" - -#. Type: boolean -#. Description -#: ../templates.master:4 -msgid "" -"The format of /etc/network/interfaces has had a minor but incompatible " -"change made between version 0.5.x and 0.6.x of ifupdown. It is however " -"possible to automatically convert from the old format to the new in almost " -"all cases." -msgstr "" -"ifupdown 0.5.x 与 0.6.x 所使用的 /etc/network/interfaces 的文件格式之间有一个" -"较小但互不兼容的改变，然而在绝大多数情况下程序都能自动将旧格式转换到新格式。" diff -Nru ifupdown-0.6.8ubuntu29/debian/postinst ifupdown-0.6.9ubuntu1~nmt1~lucid/debian/postinst --- ifupdown-0.6.8ubuntu29/debian/postinst 2010-02-20 04:30:21.000000000 +0000 +++ ifupdown-0.6.9ubuntu1~nmt1~lucid/debian/postinst 2010-03-09 02:31:46.000000000 +0000 @@ -1,137 +1,58 @@ #!/bin/sh set -e -. /usr/share/debconf/confmodule - MYNAME="${0##*/}" report() { echo "${MYNAME}: $*" ; } report_warn() { report "Warning: $*" >&2 ; } report_err() { report "Error: $*" >&2 ; } -ATTEMPT_CONVERSION=false -if [ "$1" = "configure" ] && [ "$2" != "" ] && - dpkg --compare-versions "$2" le "0.6.2pr-3" -then - # Get answers to questions - db_get ifupdown/convert-interfaces; ATTEMPT_CONVERSION="$RET" -fi - -# Update /etc/network/interfaces from "noauto" to "auto" -if [ "$ATTEMPT_CONVERSION" = "true" ]; then - echo - echo -n "Automatically converting /etc/network/interfaces" - ( - cd /etc/network; - if /usr/share/ifupdown/upgrade-from-0.5.x.pl \ - < interfaces > interfaces.dpkg-new 2>/dev/null - then - echo " succeeded." - mv interfaces interfaces.dpkg-old - mv interfaces.dpkg-new interfaces - echo "Old interfaces file saved as interfaces.dpkg-old." - else - echo " failed." - echo - echo "If you wish to reattempt the conversion you may run" - echo " cat /etc/network/interfaces |" - echo " /usr/share/ifupdown/upgrade-from-0.5.x.pl" - echo - fi - ) -fi - +# Create /etc/network/run +if [ "$1" = configure -a ! -d /etc/network/run ]; then + if [ -e /etc/network/run -o -L /etc/network/run ]; then + echo "Renaming non-directory /etc/network/run to run.dpkg-old..." + mv /etc/network/run /etc/network/run.dpkg-old + fi -ATTEMPT_CONVERSION=false -if [ "$1" = "configure" ] && [ "$2" != "" ] && - dpkg --compare-versions "$2" lt "0.6.7ubuntu7" -then - # Get answers to questions - db_get ifupdown/convert-interfaces-hotplug; ATTEMPT_CONVERSION="$RET" -fi + # The best choice is to use /dev/shm/network + # + # If we can't use that, we'll just make /etc/network/run a directory, + # unless we're upgrading, in which case we'll just keep ifstate where it + # is, by making /etc/network/run a symlink to /etc/network. + + WHAT_TO_USE=devshm + + if [ ! -d /dev/shm -o ! -w /dev/shm -o ! -r /proc/mounts ]; then + WHAT_TO_USE=owndir + elif ! grep -qs "^tmpfs[[:space:]]\+/dev/shm[[:space:]]\+tmpfs[[:space:]]\+\([^[:space:]]\+,\)\?rw" /proc/mounts + then + WHAT_TO_USE=owndir + elif grep -qs '[[:space:]]/dev[[:space:]]devfs[[:space:]]' /proc/mounts; then + WHAT_TO_USE=owndir + fi -# Update /etc/network/interfaces from "mapping hotplug" to "auto" -if [ "$ATTEMPT_CONVERSION" = "true" ]; then - echo - echo -n "Automatically converting /etc/network/interfaces" - ( - cd /etc/network; - if /usr/share/ifupdown/upgrade-from-hotplug.pl \ - < interfaces > interfaces.dpkg-new 2>/dev/null - then - echo " succeeded." - mv interfaces interfaces.dpkg-old - mv interfaces.dpkg-new interfaces - echo "Old interfaces file saved as interfaces.dpkg-old." - else - echo " failed." - echo - echo "If you wish to reattempt the conversion you may run" - echo " cat /etc/network/interfaces |" - echo " /usr/share/ifupdown/upgrade-from-hotplug.pl" - echo + # Check for available space if we are using devshm + if [ "$WHAT_TO_USE" = devshm ]; then + SPACE=`df -k /dev/shm | tail -1 | awk '{if ($4 ~ /%/) { print $3 } else { print $4 } }'` + if [ "$SPACE" -le 0 ]; then + WHAT_TO_USE=owndir fi - ) -fi - - -# For every active ifupdown-controlled dhclient interface, copy -# /var/run/dhclient.pid, so that the new ifdown is able to kill -# dhclient. -# -# the old version had a bug with more than one DHCP iface anyway, -# so we don't know which one the PID file actually belongs to. -if [ "$1" = "configure" -a "$2" != "" ] && - dpkg --compare-versions "$2" le "0.6.4-4.1" && - [ -f /etc/network/run/ifstate -a -x /sbin/dhclient ] -then - - sed -e 's/^.*=//' /etc/network/run/ifstate | - while read iface; do - # handle \-continued lines - if sed -e '/^[[:space:]]*#/b;:g /\\$/{N;s/\\\n//;bg;}' /etc/network/interfaces | grep -qe "^[[:space:]]*iface[[:space:]]*\\b${iface}\\b[[:space:]]*.*\\bdhcp\\b.*" && - [ -f "/var/run/dhclient.pid" ] && - [ ! -f "/var/run/dhclient.${iface}.pid" ] - then - # copy original file. If dhclient was started - # manually, one can still use dhclient.pid, if started - # by ifupdown, the new ifupdown can take it down with - # dhclient.${iface}.pid. Obsolete files are removed during - # next boot (bootmisc.sh). - cp /var/run/dhclient.pid "/var/run/dhclient.${iface}.pid" - fi - done -fi + fi -# Move /etc/network/ifstate or /etc/network/run/ifstate to -# /var/run/network/ifstate if that has been turned into a tmpfs already -if [ "$1" = configure -a "$2" != "" ] && - dpkg --compare-versions "$2" lt "0.6.7ubuntu4" -then - if mountpoint -q /var/run; then - [ -d /var/run/network ] || mkdir /var/run/network - [ ! -e /etc/network/ifstate ] || mv -f /etc/network/ifstate /var/run/network/ifstate - [ ! -e /etc/network/run/ifstate ] || mv -f /etc/network/run/ifstate /var/run/network/ifstate - else - # Yes, this will break things, but only until reboot - rm -f /etc/network/ifstate /etc/network/run/ifstate - if [ -x /usr/share/update-notifier/notify-reboot-required ]; then - /usr/share/update-notifier/notify-reboot-required - fi - fi - [ ! -d /etc/network/run ] || rmdir /etc/network/run 2>/dev/null || true -fi + if [ "$WHAT_TO_USE" = owndir -a -e /etc/network/ifstate ]; then + WHAT_TO_USE=etcnetwork + fi -# Remove the ifupdown and ifupdown-clean init script symlinks -if [ "$1" = "configure" -a "$2" != "" ] && - dpkg --compare-versions "$2" lt "0.6.7ubuntu4" -then - rm -f /etc/init.d/ifupdown /etc/init.d/ifupdown-clean - rm -f /etc/default/ifupdown - - update-rc.d -f ifupdown remove - update-rc.d -f ifupdown-clean remove -fi + if [ "$WHAT_TO_USE" = devshm ] + then + [ -d /dev/shm/network ] || mkdir /dev/shm/network + ln -s /dev/shm/network /etc/network/run + elif [ "$WHAT_TO_USE" = "owndir" ]; then + mkdir /etc/network/run + else + ln -s . /etc/network/run + fi +fi # Remove the loopback init script symlinks if [ "$1" = "configure" -a "$2" != "" ] && @@ -177,6 +98,4 @@ fi fi -db_stop - #DEBHELPER# diff -Nru ifupdown-0.6.8ubuntu29/debian/postrm ifupdown-0.6.9ubuntu1~nmt1~lucid/debian/postrm --- ifupdown-0.6.8ubuntu29/debian/postrm 2010-02-20 04:30:21.000000000 +0000 +++ ifupdown-0.6.9ubuntu1~nmt1~lucid/debian/postrm 2010-03-09 02:31:46.000000000 +0000 @@ -1,5 +1,7 @@ #!/bin/sh +set -e + case "$1" in purge) # Note: We don't remove /etc/network/interfaces diff -Nru ifupdown-0.6.8ubuntu29/debian/rules ifupdown-0.6.9ubuntu1~nmt1~lucid/debian/rules --- ifupdown-0.6.8ubuntu29/debian/rules 2010-02-20 04:30:21.000000000 +0000 +++ ifupdown-0.6.9ubuntu1~nmt1~lucid/debian/rules 2010-03-09 02:31:46.000000000 +0000 @@ -37,9 +37,6 @@ # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 -# This is the debhelper compatability version to use. -export DH_COMPAT=1 - # For working out whether we're cross-building DEB_BUILD_GNU_TYPE := $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) DEB_HOST_GNU_TYPE := $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) @@ -48,13 +45,7 @@ ROOT_USER := 0 ROOT_GROUP := 0 -ifeq (,$(wildcard /usr/bin/po2debconf)) -PO2DEBCONF := no -MINDEBCONFVER := 0.5 -else -PO2DEBCONF := yes -MINDEBCONFVER := 1.2.0 -endif +PACKAGE=ifupdown configure: dh_testdir @@ -96,36 +87,24 @@ # Add here commands to clean up after the build process rm -rf tests/ rm -f build-stamp install-stamp - -$(MAKE) clean + [ ! -f Makefile ] || $(MAKE) clean dh_clean -ifeq ($(PO2DEBCONF),yes) - # Hack for woody compatibility. This makes sure that the - # debian/templates file shipped in the source package doesn't - # specify encodings, which woody's debconf can't handle. If building - # on a system with po-debconf installed (conveniently debhelper (>= - # 4.1.16) depends on it), the binary-arch target will generate a - # better version for sarge. - echo 1 > debian/po/output - po2debconf debian/templates.master > debian/templates - rm -f debian/po/output -endif install-stamp: install install: build test dh_testdir dh_testroot - dh_clean -k + dh_prep dh_installdirs etc/network/if-pre-up.d etc/network/if-up.d etc/network/if-down.d etc/network/if-post-down.d # Add here commands to install the package into debian/tmp. - $(MAKE) install BASEDIR=`pwd`/debian/tmp + $(MAKE) install BASEDIR=`pwd`/debian/$(PACKAGE) install -o $(ROOT_USER) -g $(ROOT_GROUP) -m 755 debian/upgrade-from-0.5.x.pl \ - debian/tmp/usr/share/ifupdown/ + debian/$(PACKAGE)/usr/share/ifupdown/ install -o $(ROOT_USER) -g $(ROOT_GROUP) -m 755 debian/upgrade-from-hotplug.pl \ - debian/tmp/usr/share/ifupdown/ - + debian/$(PACKAGE)/usr/share/ifupdown/ touch install-stamp # Build architecture-independent files here. @@ -137,10 +116,10 @@ # dh_testversion dh_testdir dh_testroot - dh_installdebconf +# dh_installdebconf dh_installdocs dh_installexamples contrib/* - mv debian/tmp/usr/share/doc/ifupdown/examples debian/tmp/usr/share/doc/ifupdown/contrib + mv debian/$(PACKAGE)/usr/share/doc/ifupdown/examples debian/$(PACKAGE)/usr/share/doc/ifupdown/contrib dh_installexamples examples/* dh_installmenu # dh_installemacsen @@ -149,15 +128,15 @@ dh_installinit --name=network-interface --upstart-only --noscripts dh_installinit --name=networking --upstart-only --noscripts # FIXME: this rm must be dropped once netbase has been fully upstartified - rm debian/tmp/etc/init.d/networking + rm debian/$(PACKAGE)/etc/init.d/networking dh_installifupdown --name=upstart # dh_installudev --priority=85 dh_installcron # dh_installmanpages # ^-- can't do our symlink trick - install -o $(ROOT_USER) -g $(ROOT_GROUP) -m 644 interfaces.5 debian/tmp/usr/share/man/man5/interfaces.5 - install -o $(ROOT_USER) -g $(ROOT_GROUP) -m 644 ifup.8 debian/tmp/usr/share/man/man8/ifup.8 - ln -s ifup.8 debian/tmp/usr/share/man/man8/ifdown.8 + install -o $(ROOT_USER) -g $(ROOT_GROUP) -m 644 interfaces.5 debian/$(PACKAGE)/usr/share/man/man5/interfaces.5 + install -o $(ROOT_USER) -g $(ROOT_GROUP) -m 644 ifup.8 debian/$(PACKAGE)/usr/share/man/man8/ifup.8 + ln -s ifup.8 debian/$(PACKAGE)/usr/share/man/man8/ifdown.8 dh_installinfo # dh_undocumented dh_installchangelogs ChangeLog @@ -171,10 +150,7 @@ dh_installdeb # dh_perl dh_shlibdeps -ifeq ($(PO2DEBCONF),yes) - po2debconf -e utf8 debian/templates.master > debian/templates -endif - dh_gencontrol -- -V'debconf-depends=debconf (>= $(MINDEBCONFVER)) | debconf-2.0' + dh_gencontrol dh_md5sums dh_builddeb diff -Nru ifupdown-0.6.8ubuntu29/debian/templates ifupdown-0.6.9ubuntu1~nmt1~lucid/debian/templates --- ifupdown-0.6.8ubuntu29/debian/templates 2010-02-20 04:30:22.000000000 +0000 +++ ifupdown-0.6.9ubuntu1~nmt1~lucid/debian/templates 1970-01-01 01:00:00.000000000 +0100 @@ -1,60 +0,0 @@ -Template: ifupdown/convert-interfaces -Type: boolean -Default: true -Description: Update /etc/network/interfaces? - The format of /etc/network/interfaces has had a minor but incompatible - change made between version 0.5.x and 0.6.x of ifupdown. It is however - possible to automatically convert from the old format to the new in almost - all cases. -Description-ca.UTF-8: Voleu actualitzar el fitxer /etc/network/interfaces? - El format del fitxer /etc/network/interfaces de l'ifupdown s'ha modificat entre les versions 0.5.x i 0.6.x. Tot i això, en la majoria dels casos es pot actualitzar automàticament del format vell al nou. -Description-cs.UTF-8: Aktualizovat /etc/network/interfaces? - Mezi verzemi 0.5.x a 0.6 programu ifupdown došlo k malé, ale nekompatibilní změně formátu souboru /etc/network/interfaces. V téměř všech případech lze převést data ze starého formátu do nového zcela automaticky. -Description-da.UTF-8: Opdatér /etc/network/interfaces? - Formatet i filen /etc/network/interfaces har fået lavet en mindre men inkompatibel ændring mellem version 0.5.x og 0.6.x af ifupdown. Det er dog muligt at automatisk konvertere fra det gamle format til det nye i næsten alle tilfælde. -Description-de.UTF-8: Soll /etc/network/interfaces erneuert werden? - Das Format von /etc/network/interfaces hat eine kleinere aber inkompatible Änderung zwischen Version 0.5.x und 0.6.x von ifupdown erfahren. Es ist jedoch in fast allen Fällen möglich, automatisch vom alten in das neue Format zu konvertieren. -Description-el.UTF-8: Να γίνει διόρθωση του /etc/network/interfaces; - Η δομή του /etc/network/interfaces άλλαξε με ένα μικρό αλλά ασύμβατο τρόπο από την έκδοση του πακέτου ifupdown 0.5.x και 0.6.x. Ωστόσο, είναι δυνατή η αυτόματη μετατροπή της παλιάς δομής στη νέα για σχεδόν όλες τις περιπτώσεις. -Description-es.UTF-8: ¿Actualizar /etc/network/interfaces - El formato de /etc/network/interfaces ha sufrido un cambio pequeño pero incompatible entre las versiones 0.5.x y 0.6.x de ifupdown. No obstante, en casi todos los casos es posible realizar la conversión automáticamente entre el formato antiguo y el nuevo. -Description-fr.UTF-8: Mettre à jour /etc/network/interfaces ? - Le format du fichier /etc/network/interfaces a subi un changement mineur mais incompatible entre les versions 0.5.x et 0.6.x d'ifupdown. Il est néanmoins possible de convertir automatiquement ce fichier de l'ancien format au nouveau, dans la plupart des cas. -Description-gl.UTF-8: ¿Actualizar /etc/network/interfaces? - O formato de /etc/network/interfaces tivo un cambio menor pero incompatible entre as versións 0.5.x e 0.6.x de ifupdown. Nembargantes, é posible converter automáticamente do formato antigo ao novo en case tódolos casos. -Description-it.UTF-8: Aggiornare /etc/network/interfaces? - Il formato del file /etc/network/interfaces ha subito un piccolo cambiamento che lo rende incompatibile fra le versioni 0.5.x e 0.6.x di ifupdown. Comunque, nella maggior parte dei casi, è possibile convertire automaticamente il file dal vecchio formato al nuovo. -Description-ja.UTF-8: /etc/network/interfaces を更新しますか? - /etc/network/interfaces の形式は、ifupdown の 0.5.x と 0.6.x のあいだで細かな、しかし非互換の変更が行われました。ほぼすべての場合、古い形式から新しい形式へ自動的に変換できます。 -Description-lt.UTF-8: Atnaujinti /etc/network/interfaces? - Failo /etc/network/interfaces formatas nežymiai, bet nesuderinamai skiriasi tarp ifupdown versijų 0.5.x ir 0.6.x, tačiau beveik visais atvejais galima automatiškai konvertuoti iš seno formato į naują. -Description-nb.UTF-8: Oppdatere /etc/network/interfaces? - Formatet til /etc/network/interfaces gjennomgikk en mindreikke-kompatibel endring mellom versjon 0.5.x og 0.6.x av ifupdown.Det er mulig a automatisk konvertere fra det gamle til det nyeformatet i nesten alle tilfeller. -Description-nl.UTF-8: /etc/network/interfaces bijwerken? - De indeling van /etc/network/interfaces heeft tussen versie 0.5.x en 0.6.x van ifupdown een kleine, maar incompatibele verandering ondergaan. In bijna alle gevallen is het echter mogelijk om automatisch het oude format naar het nieuwe om te zetten. -Description-no.UTF-8: Oppdatere /etc/network/interfaces? - Formatet til /etc/network/interfaces gjennomgikk en mindreikke-kompatibel endring mellom versjon 0.5.x og 0.6.x av ifupdown.Det er mulig a automatisk konvertere fra det gamle til det nyeformatet i nesten alle tilfeller. -Description-pl.UTF-8: Uaktualnić /etc/network/interfaces? - W porównaniu z wersją 0.5.x, wersja 0.6.x programu ifupdown wprowadza drobne zmiany, które jednak powodują, że stara wersja pliku /etc/network/interfaces może nie pasować do nowej konfiguracji. Istnieje jednak możliwość automatycznej konwersji (w praktycznie wszystkich przypadkach) ze starego formatu do nowego. -Description-pt.UTF-8: Actualizar /etc/network/interfaces? - O formato de /etc/network/interfaces teve uma modificação menor mas incompatível entre as versões 0.5.x e 0.6.x do ifupdown. É no entanto, possível converter automaticamente a partir do velho para o novo formato na maioria dos casos. -Description-pt_BR.UTF-8: Atualizar /etc/network/interfaces? - O formato do arquivo /etc/network/interfaces sofreu uma mudança menor mas incompatível entre as versões 0.5.x e 0.6.x do pacote ifupdown. Porém é possível converter a partir do formato antigo para o novo formato na maioria dos casos. -Description-ru.UTF-8: Обновить /etc/network/interfaces? - Формат /etc/network/interfaces имеет небольшие, но несовместимые изменения между версиями 0.5.x и 0.6.x ifupdown. Однако возможно автоматически преобразовать старый формат с новый почти во всех случаях. -Description-sv.UTF-8: Uppdatera /etc/network/interfaces? - Formatet på /etc/network/interfaces har genomgått en liten ändring som gör att versionerna 0.5.x och 0.6.x av ifupdown blivit inkompatibla. Dock är det möjligt att nästan alltid automatiskt konvertera från det gamla formatet till det nya. -Description-tr.UTF-8: /etc/network/interfaces güncellensin mi? - /etc/network/interfaces dosya biçeminde 0.5.x'den 0.6.x sürümüne geçişte küçük fakat uyumsuzluk yaratan bir değişiklik oldu. Bununla birlikte eski biçemin otomatik olarak yenisine dönüştürülmesi neredeyse her durumda mümkündür. -Description-vi.UTF-8: Cập nhật «/etc/network/interfaces» không? - Khuôn dạng của «/etc/network/interfaces» đã thay đổi một cách nhỏ nhưng không tương thích giữa phiên bản 0.5.x và 0.6.x của trình ifupdown. Tuy nhiên, có thể tự động chuyển đổi từ khuôn dạng cũ sang điều mới trong gần tất cả trường hợp. -Description-zh_CN.UTF-8: 更新 /etc/network/interfaces 吗？ - ifupdown 0.5.x 与 0.6.x 所使用的 /etc/network/interfaces 的文件格式之间有一个较小但互不兼容的改变，然而在绝大多数情况下程序都能自动将旧格式转换到新格式。 - -Template: ifupdown/convert-interfaces-hotplug -Type: boolean -Default: true -Description: Update /etc/network/interfaces? - The format of /etc/network/interfaces has had a minor but incompatible - change made for dapper. It is however possible to automatically convert - from the old format to the new in almost all cases. diff -Nru ifupdown-0.6.8ubuntu29/debian/templates.master ifupdown-0.6.9ubuntu1~nmt1~lucid/debian/templates.master --- ifupdown-0.6.8ubuntu29/debian/templates.master 2010-02-20 04:30:21.000000000 +0000 +++ ifupdown-0.6.9ubuntu1~nmt1~lucid/debian/templates.master 1970-01-01 01:00:00.000000000 +0100 @@ -1,16 +0,0 @@ -Template: ifupdown/convert-interfaces -Type: boolean -Default: true -_Description: Update /etc/network/interfaces? - The format of /etc/network/interfaces has had a minor but incompatible - change made between version 0.5.x and 0.6.x of ifupdown. It is however - possible to automatically convert from the old format to the new in almost - all cases. - -Template: ifupdown/convert-interfaces-hotplug -Type: boolean -Default: true -_Description: Update /etc/network/interfaces? - The format of /etc/network/interfaces has had a minor but incompatible - change made for dapper. It is however possible to automatically convert - from the old format to the new in almost all cases. diff -Nru ifupdown-0.6.8ubuntu29/examples/get-mac-address.sh ifupdown-0.6.9ubuntu1~nmt1~lucid/examples/get-mac-address.sh --- ifupdown-0.6.8ubuntu29/examples/get-mac-address.sh 2010-02-20 04:30:21.000000000 +0000 +++ ifupdown-0.6.9ubuntu1~nmt1~lucid/examples/get-mac-address.sh 2010-03-09 02:31:46.000000000 +0000 @@ -10,7 +10,7 @@ while read testmac scheme; do if [ "$which" ]; then continue; fi - if [ "$mac" = "$(echo "$testmac" | sed -e 'y/ABCDEF/abcdef/')" ]; then which="$scheme"; fi + if [ "$mac" == "$(echo "$testmac" | sed -e 'y/ABCDEF/abcdef/')" ]; then which="$scheme"; fi done if [ "$which" ]; then echo $which; exit 0; fi diff -Nru ifupdown-0.6.8ubuntu29/ifupdown.nw ifupdown-0.6.9ubuntu1~nmt1~lucid/ifupdown.nw --- ifupdown-0.6.8ubuntu29/ifupdown.nw 2010-02-20 04:30:21.000000000 +0000 +++ ifupdown-0.6.9ubuntu1~nmt1~lucid/ifupdown.nw 2010-03-09 02:31:46.000000000 +0000 @@ -3600,7 +3600,7 @@ switch(cmds(currif)) { case -1: - printf("Don't seem to be have all the variables for %s/%s.\n", + printf("Don't seem to have all the variables for %s/%s.\n", liface, currif->address_family->name); failed = 1; break; @@ -4110,7 +4110,7 @@ [[ifconfig %iface% hw %hwaddress%]] dhclient3 [[-e IF_METRIC=%metric%]] -pf /var/run/dhclient.%iface%.pid -lf /var/lib/dhcp3/dhclient.%iface%.leases %iface% \ if (execable("/sbin/dhclient3")) - dhclient [[-e IF_METRIC=%metric%]] -pf /var/run/dhclient.%iface%.pid -lf /var/lib/dhcp/dhclient.%iface%.leases %iface% \ + dhclient -v [[-e IF_METRIC=%metric%]] -pf /var/run/dhclient.%iface%.pid -lf /var/lib/dhcp/dhclient.%iface%.leases %iface% \ elsif (execable("/sbin/dhclient")) pump -i %iface% [[-h %hostname%]] [[-l %leasehours%]] \ elsif (execable("/sbin/pump") && mylinuxver() >= mylinux(2,1,100)) @@ -4124,7 +4124,7 @@ down dhclient3 -r -pf /var/run/dhclient.%iface%.pid -lf /var/lib/dhcp3/dhclient.%iface%.leases %iface% \ if (execable("/sbin/dhclient3")) - cat /var/run/dhclient.%iface%.pid | xargs -i kill -TERM {} \ + dhclient -v -r -pf /var/run/dhclient.%iface%.pid -lf /var/lib/dhcp/dhclient.%iface%.leases %iface% \ elsif (execable("/sbin/dhclient")) pump -i %iface% -r \ elsif (execable("/sbin/pump") && mylinuxver() >= mylinux(2,1,100)) diff -Nru ifupdown-0.6.8ubuntu29/inet.defn ifupdown-0.6.9ubuntu1~nmt1~lucid/inet.defn --- ifupdown-0.6.8ubuntu29/inet.defn 2010-02-20 04:30:21.000000000 +0000 +++ ifupdown-0.6.9ubuntu1~nmt1~lucid/inet.defn 2010-03-09 02:31:46.000000000 +0000 @@ -77,7 +77,7 @@ [[ifconfig %iface% hw %hwaddress%]] dhclient3 [[-e IF_METRIC=%metric%]] -pf /var/run/dhclient.%iface%.pid -lf /var/lib/dhcp3/dhclient.%iface%.leases %iface% \ if (execable("/sbin/dhclient3")) - dhclient [[-e IF_METRIC=%metric%]] -pf /var/run/dhclient.%iface%.pid -lf /var/lib/dhcp/dhclient.%iface%.leases %iface% \ + dhclient -v [[-e IF_METRIC=%metric%]] -pf /var/run/dhclient.%iface%.pid -lf /var/lib/dhcp/dhclient.%iface%.leases %iface% \ elsif (execable("/sbin/dhclient")) pump -i %iface% [[-h %hostname%]] [[-l %leasehours%]] \ elsif (execable("/sbin/pump") && mylinuxver() >= mylinux(2,1,100)) @@ -91,7 +91,7 @@ down dhclient3 -r -pf /var/run/dhclient.%iface%.pid -lf /var/lib/dhcp3/dhclient.%iface%.leases %iface% \ if (execable("/sbin/dhclient3")) - cat /var/run/dhclient.%iface%.pid | xargs -i kill -TERM {} \ + dhclient -v -r -pf /var/run/dhclient.%iface%.pid -lf /var/lib/dhcp/dhclient.%iface%.leases %iface% \ elsif (execable("/sbin/dhclient")) pump -i %iface% -r \ elsif (execable("/sbin/pump") && mylinuxver() >= mylinux(2,1,100)) diff -Nru ifupdown-0.6.8ubuntu29/interfaces.5.pre ifupdown-0.6.9ubuntu1~nmt1~lucid/interfaces.5.pre --- ifupdown-0.6.8ubuntu29/interfaces.5.pre 2010-02-20 04:30:21.000000000 +0000 +++ ifupdown-0.6.9ubuntu1~nmt1~lucid/interfaces.5.pre 2010-03-09 02:31:46.000000000 +0000 @@ -63,7 +63,7 @@ brings the named interfaces up in the order listed. .P Lines beginning with "allow-" are used to identify interfaces that should -be brought up automatically by various subsytems. This may be done using +be brought up automatically by various subsystems. This may be done using a command such as "ifup --allow=hotplug eth0 eth1", which will only bring up eth0 or eth1 if it is listed in an "allow-hotplug" line. Note that "allow-auto" and "auto" are synonyms. diff -Nru ifupdown-0.6.8ubuntu29/main.c ifupdown-0.6.9ubuntu1~nmt1~lucid/main.c --- ifupdown-0.6.8ubuntu29/main.c 2010-02-20 04:30:21.000000000 +0000 +++ ifupdown-0.6.9ubuntu1~nmt1~lucid/main.c 2010-03-09 02:31:46.000000000 +0000 @@ -829,7 +829,7 @@ switch(cmds(currif)) { case -1: - printf("Don't seem to be have all the variables for %s/%s.\n", + printf("Don't seem to have all the variables for %s/%s.\n", liface, currif->address_family->name); failed = 1; break;