From: Gerfried Fuchs Date: Sat, 29 Aug 2009 09:36:28 +0000 (+0200) Subject: Imported Debian patch 2.7.1-1 X-Git-Tag: debian/2.7.1-1^0 X-Git-Url: https://git.deb.at/?a=commitdiff_plain;h=137a894c83a7b3587044c2048418753c47f18d53;p=pkg%2Ft-prot.git Imported Debian patch 2.7.1-1 --- diff --git a/debian/changelog b/debian/changelog index e85c879..de12623 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,17 @@ +t-prot (2.7.1-1) unstable; urgency=low + + * New upstream release. + * Added debconf translations: + - Russian by Yuri Kozlov (closes: #543189) + - Estonian by Mattias Põldaru + - Euskara (Basque) by Piarres Beobide (closes: #543637) + - Italian by Luca Monducci (closes: #544159) + * Bumped Standards-Version to 3.8.3. + * Fixed typo in copyright file noticed by lintian: s/explicitely/explicitly/ + * Switch debianization licensing to BSD style. + + -- Gerfried Fuchs Sat, 29 Aug 2009 11:36:28 +0200 + t-prot (2.5-2) unstable; urgency=low * Added debconf translation: Swedish by Martin Ågren (closes: #492062) diff --git a/debian/config b/debian/config index 5363681..987f311 100644 --- a/debian/config +++ b/debian/config @@ -1,4 +1,7 @@ #!/bin/sh -e +# debconf config file for t-prot +# Copyright 2002-2009 by Gerfried Fuchs +# Licenced BSD style # Source debconf library. . /usr/share/debconf/confmodule diff --git a/debian/control b/debian/control index 7358e12..befe6d0 100644 --- a/debian/control +++ b/debian/control @@ -4,7 +4,7 @@ Priority: optional Maintainer: Gerfried Fuchs Build-Depends: quilt Build-Depends-Indep: po-debconf, patch -Standards-Version: 3.8.0 +Standards-Version: 3.8.3 Homepage: http://www.escape.de/~tolot/mutt/ Package: t-prot diff --git a/debian/copyright b/debian/copyright index f1c8cee..ca89e37 100644 --- a/debian/copyright +++ b/debian/copyright @@ -1,7 +1,8 @@ This package was initially debianized by Gerfried Fuchs on Tue, 29 Jan 2002 15:55:21 +0100. -The debianization is licensed the same way as t-prot itself. +The debianization is licensed under BSD style. +See /usr/share/common-licenses/BSD. It was downloaded from: ======================= @@ -14,10 +15,10 @@ Upstream Author: Copyright: ========== All of the documentation and software included in the t-prot releases - is copyrighted by Jochen Striepe (except when explicitely stated other‐ + is copyrighted by Jochen Striepe (except when explicitly stated other‐ wise). - Copyright (C) 2001-2007 Jochen Striepe. All rights reserved. + Copyright (C) 2001-2009 Jochen Striepe. All rights reserved. Redistribution and use, with or without modification, are permitted provided that the following conditions are met: diff --git a/debian/patches/01_fix-manpage b/debian/patches/01_fix-manpage index dd75f9f..2bcc7bc 100644 --- a/debian/patches/01_fix-manpage +++ b/debian/patches/01_fix-manpage @@ -1,10 +1,10 @@ Author: Gerfried Fuchs vim:ft=diff: Description: Escape hyphens in manpage where they mean the minus sign -Index: t-prot-2.5/t-prot.1 +Index: t-prot-2.7/t-prot.1 =================================================================== ---- t-prot-2.5.orig/t-prot.1 -+++ t-prot-2.5/t-prot.1 +--- t-prot-2.7.orig/t-prot.1 ++++ t-prot-2.7/t-prot.1 @@ -4,7 +4,7 @@ .SH NAME t-prot \- TOFU Protection - Display Filter for RFC 2822 messages @@ -159,7 +159,7 @@ Index: t-prot-2.5/t-prot.1 +Written by Jochen Striepe . .SH COPYRIGHT All of the documentation and software included in the t-prot releases - is copyrighted by Jochen Striepe (except when explicitely stated otherwise). + is copyrighted by Jochen Striepe (except when explicitly stated otherwise). @@ -629,7 +629,7 @@ t-prot team with some useful info, pleas .I display_filter facility, just set display_filter to something like diff --git a/debian/po/et.po b/debian/po/et.po new file mode 100644 index 0000000..d377ccd --- /dev/null +++ b/debian/po/et.po @@ -0,0 +1,30 @@ +# tprot Estonian translation +# Copyright (C) 2009 THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the t-prot package. +# Mattias Põldaru , 2009. +# +msgid "" +msgstr "" +"Project-Id-Version: t-prot\n" +"Report-Msgid-Bugs-To: t-prot@packages.debian.org\n" +"POT-Creation-Date: 2006-08-02 15:54-0500\n" +"PO-Revision-Date: 2009-08-23 11:57+0300\n" +"Last-Translator: Mattias Põldaru \n" +"Language-Team: Gnome Estonian Translation Team \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=utf-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Poedit-Language: Estonian\n" + +#. Type: boolean +#. Description +#: ../templates:1001 +msgid "Do you want to enable t-prot system wide for mutt?" +msgstr "Kas rakendada t-prot mutt-i seadistus kogu süsteemis?" + +#. Type: boolean +#. Description +#: ../templates:1001 +msgid "The t-prot package provides a config file /etc/Muttrc.t-prot -- to use the script from mutt you have to enable it. You can do this either by creating a symlink in /etc/Muttrc.d/ for systemwide usage (rather, this can be done automatically for you), or let the users decide to add a \"source\" line for it in their ~/.muttrc or ~/.mutt/muttrc. If you acknowledge this question the systemwide usage will be enabled." +msgstr "T-prot pakk sisaldab seadistusfaili /etc/Muttrc.t-prot -- et seda skripti mutt-iga kasutada, tuleb see lubada. Selleks võib kogu süsteemis kasutamiseks luua sümbolviida kataloogi /etc/Muttrc.d/ (või lasta selle automaatselt ära teha), või lasta kasutajatel lisada \"source\" rida nende ~/.muttrc või ~/.mutt/muttrc faili. Kui sa vastad sellele küsimusele jaatavalt, lülitatakse sisse kogu süsteemis kasutamine." + diff --git a/debian/po/eu.po b/debian/po/eu.po new file mode 100644 index 0000000..e8a6e71 --- /dev/null +++ b/debian/po/eu.po @@ -0,0 +1,44 @@ +# translation of templates.po to Euskara +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the t-prot package. +# +# Piarres Beobide , 2009. +msgid "" +msgstr "" +"Project-Id-Version: templates\n" +"Report-Msgid-Bugs-To: t-prot@packages.debian.org\n" +"POT-Creation-Date: 2006-08-02 15:54-0500\n" +"PO-Revision-Date: 2009-08-26 10:56+0200\n" +"Last-Translator: Piarres Beobide \n" +"Language-Team: Euskara \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=2; plural=(n != 1);\n" + +#. Type: boolean +#. Description +#: ../templates:1001 +msgid "Do you want to enable t-prot system wide for mutt?" +msgstr "Mutt-entzat t-prot sistema osoan gaitu nahi al duzu?" + +#. Type: boolean +#. Description +#: ../templates:1001 +msgid "" +"The t-prot package provides a config file /etc/Muttrc.t-prot -- to use the " +"script from mutt you have to enable it. You can do this either by creating " +"a symlink in /etc/Muttrc.d/ for systemwide usage (rather, this can be done " +"automatically for you), or let the users decide to add a \"source\" line for " +"it in their ~/.muttrc or ~/.mutt/muttrc. If you acknowledge this question " +"the systemwide usage will be enabled." +msgstr "" +"T-prot paketeak /etc/Muttrc.t-prot konfigurazio fitxategia dakar mutt-ekin " +"gaitu nahi baduzu erabiltzeko. Hau bi modutan egin dezakezu edo " +"/etc/Muttrc.d/-en sistema osorako lotura sinboliko bat sortuaz " +"(bestela hau automatikoki egin daiteke zuretzat), edo erabiltzaileei " +"beren ~/.muttrc or ~/.mutt/muttrc fitxategian \"source\" lerroa gehitzen " +"utziaz. Galdera hau onartzen baduzu sistema-osorako modua gaituko " +"da." + diff --git a/debian/po/it.po b/debian/po/it.po new file mode 100644 index 0000000..ec23350 --- /dev/null +++ b/debian/po/it.po @@ -0,0 +1,36 @@ +msgid "" +msgstr "" +"Project-Id-Version: t-prot t-prot debconf italian\n" +"Report-Msgid-Bugs-To: t-prot@packages.debian.org\n" +"POT-Creation-Date: 2006-08-02 15:54-0500\n" +"PO-Revision-Date: 2009-08-23 14:51+0200\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:1001 +msgid "Do you want to enable t-prot system wide for mutt?" +msgstr "Attivare t-prot per tutto il sistema?" + +#. Type: boolean +#. Description +#: ../templates:1001 +msgid "" +"The t-prot package provides a config file /etc/Muttrc.t-prot -- to use the " +"script from mutt you have to enable it. You can do this either by creating " +"a symlink in /etc/Muttrc.d/ for systemwide usage (rather, this can be done " +"automatically for you), or let the users decide to add a \"source\" line for " +"it in their ~/.muttrc or ~/.mutt/muttrc. If you acknowledge this question " +"the systemwide usage will be enabled." +msgstr "" +"Il pacchetto t-prot fornisce un file di configurazione /etc/Muttrc.t-prot ma " +"per usare tale script da mutt è necessario abilitarlo. Per abilitarlo è " +"possibile creare un collegamento simbolico in /etc/Muttrc.d/ in modo da " +"poterlo abilitare per tutto il sistema (questo può essere fatto " +"automaticamente) oppure lasciare agli utenti la decisione di aggiungere una " +"riga \"source\" nei loro file ~/.muttrc o ~/.mutt/muttrc. Accettando, verrà " +"abilitato l'uso per tutto il sistema." diff --git a/debian/po/ru.po b/debian/po/ru.po new file mode 100644 index 0000000..8538fa9 --- /dev/null +++ b/debian/po/ru.po @@ -0,0 +1,44 @@ +# translation of ru.po to Russian +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the t-prot package. +# +# Yuri Kozlov , 2009. +msgid "" +msgstr "" +"Project-Id-Version: t-prot 2.5-2\n" +"Report-Msgid-Bugs-To: t-prot@packages.debian.org\n" +"POT-Creation-Date: 2006-08-02 15:54-0500\n" +"PO-Revision-Date: 2009-08-12 20:51+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 +#: ../templates:1001 +msgid "Do you want to enable t-prot system wide for mutt?" +msgstr "Активировать t-prot для всех пользователей mutt?" + +#. Type: boolean +#. Description +#: ../templates:1001 +msgid "" +"The t-prot package provides a config file /etc/Muttrc.t-prot -- to use the " +"script from mutt you have to enable it. You can do this either by creating " +"a symlink in /etc/Muttrc.d/ for systemwide usage (rather, this can be done " +"automatically for you), or let the users decide to add a \"source\" line for " +"it in their ~/.muttrc or ~/.mutt/muttrc. If you acknowledge this question " +"the systemwide usage will be enabled." +msgstr "" +"В пакете t-prot содержится файл настройки /etc/Muttrc.t-prot -- чтобы " +"использовать сценарий из mutt, вы должны его включить. Это можно " +"сделать создав символическую ссылку в /etc/Muttrc.d/ для общесистемного " +"использования (может быть сделано автоматически), или позволить " +"пользователям самим решить, добавлять ли строку " +"\"source\" в свои ~/.muttrc или ~/.mutt/muttrc. При утвердительном " +"ответе будет включена общесистемная настройка." + diff --git a/debian/postinst b/debian/postinst index b60b3dd..428c11f 100644 --- a/debian/postinst +++ b/debian/postinst @@ -1,7 +1,7 @@ #!/bin/sh -e # postinst for t-prot -# (c) 2002-2007 by Gerfried Fuchs -# Licenced in the same way as t-prot itself +# Copyright 2002-2009 by Gerfried Fuchs +# Licenced BSD style # Source debconf library. if [ -e /usr/share/debconf/confmodule ]; then diff --git a/debian/postrm b/debian/postrm index ff6097d..1428af4 100644 --- a/debian/postrm +++ b/debian/postrm @@ -1,7 +1,7 @@ #!/bin/sh -e # postrm for t-prot -# (c) 2002-2007 by Gerfried Fuchs -# Licenced in the same way as t-prot itself +# Copyright 2002-2009 by Gerfried Fuchs +# Licenced BSD style action=$1 diff --git a/debian/rules b/debian/rules index 4ef43b5..f886941 100755 --- a/debian/rules +++ b/debian/rules @@ -1,7 +1,7 @@ #!/usr/bin/make -f # debian/rules for t-prot package -# (c) 2002-2008 by Gerfried Fuchs -# Licenced in the same way as t-prot itself +# Copyright 2002-2009 by Gerfried Fuchs +# Licenced BSD style PKG = t-prot TMP = $(CURDIR)/debian/$(PKG)