From: Gerfried Fuchs Date: Sun, 20 Dec 2009 20:43:35 +0000 (+0100) Subject: Imported Debian patch 2.8-1 X-Git-Tag: debian/2.8-1 X-Git-Url: https://git.deb.at/?a=commitdiff_plain;h=2c6cfb0d75a1aedada50c06309a65347285e3eb1;p=pkg%2Ft-prot.git Imported Debian patch 2.8-1 --- diff --git a/debian/NEWS.Debian b/debian/NEWS.Debian deleted file mode 100644 index 3f0f4ac..0000000 --- a/debian/NEWS.Debian +++ /dev/null @@ -1,12 +0,0 @@ -t-prot (2.1-2) unstable; urgency=low - - * t-prot moved its muttrc snippet to /etc/t-prot/Muttrc. You might need to - check /etc/Muttrc.t-prot* for changes and incorporate them appropriately. - - * Furthermore t-prot now offers you two directories: /etc/t-prot/footers for - mailinglist footers and /etc/t-prot/ads for ad footers. Please notice - that many files in these directories have a serious impact on the speed - of t-prot and thus it is suggested to create by mail folder directories - and use mutt's folder-hook feature to use them. - - -- Gerfried Fuchs Mon, 26 Jun 2006 03:30:47 -0500 diff --git a/debian/README.Debian b/debian/README.Debian index da6556f..9983a11 100644 --- a/debian/README.Debian +++ b/debian/README.Debian @@ -5,8 +5,9 @@ t-prot for Debian not lose temper when receiving mails that are TOFU (see the manual page for an explanation of that abbreviation). I personally think it's really helpful. - debconf asks for systemwide inclusion, you can always revert that change with -"dpkg-reconfigure t-prot" or simply remove the symlink /etc/Muttrc.d/t-prot.rc + debconf asks for systemwide inclusion, you can always revert that change +with "dpkg-reconfigure t-prot" or a simple removal of the symlink +/etc/Muttrc.d/t-prot.rc A user who doesn't like it can turn it off in his own ~/.muttrc file with this line: @@ -14,16 +15,16 @@ line: set display_filter="" Of course if it isn't enabled in the systemwide file the users can source the -line in their .muttrc. :) +file in their .muttrc. :) There is option to enable it with slrn, too. The script is installed next to the other slang macros in /usr/share/slrn/macros/t-prot.sl and can be sourced from there. You can dump your list footers and ad footers into /etc/t-prot/footers and -/etc/t-prot/ads respectively, just be aware that many files in these -directories have a serious impact on the speed of t-prot. It is advices to use +/etc/t-prot/ads respectively, just be aware that too many files in these +directories have a serious impact on the speed of t-prot. It is advices to use folder-hook and enable the list footer and ad footers for the appropriate list only instead. - -- Gerfried Fuchs Mon, 26 Jun 2006 03:19:06 -0500 + -- Gerfried Fuchs Mon, 26 Jun 2006 03:19:06 -0500 diff --git a/debian/changelog b/debian/changelog index de12623..71c858a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,19 @@ +t-prot (2.8-1) unstable; urgency=low + + * The "Marry Christmas" new upstream release. + * Added debconf translations: + - Spanish by Francisco Javier Cuadrado (closes: #544880) + - Finnish by Esko Arajärvi (closes: #545371) + - Japanese by Hideki Yamane (closes: #548497) + * Remove binary-arch from binary targets and the dependencies from the + binary-arch target. + * Clearified the text in the README.Debian file, and other small wording + changes. + * Remove NEWS.Debian, it was about upgrades from pre-lenny. + * Reworded the package description slightly. + + -- Gerfried Fuchs Sun, 20 Dec 2009 21:43:35 +0100 + t-prot (2.7.1-1) unstable; urgency=low * New upstream release. diff --git a/debian/control b/debian/control index befe6d0..15a1b86 100644 --- a/debian/control +++ b/debian/control @@ -14,7 +14,7 @@ Recommends: mutt (>= 1.5.5.1) Enhances: mutt, slrn, inn2 Suggests: mail-transport-agent Description: display filter for RFC822 messages - This program is a filter which shall improve the readability for messages + This program is a filter which shall improve the readability of messages (email and posts) by *hiding* some annoying parts, e.g. mailing list footers, signatures and TOFU as well as squeezing sequences of blank lines or punctuation. @@ -27,4 +27,4 @@ Description: display filter for RFC822 messages It currently offers hints how to include it within mutt, slrn or inn2. It should be possible to do similars with other programs that allow to have a message run through a filter before it's displayed. If you use such a program - we'd be interested if you could let us know of your setup. + we'd be interested if you could send in your setup. diff --git a/debian/patches/01_fix-manpage b/debian/patches/01_fix-manpage index 2bcc7bc..591d842 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.7/t-prot.1 +Index: t-prot-2.8/t-prot.1 =================================================================== ---- t-prot-2.7.orig/t-prot.1 -+++ t-prot-2.7/t-prot.1 +--- t-prot-2.8.orig/t-prot.1 ++++ t-prot-2.8/t-prot.1 @@ -4,7 +4,7 @@ .SH NAME t-prot \- TOFU Protection - Display Filter for RFC 2822 messages @@ -89,7 +89,7 @@ Index: t-prot-2.7/t-prot.1 .br and some header lines...) .TP -@@ -332,7 +332,7 @@ As an example for usage with +@@ -333,7 +333,7 @@ As an example for usage with put this line into your alias file and invoke .BR newaliases : .sp @@ -98,7 +98,7 @@ Index: t-prot-2.7/t-prot.1 .sp This will bounce messages for if any TOFU is detected inside the message, and deliver it to otherwise. -@@ -387,7 +387,7 @@ than 4. Consider this old-fashioned, but +@@ -388,7 +388,7 @@ than 4. Consider this old-fashioned, but conformance.) .sp .IR NOTE : @@ -107,7 +107,7 @@ Index: t-prot-2.7/t-prot.1 signature, but it is included when displaying how many lines were deleted. .TP .B "\-s" -@@ -439,7 +439,7 @@ The environment variables +@@ -440,7 +440,7 @@ The environment variables and .I LANG are read and respected when interpreting output by mutt or gnupg @@ -116,7 +116,7 @@ Index: t-prot-2.7/t-prot.1 output is English regardless of any locale setting. .SH EXIT STATUS On program exit, t-prot uses exit codes from -@@ -483,7 +483,7 @@ Please point these people to the page +@@ -484,7 +484,7 @@ Please point these people to the page There are several ways to fine-tune t-prot's performance: .PP Some command line options are quite grave a performance hit -- do not @@ -125,7 +125,7 @@ Index: t-prot-2.7/t-prot.1 .PP Checking for special footers is very costly as well. Put as few footer files as absolutely needed in any footer directory. -@@ -513,7 +513,7 @@ your line is empty you match uncondition +@@ -514,7 +514,7 @@ your line is empty you match uncondition .PP .TP .IR Q : @@ -134,7 +134,7 @@ Index: t-prot-2.7/t-prot.1 displaying messages in .BR mutt (1). This does work sometimes, but sometimes it does not: the footer is not -@@ -524,7 +524,7 @@ detected as too long (which they aren't) +@@ -525,7 +525,7 @@ detected as too long (which they aren't) This might occur if the message is badly encoded, so mutt cannot resolve all encoded characters, e.g. if you have an encoded message on a mailing list, and majordomo appends a mailing list footer in a different encoding @@ -143,7 +143,7 @@ Index: t-prot-2.7/t-prot.1 .br Another problem are non-us-ascii characters. Just avoid them, and everything should work fine. -@@ -544,13 +544,13 @@ instruction: +@@ -545,13 +545,13 @@ instruction: .sp #v+ .br @@ -160,7 +160,7 @@ Index: t-prot-2.7/t-prot.1 .SH COPYRIGHT All of the documentation and software included in the t-prot releases is copyrighted by Jochen Striepe (except when explicitly stated otherwise). -@@ -629,7 +629,7 @@ t-prot team with some useful info, pleas +@@ -630,7 +630,7 @@ t-prot team with some useful info, pleas .I display_filter facility, just set display_filter to something like .IP @@ -169,7 +169,7 @@ Index: t-prot-2.7/t-prot.1 .PP and include ~/foobar in the bug report -- this way we might reproduce the bug much easier if you are using a different environment than we do. -@@ -639,7 +639,7 @@ with, what perl version t-prot runs on y +@@ -640,7 +640,7 @@ with, what perl version t-prot runs on y be important to enable us reproducing the bug. .PP Send your bug report to diff --git a/debian/po/de.po b/debian/po/de.po index 08064bc..269e70f 100644 --- a/debian/po/de.po +++ b/debian/po/de.po @@ -1,15 +1,15 @@ # debconf template file for the t-prot package. -# Copyright (C) 2006 Gerfried Fuchs +# Copyright (C) 2006 Gerfried Fuchs # This file is distributed under the same license as the t-prot package. -# Gerfried Fuchs , 2006. +# Gerfried Fuchs , 2006. # msgid "" msgstr "" "Project-Id-Version: t-prot 2.0.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: 2006-03-27 12:45+0200\n" -"Last-Translator: Gerfried Fuchs \n" +"PO-Revision-Date: 2009-10-21 17:57+0200\n" +"Last-Translator: Gerfried Fuchs \n" "Language-Team: German \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=ISO-8859-15\n" diff --git a/debian/po/es.po b/debian/po/es.po new file mode 100644 index 0000000..d4c31d1 --- /dev/null +++ b/debian/po/es.po @@ -0,0 +1,50 @@ +# t-prot po-debconf translation to Spanish +# Copyright (C) 2009 Software in the Public Interest +# This file is distributed under the same license as the t-prot package. +# +# Changes: +# - Initial translation +# Francisco Javier Cuadrado , 2009 +# +# Traductores, si no conocen el formato PO, merece la pena leer la +# documentación de gettext, especialmente las secciones dedicadas a este +# formato, por ejemplo ejecutando: +# info -n '(gettext)PO Files' +# info -n '(gettext)Header Entry' +# +# Equipo de traducción al español, por favor lean antes de traducir +# los siguientes documentos: +# +# - El proyecto de traducción de Debian al español +# http://www.debian.org/intl/spanish/coordinacion +# especialmente las notas de traducción en +# http://www.debian.org/intl/spanish/notas +# +# - La guía de traducción de po's de debconf: +# /usr/share/doc/po-debconf/README-trans +# o http://www.debian.org/intl/l10n/po-debconf/README-trans +# +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-24 08:44+0100\n" +"Last-Translator: Francisco Javier Cuadrado \n" +"Language-Team: Debian l10n Spanish \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 "¿Desea activar el sistema t-prot para 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 "El paquete t-prot proporciona un archivo de configuración «/etc/Muttrc.t-prot» (para utilizar el script desde mutt debe activarlo). Puede hacer esto creando un enlace simbólico en «/etc/Muttrc.d/» para su uso sobre el sistema (además, esto se puede realizar automáticamente), o permitir a los usuarios decidir si quieren añadir una línea «source» en «~/.muttrc» o en «~/.mutt/muttrc». Si responde afirmativamente a esta pregunta, se activará el uso sobre el sistema." + diff --git a/debian/po/fi.po b/debian/po/fi.po new file mode 100644 index 0000000..60ccb49 --- /dev/null +++ b/debian/po/fi.po @@ -0,0 +1,42 @@ +# Copyright (C) 2009 +# This file is distributed under the same license as the t-prot package. +# +# Esko Arajärvi , 2009. +msgid "" +msgstr "" +"Project-Id-Version: t-prot VERSION\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-09-06 20:52+0300\n" +"Last-Translator: Esko Arajärvi \n" +"Language-Team: Finnish \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Generator: Lokalize 0.3\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 "Otetaanko t-prot käyttöön muttissa järjestelmän laajuisesti?" + +#. 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 "" +"Paketti t-prot tuo järjestelmään asetustiedoston /etc/Muttrc.t-prot. Sen " +"käyttö muttista vaatii, että se valitaan käyttöön. Tämä voidaan tehdä " +"järjestelmän laajuisesti luomalla symbolinen linkki hakemistoon /etc/Muttrc." +"d/. Vaihtoehtoisesti käyttäjien voidaan antaa itse päättää haluavatko he " +"lisätä tätä varten rivin tiedostoon ~/.muttrc tai ~/.mutt/muttrc. Jos " +"valitset tämän vaihtoehdon, t-prot otetaan käyttöön järjestelmän laajuisesti." + diff --git a/debian/po/ja.po b/debian/po/ja.po new file mode 100644 index 0000000..c679dcc --- /dev/null +++ b/debian/po/ja.po @@ -0,0 +1,40 @@ +# Copyright (C) 2009 Gerfried Fuchs +# This file is distributed under the same license as t-prot package. +# Hideki Yamane (Debian-JP) , 2009. +# +msgid "" +msgstr "" +"Project-Id-Version: t-prot 2.7.1-1\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-04-07 22:26+0900\n" +"Last-Translator: Hideki Yamane (Debian-JP) \n" +"Language-Team: Japanese \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 "システム全体の mutt について t-prot を有効にしますか?" + +#. 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/ にシンボリックリンクを作成する (より" +"正確にいうと、これは自動的に行われます) やり方でも、あるいはユーザが各自の " +"~/.muttrc あるいは ~/.mutt/muttrc に「source」行に追加するかを決めさせるやり" +"方のどちらでも可能です。この質問に「はい」と答えた場合、システム全体での利用" +"が有効になります。" diff --git a/debian/rules b/debian/rules index f886941..25d6593 100755 --- a/debian/rules +++ b/debian/rules @@ -65,11 +65,11 @@ binary-indep: build install $(checkroot) $(INSTALL_DIR) $(TMP)/DEBIAN $(INSTALL_FILE) debian/copyright debian/README.Debian \ - debian/NEWS.Debian $(TMP)/usr/share/doc/$(PKG) + $(TMP)/usr/share/doc/$(PKG) $(INSTALL_FILE) debian/changelog \ $(TMP)/usr/share/doc/$(PKG)/changelog.Debian cd $(TMP)/usr/share/doc/$(PKG) && gzip -9 \ - changelog.Debian NEWS.Debian + changelog.Debian $(INSTALL_SCRIPT) debian/postinst debian/postrm debian/config \ $(TMP)/DEBIAN po2debconf debian/templates > $(TMP)/DEBIAN/templates @@ -81,11 +81,11 @@ binary-indep: build install dpkg --build $(TMP) .. -binary-arch: build install +binary-arch: # We have nothing to do here. -binary: binary-indep binary-arch +binary: binary-indep define checkdir