Import Debian changes 1.0.12-2
tinc (1.0.12-2) unstable; urgency=low * Remove debconf questions. Closes: #572116 Apparently debconf may not be used to ask a question at install time and use the answer at upgrade time. Instead of kludging around this restriction, no questions are asked anymore, and tinc will now always be restarted when upgrading. * Wait up to 5 seconds for tinc daemon to stop before restarting it.
This commit is contained in:
Guus Sliepen
parent
0dd8a42607
commit
3cfe4d82fb
20 changed files with 31 additions and 672 deletions
11
debian/changelog
vendored
11
debian/changelog
vendored
|
|
@ -1,3 +1,14 @@
|
||||||
|
tinc (1.0.12-2) unstable; urgency=low
|
||||||
|
|
||||||
|
* Remove debconf questions. Closes: #572116
|
||||||
|
Apparently debconf may not be used to ask a question at install time and
|
||||||
|
use the answer at upgrade time. Instead of kludging around this
|
||||||
|
restriction, no questions are asked anymore, and tinc will now always be
|
||||||
|
restarted when upgrading.
|
||||||
|
* Wait up to 5 seconds for tinc daemon to stop before restarting it.
|
||||||
|
|
||||||
|
-- Guus Sliepen <guus@debian.org> Tue, 02 Mar 2010 14:01:36 +0100
|
||||||
|
|
||||||
tinc (1.0.12-1) unstable; urgency=low
|
tinc (1.0.12-1) unstable; urgency=low
|
||||||
|
|
||||||
* New upstream release.
|
* New upstream release.
|
||||||
|
|
|
||||||
9
debian/config
vendored
9
debian/config
vendored
|
|
@ -1,9 +0,0 @@
|
||||||
#!/bin/sh -e
|
|
||||||
|
|
||||||
# Source debconf library.
|
|
||||||
. /usr/share/debconf/confmodule
|
|
||||||
|
|
||||||
db_title tinc configuration
|
|
||||||
|
|
||||||
db_input medium tinc/restart_on_upgrade || true
|
|
||||||
db_go
|
|
||||||
2
debian/control
vendored
2
debian/control
vendored
|
|
@ -8,7 +8,7 @@ Homepage: http://www.tinc-vpn.org/
|
||||||
|
|
||||||
Package: tinc
|
Package: tinc
|
||||||
Architecture: any
|
Architecture: any
|
||||||
Depends: debconf | debconf-2.0, ${shlibs:Depends}, ${misc:Depends}
|
Depends: ${shlibs:Depends}, ${misc:Depends}
|
||||||
Description: Virtual Private Network daemon
|
Description: Virtual Private Network daemon
|
||||||
tinc is a daemon with which you can create a virtual private network
|
tinc is a daemon with which you can create a virtual private network
|
||||||
(VPN). One daemon can handle multiple connections, so you can
|
(VPN). One daemon can handle multiple connections, so you can
|
||||||
|
|
|
||||||
13
debian/init.d
vendored
13
debian/init.d
vendored
|
|
@ -54,7 +54,18 @@ reload() {
|
||||||
$DAEMON -n $1 -kHUP
|
$DAEMON -n $1 -kHUP
|
||||||
}
|
}
|
||||||
restart() {
|
restart() {
|
||||||
stop "$@" && sleep 1
|
stop "$@"
|
||||||
|
sleep 0.5
|
||||||
|
i=0;
|
||||||
|
while [ -f /var/run/tinc.$1.pid ] ; do
|
||||||
|
if [ $i = '10' ] ; then
|
||||||
|
break
|
||||||
|
else
|
||||||
|
echo -n "."
|
||||||
|
sleep 0.5
|
||||||
|
i=$(($i+1))
|
||||||
|
fi
|
||||||
|
done
|
||||||
start "$@"
|
start "$@"
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
1
debian/po/POTFILES.in
vendored
1
debian/po/POTFILES.in
vendored
|
|
@ -1 +0,0 @@
|
||||||
[type: gettext/rfc822deb] tinc.templates
|
|
||||||
63
debian/po/cs.po
vendored
63
debian/po/cs.po
vendored
|
|
@ -1,63 +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: tinc 1.0.4-1\n"
|
|
||||||
"Report-Msgid-Bugs-To: \n"
|
|
||||||
"POT-Creation-Date: 2004-11-11 20:06+0000\n"
|
|
||||||
"PO-Revision-Date: 2005-06-10 22:44+0200\n"
|
|
||||||
"Last-Translator: Martin Sin <martin.sin@seznam.cz>\n"
|
|
||||||
"Language-Team: Czech <debian-l10n-czech@lists.debian.org>\n"
|
|
||||||
"MIME-Version: 1.0\n"
|
|
||||||
"Content-Type: text/plain; charset=ISO-8859-2\n"
|
|
||||||
"Content-Transfer-Encoding: 8bit\n"
|
|
||||||
|
|
||||||
#. Type: boolean
|
|
||||||
#. Description
|
|
||||||
#: ../tinc.templates:4
|
|
||||||
msgid "Restart tinc on each upgrade?"
|
|
||||||
msgstr "Restartovat tinc pøi ka¾dé aktualizaci?"
|
|
||||||
|
|
||||||
#. Type: boolean
|
|
||||||
#. Description
|
|
||||||
#: ../tinc.templates:4
|
|
||||||
msgid ""
|
|
||||||
"You may choose if you want me to restart the tinc daemon every time you "
|
|
||||||
"install a new version of this package."
|
|
||||||
msgstr ""
|
|
||||||
"Mù¾ete zvolit, zda restartovat tinc daemona poka¾dé, kdy¾ je instalována "
|
|
||||||
"nová verze tohoto balíèku."
|
|
||||||
|
|
||||||
#. Type: boolean
|
|
||||||
#. Description
|
|
||||||
#: ../tinc.templates:4
|
|
||||||
msgid ""
|
|
||||||
"Sometimes you don't want to do this, for example if you are doing the "
|
|
||||||
"upgrade over a tunnel that is created with tinc. Stopping the daemon would "
|
|
||||||
"probably leave you with a dead connection, and tinc may not be started again."
|
|
||||||
msgstr ""
|
|
||||||
"Nìkdy tuto mo¾nost nepotøebujete, napøíklad pokud provádíte aktualizaci "
|
|
||||||
"pøes tunel, který je vytvoøen pomocí tinc. Zastavení tohoto daemona "
|
|
||||||
"vám pravdìpodobnì zanechá \"mrtvé pøipojení\" a navíc se tinc nemusí znovu "
|
|
||||||
"spustit."
|
|
||||||
|
|
||||||
#. Type: boolean
|
|
||||||
#. Description
|
|
||||||
#: ../tinc.templates:4
|
|
||||||
msgid ""
|
|
||||||
"If you refuse, you have to restart tinc yourself if you upgraded, by typing "
|
|
||||||
"`invoke-rc.d tinc restart' whenever it suits you."
|
|
||||||
msgstr ""
|
|
||||||
"Pokud zamítnete, musíte po aktualizaci restartovat tinc ruènì, zadáním "
|
|
||||||
"pøíkazu `invoke-rc.d tinc restart' kdykoliv se vám to hodí."
|
|
||||||
55
debian/po/de.po
vendored
55
debian/po/de.po
vendored
|
|
@ -1,55 +0,0 @@
|
||||||
# Translation of tinc debconf templates to German
|
|
||||||
# Copyright (C) Helge Kreutzmann <debian@helgefjell.de>, 2007.
|
|
||||||
# This file is distributed under the same license as the tinc package.
|
|
||||||
#
|
|
||||||
msgid ""
|
|
||||||
msgstr ""
|
|
||||||
"Project-Id-Version: tinc 1.0.7-1\n"
|
|
||||||
"Report-Msgid-Bugs-To: tinc@packages.debian.org\n"
|
|
||||||
"POT-Creation-Date: 2007-01-13 20:22+0100\n"
|
|
||||||
"PO-Revision-Date: 2007-02-25 16:43+0100\n"
|
|
||||||
"Last-Translator: Helge Kreutzmann <debian@helgefjell.de>\n"
|
|
||||||
"Language-Team: German <debian-l10n-german@lists.debian.org>\n"
|
|
||||||
"MIME-Version: 1.0\n"
|
|
||||||
"Content-Type: text/plain; charset=ISO-8859-15\n"
|
|
||||||
"Content-Transfer-Encoding: 8bit\n"
|
|
||||||
|
|
||||||
#. Type: boolean
|
|
||||||
#. Description
|
|
||||||
#: ../tinc.templates:1001
|
|
||||||
msgid "Restart tinc on each upgrade?"
|
|
||||||
msgstr "Tinc bei jedem Upgrade neu starten?"
|
|
||||||
|
|
||||||
#. Type: boolean
|
|
||||||
#. Description
|
|
||||||
#: ../tinc.templates:1001
|
|
||||||
msgid ""
|
|
||||||
"You may choose if you want me to restart the tinc daemon every time you "
|
|
||||||
"install a new version of this package."
|
|
||||||
msgstr ""
|
|
||||||
"Sie können dies auswählen, falls Sie möchten, dass jedes mal, wenn Sie eine "
|
|
||||||
"neue Version installieren, Tinc neu gestartet werden soll."
|
|
||||||
|
|
||||||
#. Type: boolean
|
|
||||||
#. Description
|
|
||||||
#: ../tinc.templates:1001
|
|
||||||
msgid ""
|
|
||||||
"Sometimes you don't want to do this, for example if you are doing the "
|
|
||||||
"upgrade over a tunnel that is created with tinc. Stopping the daemon would "
|
|
||||||
"probably leave you with a dead connection, and tinc may not be started again."
|
|
||||||
msgstr ""
|
|
||||||
"In manchen Situationen ist dies nicht gewollt, zum Beispiel falls Sie das "
|
|
||||||
"Upgrade über einen Tunnel durchführen, der mit Tinc erstellt wurde. Würde "
|
|
||||||
"dann der Daemon beendet, wäre die Kommunikation tot und Tinc könnte sich "
|
|
||||||
"nicht neu starten."
|
|
||||||
|
|
||||||
#. Type: boolean
|
|
||||||
#. Description
|
|
||||||
#: ../tinc.templates:1001
|
|
||||||
msgid ""
|
|
||||||
"If you refuse, you have to restart tinc yourself if you upgraded, by typing "
|
|
||||||
"`invoke-rc.d tinc restart' whenever it suits you."
|
|
||||||
msgstr ""
|
|
||||||
"Falls Sie hier ablehnen, müssen Sie Tinc selbst neu starten, wenn Sie ein "
|
|
||||||
"Upgrade durchgeführt haben, indem Sie »invoke-rc.d tinc restart« eingeben, "
|
|
||||||
"wenn es Ihnen passt."
|
|
||||||
62
debian/po/fr.po
vendored
62
debian/po/fr.po
vendored
|
|
@ -1,62 +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: tinc_1.0.3-4\n"
|
|
||||||
"Report-Msgid-Bugs-To: \n"
|
|
||||||
"POT-Creation-Date: 2004-11-11 20:06+0000\n"
|
|
||||||
"PO-Revision-Date: 2005-02-18 12:42+0100\n"
|
|
||||||
"Last-Translator: Michel Grentzinger <mic.grentz@online.fr>\n"
|
|
||||||
"Language-Team: French <debian-l10n-french@lists.debian.org>\n"
|
|
||||||
"MIME-Version: 1.0\n"
|
|
||||||
"Content-Type: text/plain; charset=ISO-8859-15\n"
|
|
||||||
"Content-Transfer-Encoding: 8bit\n"
|
|
||||||
|
|
||||||
#. Type: boolean
|
|
||||||
#. Description
|
|
||||||
#: ../tinc.templates:4
|
|
||||||
msgid "Restart tinc on each upgrade?"
|
|
||||||
msgstr "Faut-il redémarrer tinc à chaque mise à jour ?"
|
|
||||||
|
|
||||||
#. Type: boolean
|
|
||||||
#. Description
|
|
||||||
#: ../tinc.templates:4
|
|
||||||
msgid ""
|
|
||||||
"You may choose if you want me to restart the tinc daemon every time you "
|
|
||||||
"install a new version of this package."
|
|
||||||
msgstr ""
|
|
||||||
"Vous pouvez choisir de redémarrer le démon tinc à chaque fois que vous "
|
|
||||||
"installez une nouvelle version de ce paquet."
|
|
||||||
|
|
||||||
#. Type: boolean
|
|
||||||
#. Description
|
|
||||||
#: ../tinc.templates:4
|
|
||||||
msgid ""
|
|
||||||
"Sometimes you don't want to do this, for example if you are doing the "
|
|
||||||
"upgrade over a tunnel that is created with tinc. Stopping the daemon would "
|
|
||||||
"probably leave you with a dead connection, and tinc may not be started again."
|
|
||||||
msgstr ""
|
|
||||||
"Dans certains cas, vous devrez éviter de le faire, par exemple si vous "
|
|
||||||
"mettez à jour à travers un tunnel créé avec tinc. Arrêter le démon "
|
|
||||||
"laisserait sans doute une connexion inactive et tinc ne pourrait pas être "
|
|
||||||
"redémarré."
|
|
||||||
|
|
||||||
#. Type: boolean
|
|
||||||
#. Description
|
|
||||||
#: ../tinc.templates:4
|
|
||||||
msgid ""
|
|
||||||
"If you refuse, you have to restart tinc yourself if you upgraded, by typing "
|
|
||||||
"`invoke-rc.d tinc restart' whenever it suits you."
|
|
||||||
msgstr ""
|
|
||||||
"Si vous refusez cette option, vous devrez redémarrer tinc vous-même en cas "
|
|
||||||
"de mise à jour, avec la commande : « invoke-rc.d tinc restart », au moment "
|
|
||||||
"où cela vous conviendra."
|
|
||||||
49
debian/po/ja.po
vendored
49
debian/po/ja.po
vendored
|
|
@ -1,49 +0,0 @@
|
||||||
msgid ""
|
|
||||||
msgstr ""
|
|
||||||
"Project-Id-Version: tinc 1.0.4-1\n"
|
|
||||||
"Report-Msgid-Bugs-To: \n"
|
|
||||||
"POT-Creation-Date: 2004-11-11 20:06+0000\n"
|
|
||||||
"PO-Revision-Date: 2005-06-14 21:09+0900\n"
|
|
||||||
"Last-Translator: Atsushi Shimono <shimono@kwasan.kyoto-u.ac.jp>\n"
|
|
||||||
"Language-Team: Japanese <debian-japanese@lists.debian.org>\n"
|
|
||||||
"MIME-Version: 1.0\n"
|
|
||||||
"Content-Type: text/plain; charset=EUC-JP\n"
|
|
||||||
"Content-Transfer-Encoding: 8bit\n"
|
|
||||||
|
|
||||||
#. Type: boolean
|
|
||||||
#. Description
|
|
||||||
#: ../tinc.templates:4
|
|
||||||
msgid "Restart tinc on each upgrade?"
|
|
||||||
msgstr "アップグレードのたびに tinc を再起動しますか？"
|
|
||||||
|
|
||||||
#. Type: boolean
|
|
||||||
#. Description
|
|
||||||
#: ../tinc.templates:4
|
|
||||||
msgid ""
|
|
||||||
"You may choose if you want me to restart the tinc daemon every time you "
|
|
||||||
"install a new version of this package."
|
|
||||||
msgstr ""
|
|
||||||
"このパッケージの新しいバージョンをインストールするたびに、tinc デーモンを"
|
|
||||||
"再起動するかどうかを選択できます。"
|
|
||||||
|
|
||||||
#. Type: boolean
|
|
||||||
#. Description
|
|
||||||
#: ../tinc.templates:4
|
|
||||||
msgid ""
|
|
||||||
"Sometimes you don't want to do this, for example if you are doing the "
|
|
||||||
"upgrade over a tunnel that is created with tinc. Stopping the daemon would "
|
|
||||||
"probably leave you with a dead connection, and tinc may not be started again."
|
|
||||||
msgstr ""
|
|
||||||
"tinc のトンネルを経由してアップグレードを行っているときなど、これを行い"
|
|
||||||
"たくないことがあると思います。デーモンを止めることで接続が失われ、tinc "
|
|
||||||
"も再起動しなくなります。"
|
|
||||||
|
|
||||||
#. Type: boolean
|
|
||||||
#. Description
|
|
||||||
#: ../tinc.templates:4
|
|
||||||
msgid ""
|
|
||||||
"If you refuse, you have to restart tinc yourself if you upgraded, by typing "
|
|
||||||
"`invoke-rc.d tinc restart' whenever it suits you."
|
|
||||||
msgstr ""
|
|
||||||
"これを選択しない場合、アップグレードを行った際、都合が良いときに "
|
|
||||||
"'invoke-rc.d tinc restart' を実行して tinc を自分で再起動する必要があります。"
|
|
||||||
63
debian/po/nl.po
vendored
63
debian/po/nl.po
vendored
|
|
@ -1,63 +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: tinc_1.0.4-1\n"
|
|
||||||
"Report-Msgid-Bugs-To: \n"
|
|
||||||
"POT-Creation-Date: 2004-11-11 20:06+0000\n"
|
|
||||||
"PO-Revision-Date: 2005-05-04 21:40+0200\n"
|
|
||||||
"Last-Translator: Guus Sliepen <guus@debian.org>\n"
|
|
||||||
"Language-Team: Dutch <nl@li.org>\n"
|
|
||||||
"MIME-Version: 1.0\n"
|
|
||||||
"Content-Type: text/plain; charset=UTF-8\n"
|
|
||||||
"Content-Transfer-Encoding: 8bit\n"
|
|
||||||
|
|
||||||
#. Type: boolean
|
|
||||||
#. Description
|
|
||||||
#: ../tinc.templates:4
|
|
||||||
msgid "Restart tinc on each upgrade?"
|
|
||||||
msgstr "Start tinc opnieuw na iedere upgrade?"
|
|
||||||
|
|
||||||
#. Type: boolean
|
|
||||||
#. Description
|
|
||||||
#: ../tinc.templates:4
|
|
||||||
msgid ""
|
|
||||||
"You may choose if you want me to restart the tinc daemon every time you "
|
|
||||||
"install a new version of this package."
|
|
||||||
msgstr ""
|
|
||||||
"Je kunt kiezen of ik de tinc daemon opnieuw moet starten iedere keer als je "
|
|
||||||
"een nieuwe versie van het pakket installeert."
|
|
||||||
|
|
||||||
#. Type: boolean
|
|
||||||
#. Description
|
|
||||||
#: ../tinc.templates:4
|
|
||||||
msgid ""
|
|
||||||
"Sometimes you don't want to do this, for example if you are doing the "
|
|
||||||
"upgrade over a tunnel that is created with tinc. Stopping the daemon would "
|
|
||||||
"probably leave you with a dead connection, and tinc may not be started again."
|
|
||||||
msgstr ""
|
|
||||||
"Soms wil je dit niet doen, bij voorbeeld als je de upgrade uitvoert over een "
|
|
||||||
"tunnel die met tinc is gemaakt. Het stoppen van tinc resulteert dan "
|
|
||||||
"waarschijnlijk is een dode verbinding, en tinc wordt dan misschien niet "
|
|
||||||
"opnieuw gestart."
|
|
||||||
|
|
||||||
#. Type: boolean
|
|
||||||
#. Description
|
|
||||||
#: ../tinc.templates:4
|
|
||||||
msgid ""
|
|
||||||
"If you refuse, you have to restart tinc yourself if you upgraded, by typing "
|
|
||||||
"`invoke-rc.d tinc restart' whenever it suits you."
|
|
||||||
msgstr ""
|
|
||||||
"Als je weigert, moet je zelf tinc opnieuw starten na een upgrade, door"
|
|
||||||
"`invoke-rc.d tinc restart' in te tiepen wanneer het goed uitkomt."
|
|
||||||
56
debian/po/pt.po
vendored
56
debian/po/pt.po
vendored
|
|
@ -1,56 +0,0 @@
|
||||||
# translation of tinc debconf to Portuguese
|
|
||||||
# Copyright (C) 2007 Américo Monteiro
|
|
||||||
# This file is distributed under the same license as the tinc package.
|
|
||||||
#
|
|
||||||
# Américo Monteiro <a_monteiro@netcabo.pt>, 2007.
|
|
||||||
msgid ""
|
|
||||||
msgstr ""
|
|
||||||
"Project-Id-Version: tinc_1.0.8-1_templates\n"
|
|
||||||
"Report-Msgid-Bugs-To: \n"
|
|
||||||
"POT-Creation-Date: 2007-05-25 04:46+0200\n"
|
|
||||||
"PO-Revision-Date: 2007-07-21 16:38+0100\n"
|
|
||||||
"Last-Translator: Américo Monteiro <a_monteiro@netcabo.pt>\n"
|
|
||||||
"Language-Team: Portuguese <traduz@debianpt.org>\n"
|
|
||||||
"MIME-Version: 1.0\n"
|
|
||||||
"Content-Type: text/plain; charset=UTF-8\n"
|
|
||||||
"Content-Transfer-Encoding: 8bit\n"
|
|
||||||
"X-Generator: KBabel 1.11.4\n"
|
|
||||||
|
|
||||||
#. Type: boolean
|
|
||||||
#. Description
|
|
||||||
#: ../tinc.templates:1001
|
|
||||||
msgid "Restart tinc on each upgrade?"
|
|
||||||
msgstr "Reiniciar o tinc em cada actualização?"
|
|
||||||
|
|
||||||
#. Type: boolean
|
|
||||||
#. Description
|
|
||||||
#: ../tinc.templates:1001
|
|
||||||
msgid ""
|
|
||||||
"You may choose if you want me to restart the tinc daemon every time you "
|
|
||||||
"install a new version of this package."
|
|
||||||
msgstr ""
|
|
||||||
"Você pode escolher se quer eu reinicie o serviço tinc toda a vez que instalar "
|
|
||||||
"uma nova versão deste pacote."
|
|
||||||
|
|
||||||
#. Type: boolean
|
|
||||||
#. Description
|
|
||||||
#: ../tinc.templates:1001
|
|
||||||
msgid ""
|
|
||||||
"Sometimes you don't want to do this, for example if you are doing the "
|
|
||||||
"upgrade over a tunnel that is created with tinc. Stopping the daemon would "
|
|
||||||
"probably leave you with a dead connection, and tinc may not be started again."
|
|
||||||
msgstr ""
|
|
||||||
"Por vezes você não querer que isto aconteça, por exemplo, se estiver a fazer "
|
|
||||||
"a actualização por um túnel que é criado pelo tinc. Parando o serviço iria provavelmente "
|
|
||||||
"deixá-lo com uma ligação morta, e o tinc poderia não arrancar de novo."
|
|
||||||
|
|
||||||
#. Type: boolean
|
|
||||||
#. Description
|
|
||||||
#: ../tinc.templates:1001
|
|
||||||
msgid ""
|
|
||||||
"If you refuse, you have to restart tinc yourself if you upgraded, by typing "
|
|
||||||
"`invoke-rc.d tinc restart' whenever it suits you."
|
|
||||||
msgstr ""
|
|
||||||
"Se recusar, terá que ser você a reiniciar o tinc se o actualizar, escrevendo "
|
|
||||||
"'invoke-rc.d tinc restart' ou outro comando que lhe sirva."
|
|
||||||
|
|
||||||
58
debian/po/ru.po
vendored
58
debian/po/ru.po
vendored
|
|
@ -1,58 +0,0 @@
|
||||||
# translation of tinc_1.0.9-1_ru.po to Russian
|
|
||||||
# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
|
|
||||||
# This file is distributed under the same license as the PACKAGE package.
|
|
||||||
#
|
|
||||||
# Yuri Kozlov <yuray@komyakino.ru>, 2009.
|
|
||||||
msgid ""
|
|
||||||
msgstr ""
|
|
||||||
"Project-Id-Version: tinc 1.0.9-1\n"
|
|
||||||
"Report-Msgid-Bugs-To: \n"
|
|
||||||
"POT-Creation-Date: 2008-12-27 10:27+0100\n"
|
|
||||||
"PO-Revision-Date: 2009-09-13 09:42+0400\n"
|
|
||||||
"Last-Translator: Yuri Kozlov <yuray@komyakino.ru>\n"
|
|
||||||
"Language-Team: Russian <debian-l10n-russian@lists.debian.org>\n"
|
|
||||||
"MIME-Version: 1.0\n"
|
|
||||||
"Content-Type: text/plain; charset=UTF-8\n"
|
|
||||||
"Content-Transfer-Encoding: 8bit\n"
|
|
||||||
"X-Generator: KBabel 1.11.4\n"
|
|
||||||
"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
|
|
||||||
|
|
||||||
#. Type: boolean
|
|
||||||
#. Description
|
|
||||||
#: ../tinc.templates:1001
|
|
||||||
msgid "Restart tinc on each upgrade?"
|
|
||||||
msgstr "Перезапускать tinc после каждого обновления?"
|
|
||||||
|
|
||||||
#. Type: boolean
|
|
||||||
#. Description
|
|
||||||
#: ../tinc.templates:1001
|
|
||||||
msgid ""
|
|
||||||
"You may choose if you want me to restart the tinc daemon every time you "
|
|
||||||
"install a new version of this package."
|
|
||||||
msgstr ""
|
|
||||||
"Вы можете указать, что нужно перезапускать службу tinc каждый раз при "
|
|
||||||
"установке новой версии данного пакета."
|
|
||||||
|
|
||||||
#. Type: boolean
|
|
||||||
#. Description
|
|
||||||
#: ../tinc.templates:1001
|
|
||||||
msgid ""
|
|
||||||
"Sometimes you don't want to do this, for example if you are doing the "
|
|
||||||
"upgrade over a tunnel that is created with tinc. Stopping the daemon would "
|
|
||||||
"probably leave you with a dead connection, and tinc may not be started again."
|
|
||||||
msgstr ""
|
|
||||||
"Иногда вы не хотели бы это делать, например, если вы производите "
|
|
||||||
"обновление через туннель, созданный с помощью tinc. Остановка службы, "
|
|
||||||
"скорее всего, приведёт к повисшему соединению, и tinc не сможет запуститься "
|
|
||||||
"снова."
|
|
||||||
|
|
||||||
#. Type: boolean
|
|
||||||
#. Description
|
|
||||||
#: ../tinc.templates:1001
|
|
||||||
msgid ""
|
|
||||||
"If you refuse, you have to restart tinc yourself if you upgraded, by typing "
|
|
||||||
"`invoke-rc.d tinc restart' whenever it suits you."
|
|
||||||
msgstr ""
|
|
||||||
"Если ответите отрицательно, то вам нужно перезапустить tinc вручную с помощью "
|
|
||||||
"команды `invoke-rc.d tinc restart' в более удобное время."
|
|
||||||
|
|
||||||
62
debian/po/sv.po
vendored
62
debian/po/sv.po
vendored
|
|
@ -1,62 +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: tinc 1.0.4-3\n"
|
|
||||||
"Report-Msgid-Bugs-To: \n"
|
|
||||||
"POT-Creation-Date: 2004-11-11 20:06+0000\n"
|
|
||||||
"PO-Revision-Date: 2005-10-10 22:06+0200\n"
|
|
||||||
"Last-Translator: Daniel Nylander <po@danielnylander.se>\n"
|
|
||||||
"Language-Team: Swedish <sv@li.org>\n"
|
|
||||||
"MIME-Version: 1.0\n"
|
|
||||||
"Content-Type: text/plain; charset=iso-8859-1\n"
|
|
||||||
"Content-Transfer-Encoding: 8bit"
|
|
||||||
|
|
||||||
#. Type: boolean
|
|
||||||
#. Description
|
|
||||||
#: ../tinc.templates:4
|
|
||||||
msgid "Restart tinc on each upgrade?"
|
|
||||||
msgstr "Starta om tinc vid varje uppgradering?"
|
|
||||||
|
|
||||||
#. Type: boolean
|
|
||||||
#. Description
|
|
||||||
#: ../tinc.templates:4
|
|
||||||
msgid ""
|
|
||||||
"You may choose if you want me to restart the tinc daemon every time you "
|
|
||||||
"install a new version of this package."
|
|
||||||
msgstr ""
|
|
||||||
"Du kan välja om du vill att jag startar om tinc-daemonen varje gång du installerar en "
|
|
||||||
"ny version av detta paket."
|
|
||||||
|
|
||||||
#. Type: boolean
|
|
||||||
#. Description
|
|
||||||
#: ../tinc.templates:4
|
|
||||||
msgid ""
|
|
||||||
"Sometimes you don't want to do this, for example if you are doing the "
|
|
||||||
"upgrade over a tunnel that is created with tinc. Stopping the daemon would "
|
|
||||||
"probably leave you with a dead connection, and tinc may not be started again."
|
|
||||||
msgstr ""
|
|
||||||
"Ibland vill du kanske inte göra detta, till exempel om du gör en uppgradering "
|
|
||||||
"via en tunnel som är skapad med tinc. Stoppa daemonen skulle antagligen koppla ner "
|
|
||||||
"förbindelsen och tinc kan inte startas igen."
|
|
||||||
|
|
||||||
#. Type: boolean
|
|
||||||
#. Description
|
|
||||||
#: ../tinc.templates:4
|
|
||||||
msgid ""
|
|
||||||
"If you refuse, you have to restart tinc yourself if you upgraded, by typing "
|
|
||||||
"`invoke-rc.d tinc restart' whenever it suits you."
|
|
||||||
msgstr ""
|
|
||||||
"Om du vägrar måste du starta om tinc själv om du uppgraderat, genom att skriva "
|
|
||||||
"'invoke-rc.d tinc restart' när det passar dig."
|
|
||||||
|
|
||||||
56
debian/po/templates.pot
vendored
56
debian/po/templates.pot
vendored
|
|
@ -1,56 +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-11-11 20:06+0000\n"
|
|
||||||
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
|
|
||||||
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
|
|
||||||
"Language-Team: LANGUAGE <LL@li.org>\n"
|
|
||||||
"MIME-Version: 1.0\n"
|
|
||||||
"Content-Type: text/plain; charset=CHARSET\n"
|
|
||||||
"Content-Transfer-Encoding: 8bit\n"
|
|
||||||
|
|
||||||
#. Type: boolean
|
|
||||||
#. Description
|
|
||||||
#: ../tinc.templates:4
|
|
||||||
msgid "Restart tinc on each upgrade?"
|
|
||||||
msgstr ""
|
|
||||||
|
|
||||||
#. Type: boolean
|
|
||||||
#. Description
|
|
||||||
#: ../tinc.templates:4
|
|
||||||
msgid ""
|
|
||||||
"You may choose if you want me to restart the tinc daemon every time you "
|
|
||||||
"install a new version of this package."
|
|
||||||
msgstr ""
|
|
||||||
|
|
||||||
#. Type: boolean
|
|
||||||
#. Description
|
|
||||||
#: ../tinc.templates:4
|
|
||||||
msgid ""
|
|
||||||
"Sometimes you don't want to do this, for example if you are doing the "
|
|
||||||
"upgrade over a tunnel that is created with tinc. Stopping the daemon would "
|
|
||||||
"probably leave you with a dead connection, and tinc may not be started again."
|
|
||||||
msgstr ""
|
|
||||||
|
|
||||||
#. Type: boolean
|
|
||||||
#. Description
|
|
||||||
#: ../tinc.templates:4
|
|
||||||
msgid ""
|
|
||||||
"If you refuse, you have to restart tinc yourself if you upgraded, by typing "
|
|
||||||
"`invoke-rc.d tinc restart' whenever it suits you."
|
|
||||||
msgstr ""
|
|
||||||
48
debian/po/vi.po
vendored
48
debian/po/vi.po
vendored
|
|
@ -1,48 +0,0 @@
|
||||||
# Vietnamese translation for tinc.
|
|
||||||
# Copyright © 2005 Free Software Foundation, Inc.
|
|
||||||
# Clytie Siddall <clytie@riverland.net.au>, 2005.
|
|
||||||
#
|
|
||||||
msgid ""
|
|
||||||
msgstr ""
|
|
||||||
"Project-Id-Version: tinc 1.0.4-2\n"
|
|
||||||
"Report-Msgid-Bugs-To: \n"
|
|
||||||
"POT-Creation-Date: 2004-11-11 20:06+0000\n"
|
|
||||||
"PO-Revision-Date: 2005-08-10 17:13+0930\n"
|
|
||||||
"Last-Translator: Clytie Siddall <clytie@riverland.net.au>\n"
|
|
||||||
"Language-Team: Vietnamese <gnomevi-list@lists.sourceforge.net>\n"
|
|
||||||
"MIME-Version: 1.0\n"
|
|
||||||
"Content-Type: text/plain; charset=utf-8\n"
|
|
||||||
"Content-Transfer-Encoding: 8bit\n"
|
|
||||||
"Plural-Forms: nplurals=1; plural=0\n"
|
|
||||||
"X-Generator: LocFactoryEditor 1.2.2\n"
|
|
||||||
|
|
||||||
#. Type: boolean
|
|
||||||
#. Description
|
|
||||||
#: ../tinc.templates:4
|
|
||||||
msgid "Restart tinc on each upgrade?"
|
|
||||||
msgstr "Khởi chạy lại trình tinc mỗi lần nâng cấp không?"
|
|
||||||
|
|
||||||
#. Type: boolean
|
|
||||||
#. Description
|
|
||||||
#: ../tinc.templates:4
|
|
||||||
msgid ""
|
|
||||||
"You may choose if you want me to restart the tinc daemon every time you "
|
|
||||||
"install a new version of this package."
|
|
||||||
msgstr "Tại đây bạn có thể chọn tự động khởi chạy lại trình nền (dæmon) tinc mỗi lần bạn cài đặt phiên bản mới của gói này hay không."
|
|
||||||
|
|
||||||
#. Type: boolean
|
|
||||||
#. Description
|
|
||||||
#: ../tinc.templates:4
|
|
||||||
msgid ""
|
|
||||||
"Sometimes you don't want to do this, for example if you are doing the "
|
|
||||||
"upgrade over a tunnel that is created with tinc. Stopping the daemon would "
|
|
||||||
"probably leave you with a dead connection, and tinc may not be started again."
|
|
||||||
msgstr "Đôi khi bạn không muốn làm như thế, lấy thí dụ nếu bạn đang nâng cấp qua đường hầm mà tinc tạo. Trong trường hợp này, ngừng trình nền rất có thể sẽ ngắt kết nối, và có lẽ tinc sẽ không khởi chạy lại."
|
|
||||||
|
|
||||||
#. Type: boolean
|
|
||||||
#. Description
|
|
||||||
#: ../tinc.templates:4
|
|
||||||
msgid ""
|
|
||||||
"If you refuse, you have to restart tinc yourself if you upgraded, by typing "
|
|
||||||
"`invoke-rc.d tinc restart' whenever it suits you."
|
|
||||||
msgstr "Nếu bạn từ chối thì bạn cần phải tự khởi chạy lại trình tinc mỗi lần nâng cấp, bằng cách gõ lệnh « invoke-rc.d tinc restart » (gọi-rc.d tinc khởi chạy lại) khi thích hợp."
|
|
||||||
54
debian/postinst
vendored
54
debian/postinst
vendored
|
|
@ -1,49 +1,9 @@
|
||||||
#! /bin/sh
|
#! /bin/sh
|
||||||
# postinst script for tinc
|
|
||||||
#
|
|
||||||
# $Id: postinst,v 1.6 2000/05/21 23:01:28 zarq Exp $
|
|
||||||
#
|
|
||||||
# see: dh_installdeb(1)
|
|
||||||
|
|
||||||
TCONF="/etc/tinc"
|
NETSFILE="/etc/tinc/nets.boot"
|
||||||
NETSFILE="$TCONF/nets.boot"
|
|
||||||
RET="false"
|
|
||||||
|
|
||||||
set -e
|
set -e
|
||||||
|
|
||||||
# summary of how this script can be called:
|
|
||||||
# * <postinst> `configure' <most-recently-configured-version>
|
|
||||||
# * <old-postinst> `abort-upgrade' <new version>
|
|
||||||
# * <conflictor's-postinst> `abort-remove' `in-favour' <package>
|
|
||||||
# <new-version>
|
|
||||||
# * <deconfigured's-postinst> `abort-deconfigure' `in-favour'
|
|
||||||
# <failed-install-package> <version> `removing'
|
|
||||||
# <conflicting-package> <version>
|
|
||||||
# for details, see /usr/doc/packaging-manual/
|
|
||||||
#
|
|
||||||
# quoting from the policy:
|
|
||||||
# Any necessary prompting should almost always be confined to the
|
|
||||||
# post-installation script, and should be protected with a conditional
|
|
||||||
# so that unnecessary prompting doesn't happen if a package's
|
|
||||||
# installation fails and the `postinst' is called with `abort-upgrade',
|
|
||||||
# `abort-remove' or `abort-deconfigure'.
|
|
||||||
|
|
||||||
if [ -x "/etc/init.d/tinc" ]; then
|
|
||||||
if [ "$1" = "configure" ] ; then
|
|
||||||
if dpkg --compare-versions "$2" lt "1.0pre5-4" ; then
|
|
||||||
RET="true"
|
|
||||||
else
|
|
||||||
if [ -e /usr/share/debconf/confmodule ] ; then
|
|
||||||
. /usr/share/debconf/confmodule
|
|
||||||
db_get tinc/restart_on_upgrade
|
|
||||||
db_stop
|
|
||||||
else
|
|
||||||
RET="true"
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
|
|
||||||
case "$1" in
|
case "$1" in
|
||||||
configure)
|
configure)
|
||||||
if [ ! -e /dev/.devfsd ] ; then if [ ! -e /dev/.devfs ] ; then
|
if [ ! -e /dev/.devfsd ] ; then if [ ! -e /dev/.devfs ] ; then
|
||||||
|
|
@ -56,17 +16,9 @@ case "$1" in
|
||||||
if [ ! -e $NETSFILE ] ; then
|
if [ ! -e $NETSFILE ] ; then
|
||||||
echo "## This file contains all names of the networks to be started on system startup." > $NETSFILE
|
echo "## This file contains all names of the networks to be started on system startup." > $NETSFILE
|
||||||
fi
|
fi
|
||||||
|
;;
|
||||||
if [ "$RET" = "true" ] ; then
|
|
||||||
invoke-rc.d tinc restart
|
|
||||||
else
|
|
||||||
echo "I have not stopped or restarted the tinc daemon. You should do this"
|
|
||||||
echo "yourself whenever you're ready; type \`\`invoke-rc.d tinc restart''."
|
|
||||||
fi
|
|
||||||
;;
|
|
||||||
|
|
||||||
abort-upgrade|abort-remove|abort-deconfigure)
|
abort-upgrade|abort-remove|abort-deconfigure)
|
||||||
|
|
||||||
;;
|
;;
|
||||||
|
|
||||||
*)
|
*)
|
||||||
|
|
@ -76,5 +28,3 @@ case "$1" in
|
||||||
esac
|
esac
|
||||||
|
|
||||||
#DEBHELPER#
|
#DEBHELPER#
|
||||||
|
|
||||||
exit 0
|
|
||||||
|
|
|
||||||
4
debian/postrm
vendored
4
debian/postrm
vendored
|
|
@ -1,9 +1,9 @@
|
||||||
#!/bin/sh
|
#!/bin/sh
|
||||||
|
|
||||||
set -e
|
set -e
|
||||||
# Automatically added by package maintainer
|
|
||||||
if [ "$1" = purge ]; then
|
if [ "$1" = purge ]; then
|
||||||
rm -f /etc/tinc/nets.boot
|
rm -f /etc/tinc/nets.boot
|
||||||
fi
|
fi
|
||||||
# End automatically added section
|
|
||||||
|
|
||||||
#DEBHELPER#
|
#DEBHELPER#
|
||||||
|
|
|
||||||
20
debian/prerm
vendored
20
debian/prerm
vendored
|
|
@ -1,20 +0,0 @@
|
||||||
#!/bin/sh
|
|
||||||
|
|
||||||
set -e
|
|
||||||
|
|
||||||
# Automatically added by dh_installinit, edited for use with debconf
|
|
||||||
if [ -x "/etc/init.d/tinc" -a "$1" != "upgrade" ]; then
|
|
||||||
if [ -e /usr/share/debconf/confmodule ] ; then
|
|
||||||
. /usr/share/debconf/confmodule
|
|
||||||
db_get tinc/restart_on_upgrade
|
|
||||||
if [ "$RET" = "true" ] ; then
|
|
||||||
invoke-rc.d tinc stop
|
|
||||||
fi
|
|
||||||
db_stop
|
|
||||||
else
|
|
||||||
invoke-rc.d tinc stop
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
# End automatically added section
|
|
||||||
|
|
||||||
#DEBHELPER#
|
|
||||||
3
debian/rules
vendored
3
debian/rules
vendored
|
|
@ -25,6 +25,9 @@ override_dh_auto_install:
|
||||||
# Remove info dir file
|
# Remove info dir file
|
||||||
rm -f debian/tinc/usr/share/info/dir
|
rm -f debian/tinc/usr/share/info/dir
|
||||||
|
|
||||||
|
override_dh_installinit:
|
||||||
|
dh_installinit -R
|
||||||
|
|
||||||
override_dh_clean:
|
override_dh_clean:
|
||||||
dh_clean
|
dh_clean
|
||||||
rm -f src/device.c
|
rm -f src/device.c
|
||||||
|
|
|
||||||
14
debian/tinc.templates
vendored
14
debian/tinc.templates
vendored
|
|
@ -1,14 +0,0 @@
|
||||||
Template: tinc/restart_on_upgrade
|
|
||||||
Type: boolean
|
|
||||||
Default: true
|
|
||||||
_Description: Restart tinc on each upgrade?
|
|
||||||
You may choose if you want me to restart the tinc daemon every time you
|
|
||||||
install a new version of this package.
|
|
||||||
.
|
|
||||||
Sometimes you don't want to do this, for example if you are doing the
|
|
||||||
upgrade over a tunnel that is created with tinc. Stopping the daemon
|
|
||||||
would probably leave you with a dead connection, and tinc may not be
|
|
||||||
started again.
|
|
||||||
.
|
|
||||||
If you refuse, you have to restart tinc yourself if you upgraded, by
|
|
||||||
typing `invoke-rc.d tinc restart' whenever it suits you.
|
|
||||||
Loading…
Reference in a new issue