From 0fd2ac248d0f4f464580d17584fcd823212f7c34 Mon Sep 17 00:00:00 2001 From: Guus Sliepen Date: Tue, 13 Apr 2010 12:06:36 +0200 Subject: [PATCH] Import Debian changes 1.0.13-1 tinc (1.0.13-1) unstable; urgency=low * New upstream release. --- debian/changelog | 31 +++++++++++++------- debian/config | 9 ------ debian/control | 6 ++-- debian/init.d | 13 ++++++++- debian/po/POTFILES.in | 1 - debian/po/cs.po | 63 ---------------------------------------- debian/po/de.po | 55 ----------------------------------- debian/po/fr.po | 62 --------------------------------------- debian/po/ja.po | 49 ------------------------------- debian/po/nl.po | 63 ---------------------------------------- debian/po/pt.po | 56 ------------------------------------ debian/po/ru.po | 58 ------------------------------------- debian/po/sv.po | 62 --------------------------------------- debian/po/templates.pot | 56 ------------------------------------ debian/po/vi.po | 48 ------------------------------- debian/postinst | 64 ++--------------------------------------- debian/postrm | 5 ++-- debian/prerm | 20 ------------- debian/rules | 42 +++++++++++++++++---------- debian/source/format | 1 + debian/tinc.modules | 12 -------- debian/tinc.templates | 14 --------- 22 files changed, 67 insertions(+), 723 deletions(-) delete mode 100644 debian/config delete mode 100644 debian/po/POTFILES.in delete mode 100644 debian/po/cs.po delete mode 100644 debian/po/de.po delete mode 100644 debian/po/fr.po delete mode 100644 debian/po/ja.po delete mode 100644 debian/po/nl.po delete mode 100644 debian/po/pt.po delete mode 100644 debian/po/ru.po delete mode 100644 debian/po/sv.po delete mode 100644 debian/po/templates.pot delete mode 100644 debian/po/vi.po delete mode 100644 debian/prerm create mode 100644 debian/source/format delete mode 100644 debian/tinc.modules delete mode 100644 debian/tinc.templates diff --git a/debian/changelog b/debian/changelog index 7621427..75834bf 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,24 +1,33 @@ -tinc (1.0.13-1~bpo50) lenny-backports; urgency=low +tinc (1.0.13-1) unstable; urgency=low * New upstream release. - -- Guus Sliepen Thu, 02 Sep 2010 14:40:42 +0200 + -- Guus Sliepen Tue, 13 Apr 2010 12:06:36 +0200 -tinc (1.0.12-1~bpo50) lenny-backports; urgency=low +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 Tue, 02 Mar 2010 14:01:36 +0100 + +tinc (1.0.12-1) unstable; urgency=low * New upstream release. - * Keep debian/ from 1.0.11-1~bpo50. + * Bump Standards-Version. + * Migrate from CDBS to debhelper. + * Convert source package to 3.0 (quilt) format. + * Remove useless tinc.modules. * Use init.d script from Michael Tokarev, allowing per-network arguments to tincd. + * Remove update-rc.d calls from postinst and postrm. * Let the init.d script depend on $remote_fs. - -- Guus Sliepen Wed, 17 Feb 2010 22:00:31 +0000 - -tinc (1.0.11-1~bpo50+1) lenny-backports; urgency=low - - * Rebuild for lenny-backports. - - -- Guus Sliepen Thu, 04 Feb 2010 19:03:00 +0000 + -- Guus Sliepen Thu, 04 Feb 2010 00:56:45 +0100 tinc (1.0.11-1) unstable; urgency=low diff --git a/debian/config b/debian/config deleted file mode 100644 index ab660b8..0000000 --- a/debian/config +++ /dev/null @@ -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 diff --git a/debian/control b/debian/control index 73c20bc..f812c0a 100644 --- a/debian/control +++ b/debian/control @@ -2,13 +2,13 @@ Source: tinc Section: net Priority: optional Maintainer: Guus Sliepen -Standards-Version: 3.8.3 -Build-Depends: libssl-dev, debhelper (>= 7), gettext, texi2html, texinfo, zlib1g-dev, cdbs, liblzo2-dev +Standards-Version: 3.8.4 +Build-Depends: libssl-dev, debhelper (>= 7.0.50~), gettext, texi2html, texinfo, zlib1g-dev, liblzo2-dev Homepage: http://www.tinc-vpn.org/ Package: tinc Architecture: any -Depends: debconf | debconf-2.0, ${shlibs:Depends}, ${misc:Depends} +Depends: ${shlibs:Depends}, ${misc:Depends} Description: Virtual Private Network daemon tinc is a daemon with which you can create a virtual private network (VPN). One daemon can handle multiple connections, so you can diff --git a/debian/init.d b/debian/init.d index a7dd3cd..da1a386 100644 --- a/debian/init.d +++ b/debian/init.d @@ -54,7 +54,18 @@ reload() { $DAEMON -n $1 -kHUP } 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 "$@" } diff --git a/debian/po/POTFILES.in b/debian/po/POTFILES.in deleted file mode 100644 index e86992b..0000000 --- a/debian/po/POTFILES.in +++ /dev/null @@ -1 +0,0 @@ -[type: gettext/rfc822deb] tinc.templates diff --git a/debian/po/cs.po b/debian/po/cs.po deleted file mode 100644 index 6316375..0000000 --- a/debian/po/cs.po +++ /dev/null @@ -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 \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 -#: ../tinc.templates:4 -msgid "Restart tinc on each upgrade?" -msgstr "Restartovat tinc pi kad 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 "" -"Mete zvolit, zda restartovat tinc daemona pokad, kdy je instalovna " -"nov verze tohoto balku." - -#. 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 "" -"Nkdy tuto monost nepotebujete, napklad pokud provdte aktualizaci " -"pes tunel, kter je vytvoen pomoc tinc. Zastaven tohoto daemona " -"vm pravdpodobn zanech \"mrtv pipojen\" a navc 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 zamtnete, muste po aktualizaci restartovat tinc run, zadnm " -"pkazu `invoke-rc.d tinc restart' kdykoliv se vm to hod." diff --git a/debian/po/de.po b/debian/po/de.po deleted file mode 100644 index 9ab4408..0000000 --- a/debian/po/de.po +++ /dev/null @@ -1,55 +0,0 @@ -# Translation of tinc debconf templates to German -# Copyright (C) Helge Kreutzmann , 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 \n" -"Language-Team: German \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 knnen dies auswhlen, falls Sie mchten, 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 durchfhren, der mit Tinc erstellt wurde. Wrde " -"dann der Daemon beendet, wre die Kommunikation tot und Tinc knnte 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, mssen Sie Tinc selbst neu starten, wenn Sie ein " -"Upgrade durchgefhrt haben, indem Sie invoke-rc.d tinc restart eingeben, " -"wenn es Ihnen passt." diff --git a/debian/po/fr.po b/debian/po/fr.po deleted file mode 100644 index b34e478..0000000 --- a/debian/po/fr.po +++ /dev/null @@ -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 \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 -#: ../tinc.templates:4 -msgid "Restart tinc on each upgrade?" -msgstr "Faut-il redmarrer 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 redmarrer le dmon 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. Arrter le dmon " -"laisserait sans doute une connexion inactive et tinc ne pourrait pas tre " -"redmarr." - -#. 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 redmarrer tinc vous-mme en cas " -"de mise jour, avec la commande: invoke-rc.d tinc restart, au moment " -"o cela vous conviendra." diff --git a/debian/po/ja.po b/debian/po/ja.po deleted file mode 100644 index 946afa4..0000000 --- a/debian/po/ja.po +++ /dev/null @@ -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 \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 -#: ../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 ʬǺƵưɬפޤ" diff --git a/debian/po/nl.po b/debian/po/nl.po deleted file mode 100644 index 660b235..0000000 --- a/debian/po/nl.po +++ /dev/null @@ -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 \n" -"Language-Team: Dutch \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." diff --git a/debian/po/pt.po b/debian/po/pt.po deleted file mode 100644 index 3f67afd..0000000 --- a/debian/po/pt.po +++ /dev/null @@ -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 , 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 \n" -"Language-Team: Portuguese \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." - diff --git a/debian/po/ru.po b/debian/po/ru.po deleted file mode 100644 index caab454..0000000 --- a/debian/po/ru.po +++ /dev/null @@ -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 , 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 \n" -"Language-Team: Russian \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' в более удобное время." - diff --git a/debian/po/sv.po b/debian/po/sv.po deleted file mode 100644 index aaa7347..0000000 --- a/debian/po/sv.po +++ /dev/null @@ -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 \n" -"Language-Team: Swedish \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 vlja om du vill att jag startar om tinc-daemonen varje gng 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 gra detta, till exempel om du gr en uppgradering " -"via en tunnel som r skapad med tinc. Stoppa daemonen skulle antagligen koppla ner " -"frbindelsen 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 vgrar mste du starta om tinc sjlv om du uppgraderat, genom att skriva " -"'invoke-rc.d tinc restart' nr det passar dig." - diff --git a/debian/po/templates.pot b/debian/po/templates.pot deleted file mode 100644 index eade3ff..0000000 --- a/debian/po/templates.pot +++ /dev/null @@ -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 \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 -#: ../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 "" diff --git a/debian/po/vi.po b/debian/po/vi.po deleted file mode 100644 index 8177667..0000000 --- a/debian/po/vi.po +++ /dev/null @@ -1,48 +0,0 @@ -# Vietnamese translation for tinc. -# Copyright © 2005 Free Software Foundation, Inc. -# Clytie Siddall , 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 \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" -"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." diff --git a/debian/postinst b/debian/postinst index 5233dae..62aea7e 100644 --- a/debian/postinst +++ b/debian/postinst @@ -1,54 +1,9 @@ #! /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="$TCONF/nets.boot" -RET="false" +NETSFILE="/etc/tinc/nets.boot" set -e -# summary of how this script can be called: -# * `configure' -# * `abort-upgrade' -# * `abort-remove' `in-favour' -# -# * `abort-deconfigure' `in-favour' -# `removing' -# -# 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'. - -# Automatically added by dh_installinit, edited for use with debconf -if [ -x "/etc/init.d/tinc" ]; then - update-rc.d tinc defaults >/dev/null - - 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 -# End automatically added section - - case "$1" in configure) if [ ! -e /dev/.devfsd ] ; then if [ ! -e /dev/.devfs ] ; then @@ -61,17 +16,9 @@ case "$1" in if [ ! -e $NETSFILE ] ; then echo "## This file contains all names of the networks to be started on system startup." > $NETSFILE 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) - ;; *) @@ -80,11 +27,4 @@ case "$1" in ;; esac -# dh_installdeb will replace this with shell code automatically -# generated by other debhelper scripts. - #DEBHELPER# - -exit 0 - - diff --git a/debian/postrm b/debian/postrm index e4fbf15..dc3247b 100644 --- a/debian/postrm +++ b/debian/postrm @@ -1,10 +1,9 @@ #!/bin/sh + set -e -# Automatically added by package maintainer + if [ "$1" = purge ]; then rm -f /etc/tinc/nets.boot - update-rc.d tinc remove >/dev/null 2>/dev/null fi -# End automatically added section #DEBHELPER# diff --git a/debian/prerm b/debian/prerm deleted file mode 100644 index 30347c0..0000000 --- a/debian/prerm +++ /dev/null @@ -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# diff --git a/debian/rules b/debian/rules index 7272f93..e1606c5 100755 --- a/debian/rules +++ b/debian/rules @@ -1,21 +1,33 @@ #!/usr/bin/make -f +# -*- makefile -*- +# Sample debian/rules that uses debhelper. +# This file was originally written by Joey Hess and Craig Small. +# As a special exception, when this file is copied by dh-make into a +# dh-make output file, you may use that output file without restriction. +# This special exception was added by Craig Small in version 0.37 of dh-make. -include /usr/share/cdbs/1/rules/debhelper.mk -#include /usr/share/cdbs/1/rules/simple-patchsys.mk -include /usr/share/cdbs/1/class/autotools.mk +# Uncomment this to turn on verbose mode. +#export DH_VERBOSE=1 -# A bit of a kludge, we have our own init.d handling in postinst, but -# cdbs calls dh_installinit anyway. -DEB_DH_INSTALLINIT_ARGS = -n +%: + dh $@ -clean:: - rm -rf src/device.c doc/tinc -build/tinc:: - cd doc && $(MAKE) texi2html -binary-post-install/tinc:: +override_dh_auto_build: + dh_auto_build + cd doc && $(MAKE) texi2html + +override_dh_auto_install: + dh_auto_install # Guess where texi2html installed its output today... [ -f doc/tinc/tinc.html ] \ - && mv -v doc/tinc/*.html debian/$(cdbs_curpkg)/usr/share/doc/$(cdbs_curpkg)/ \ - || mv -v doc/*.html debian/$(cdbs_curpkg)/usr/share/doc/$(cdbs_curpkg)/ - rm -f debian/$(cdbs_curpkg)/usr/share/info/dir* - cd debian/$(cdbs_curpkg)/usr/share/doc/$(cdbs_curpkg)/ && tar xzf ../../../../../../doc/sample-config.tar.gz && mv sample-config examples && rm -rf examples/CVS examples/hosts/CVS + && mv doc/tinc/*.html debian/tinc/usr/share/doc/tinc/ \ + || mv doc/*.html debian/tinc/usr/share/doc/tinc/ + # Remove info dir file + rm -f debian/tinc/usr/share/info/dir + +override_dh_installinit: + dh_installinit -R + +override_dh_clean: + dh_clean + rm -f src/device.c diff --git a/debian/source/format b/debian/source/format new file mode 100644 index 0000000..163aaf8 --- /dev/null +++ b/debian/source/format @@ -0,0 +1 @@ +3.0 (quilt) diff --git a/debian/tinc.modules b/debian/tinc.modules deleted file mode 100644 index edd98bb..0000000 --- a/debian/tinc.modules +++ /dev/null @@ -1,12 +0,0 @@ -alias char-major-36 netlink_dev -alias char-major-10-200 tun - -alias tap0 ethertap -alias tap1 ethertap -alias tap2 ethertap -alias tap3 ethertap - -options tap0 -o tap0 -x unit=0 -options tap1 -o tap1 -x unit=1 -options tap2 -o tap2 -x unit=2 -options tap3 -o tap3 -x unit=3 diff --git a/debian/tinc.templates b/debian/tinc.templates deleted file mode 100644 index 46578dc..0000000 --- a/debian/tinc.templates +++ /dev/null @@ -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.