From 19a42c4a502dbe5cd296dbcf162ac93779c8dab5 Mon Sep 17 00:00:00 2001 From: Gerfried Fuchs Date: Thu, 24 Jul 2008 12:50:55 +0200 Subject: [PATCH] Imported Debian patch 2.5-2 --- debian/README.source | 2 + debian/changelog | 13 +++ debian/control | 6 +- debian/patches/01_fix-manpage | 180 ++++++++++++++++++++++++++++++++++ debian/patches/series | 1 + debian/po/sv.po | 45 +++++++++ debian/postinst | 2 + debian/postrm | 2 + debian/rules | 12 ++- 9 files changed, 257 insertions(+), 6 deletions(-) create mode 100644 debian/README.source create mode 100644 debian/patches/01_fix-manpage create mode 100644 debian/patches/series create mode 100644 debian/po/sv.po diff --git a/debian/README.source b/debian/README.source new file mode 100644 index 0000000..3556bbc --- /dev/null +++ b/debian/README.source @@ -0,0 +1,2 @@ +This package uses quilt for its patch management, see +/usr/share/doc/quilt/README.source if you are unfamiliar with it. diff --git a/debian/changelog b/debian/changelog index 3b12a55..e85c879 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,16 @@ +t-prot (2.5-2) unstable; urgency=low + + * Added debconf translation: Swedish by Martin Ågren (closes: #492062) + * Add quilt to Build-Depends and the following patch: + - fix-manpage: Escape hyphens in manpage where they mean the minus sign + * Updated Standards-Version to 3.8.0: + - Added Homepage: source control field. + - Added README.source referencing quilt's. + * Added copyright informations to maintainer scripts, too. + * Fix spelling in package description: s/german/German/ + + -- Gerfried Fuchs Thu, 24 Jul 2008 12:50:55 +0200 + t-prot (2.5-1) unstable; urgency=low * New upstream release with new option --groupware, not activated by diff --git a/debian/control b/debian/control index 303cdc7..7358e12 100644 --- a/debian/control +++ b/debian/control @@ -2,8 +2,10 @@ Source: t-prot Section: mail Priority: optional Maintainer: Gerfried Fuchs +Build-Depends: quilt Build-Depends-Indep: po-debconf, patch -Standards-Version: 3.7.2 +Standards-Version: 3.8.0 +Homepage: http://www.escape.de/~tolot/mutt/ Package: t-prot Architecture: all @@ -17,7 +19,7 @@ Description: display filter for RFC822 messages signatures and TOFU as well as squeezing sequences of blank lines or punctuation. . - TOFU is an acronym that stands for "Text oben, Fullquote unten" (german + TOFU is an acronym that stands for "Text oben, Fullquote unten" (German language) which means the style of sadly so many people that just leave all the quotes in a reply and add some own lines above. This acronym is what gave the script its name - TOFU Protection. diff --git a/debian/patches/01_fix-manpage b/debian/patches/01_fix-manpage new file mode 100644 index 0000000..dd75f9f --- /dev/null +++ b/debian/patches/01_fix-manpage @@ -0,0 +1,180 @@ +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 +=================================================================== +--- t-prot-2.5.orig/t-prot.1 ++++ t-prot-2.5/t-prot.1 +@@ -4,7 +4,7 @@ + .SH NAME + t-prot \- TOFU Protection - Display Filter for RFC 2822 messages + .SH SYNOPSIS +-.BI "t-prot [" OPTIONS "]..." ++.BI "t\-prot [" OPTIONS "]..." + .SH DESCRIPTION + .PP + This program is a filter to improve the readability of +@@ -22,19 +22,19 @@ is the reason for not using standard CPA + messages). + .PP + For easy usage, you can download a file to be included in your ~/.muttrc: +-.I http://www.escape.de/users/tolot/mutt/t-prot/muttrc.t-prot ++.I http://www.escape.de/users/tolot/mutt/t\-prot/muttrc.t\-prot + .br + And here is an example S-Lang macro to use t-prot from within slrn: +-.I http://www.escape.de/users/tolot/mutt/t-prot/t-prot.sl ++.I http://www.escape.de/users/tolot/mutt/t\-prot/t\-prot.sl + .SH OPTIONS + .TP + .BR "\-A" =DIRECTORY + "ad footer directory": + Defines the directory which contains the advertisement list footers (one + footer per file) which are to be tested when removing them with options +-.B -a ++.B \-a + or +-.BR --ftr-ad . ++.BR \-\-ftr\-ad . + .br + This option is also needed if you do not want signature lengths to be + counted wrong or fullquotes get undetected when an ad footer is +@@ -53,12 +53,12 @@ footer file found in the directory speci + (which is mandatory for this option). The comparison is done by perl's + .B index() + function (please try +-.I perldoc -f index ++.I perldoc \-f index + for details). + .sp + .IR NOTE : + This option is not needed if +-.B --ftr-ad ++.B \-\-ftr\-ad + is specified. + .TP + .BR "\-\-bigq" [=n[,x]] +@@ -71,7 +71,7 @@ Input consists just of the message's bod + lines. + .IP + .IR NOTE : +-This does not work with --pgp-short, and multipart messages will not ++This does not work with \-\-pgp\-short, and multipart messages will not + be detected due to missing headers. + .TP + .B "\-c" +@@ -137,7 +137,7 @@ With this option enabled t-prot makes fo + be helpful with broken list servers, or even if your email provider munges + the bodies of your messages. + .br +-Works similar to --ftr-ad, just that it is intended for mailing list footers. ++Works similar to \-\-ftr\-ad, just that it is intended for mailing list footers. + .sp + .IR NOTE : + This requires a directory with footer files to be given with option +@@ -153,7 +153,7 @@ Displays a short help text with a summar + .TP + .BR "\-i" =FILE + "input file": +-Defines a file for input; the default input is from '-' i.e. STDIN. ++Defines a file for input; the default input is from '\-' i.e. STDIN. + .TP + .B "\-k" + "anti Kammquote": +@@ -287,7 +287,7 @@ use of it when called from within your M + Hides TOFU as given by some Microsoft mailers. (You all surely know these + fullquotes beginning with + .br +-"----- Original Message -----" ++"\-\-\-\-\- Original Message \-\-\-\-\-" + .br + and some header lines...) + .TP +@@ -332,7 +332,7 @@ As an example for usage with + put this line into your alias file and invoke + .BR newaliases : + .sp +-notofu: |"/usr/local/bin/t-prot -mt -p=user@mydomain" ++notofu: |"/usr/local/bin/t\-prot \-mt \-p=user@mydomain" + .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 + conformance.) + .sp + .IR NOTE : +-The line containing "-- " ist not counted when testing for an overlong ++The line containing "\-\- " ist not counted when testing for an overlong + signature, but it is included when displaying how many lines were deleted. + .TP + .B "\-s" +@@ -439,7 +439,7 @@ The environment variables + and + .I LANG + are read and respected when interpreting output by mutt or gnupg +-(unless they are overruled by the --locale option). T-prot's own ++(unless they are overruled by the \-\-locale option). T-prot's own + 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 + There are several ways to fine-tune t-prot's performance: + .PP + Some command line options are quite grave a performance hit -- do not +-use -k and especially --ms-smart if you are content without them. ++use \-k and especially \-\-ms\-smart if you are content without them. + .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 + .PP + .TP + .IR Q : +-I use the options -l and -L to supress mailing list footers when ++I use the options \-l and \-L to supress mailing list footers when + 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) + 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 +-(or even plain us-ascii). "-- " simply does not match "--=20". ++(or even plain us-ascii). "\-\- " simply does not match "\-\-=20". + .br + Another problem are non-us-ascii characters. Just avoid them, and + everything should work fine. +@@ -544,13 +544,13 @@ instruction: + .sp + #v+ + .br +-This line is protected from being filtered by t-prot !!!!!!! ++This line is protected from being filtered by t\-prot !!!!!!! + .br +-#v- ++#v\- + .br + Text coming now is not. + .SH AUTHOR +-Written by Jochen Striepe . ++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). +@@ -629,7 +629,7 @@ t-prot team with some useful info, pleas + .I display_filter + facility, just set display_filter to something like + .IP +-"tee ~/foobar | t-prot " ++"tee ~/foobar | t\-prot " + .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 + be important to enable us reproducing the bug. + .PP + Send your bug report to +-.IR . ++.IR . + Thank you. + .SH TODO + Fix bugs (see the diff --git a/debian/patches/series b/debian/patches/series new file mode 100644 index 0000000..6b5e0b1 --- /dev/null +++ b/debian/patches/series @@ -0,0 +1 @@ +01_fix-manpage diff --git a/debian/po/sv.po b/debian/po/sv.po new file mode 100644 index 0000000..ac2f1c2 --- /dev/null +++ b/debian/po/sv.po @@ -0,0 +1,45 @@ +# translation of t-prot_2.5-1_sv.po to Swedish +# t-prot. +# Copyright (C) 2008 +# This file is distributed under the same license as the t-prot package. +# +# Martin Ågren , 2008. +msgid "" +msgstr "" +"Project-Id-Version: t-prot_2.5-1_sv\n" +"Report-Msgid-Bugs-To: t-prot@packages.debian.org\n" +"POT-Creation-Date: 2006-08-02 15:54-0500\n" +"PO-Revision-Date: 2008-07-23 17:41+0200\n" +"Last-Translator: Martin Ågren \n" +"Language-Team: Swedish \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 "Vill du aktivera t-prot systemtäckande för 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-paketet tillhandahåller en konfigurationsfil /etc/Muttrc.t-prot -- för " +"att använda skriptet från mutt måste du aktivera det. Du kan göra detta " +"antingen genom att skapa en symbolisk länk i /etc/Muttrc.d/ för " +"systemtäckande användande (detta kan göras " +"automatiskt för dig), eller låt användarna besluta att lägga till en \"source\"-rad för " +"det i deras ~/.muttrc or ~/.mutt/muttrc. Om du svarar ja på denna fråga " +"kommer det systemtäckande användandet att aktiveras." + diff --git a/debian/postinst b/debian/postinst index 2bb6a7d..b60b3dd 100644 --- a/debian/postinst +++ b/debian/postinst @@ -1,5 +1,7 @@ #!/bin/sh -e # postinst for t-prot +# (c) 2002-2007 by Gerfried Fuchs +# Licenced in the same way as t-prot itself # Source debconf library. if [ -e /usr/share/debconf/confmodule ]; then diff --git a/debian/postrm b/debian/postrm index 1fe8e42..ff6097d 100644 --- a/debian/postrm +++ b/debian/postrm @@ -1,5 +1,7 @@ #!/bin/sh -e # postrm for t-prot +# (c) 2002-2007 by Gerfried Fuchs +# Licenced in the same way as t-prot itself action=$1 diff --git a/debian/rules b/debian/rules index 249f0d8..4ef43b5 100755 --- a/debian/rules +++ b/debian/rules @@ -1,6 +1,6 @@ #!/usr/bin/make -f # debian/rules for t-prot package -# (c) 2002-2007 by Gerfried Fuchs +# (c) 2002-2008 by Gerfried Fuchs # Licenced in the same way as t-prot itself PKG = t-prot @@ -13,14 +13,18 @@ INSTALL_SCRIPT = $(INSTALL) -p -oroot -groot -m755 INSTALL_DIR = $(INSTALL) -p -d -oroot -groot -m755 -clean: +include /usr/share/quilt/quilt.make + +clean: unpatch $(checkdir) $(checkroot) - -rm -rf $(TMP) debian/files + -rm -rf $(TMP) debian/files build-stamp -build: +build-stamp: build +build: patch # uhm, build for a binary-indep package? Don't try to be funny ;) + touch build-stamp install: build -- 2.39.2