From 3e1c2cda0969c70d21ce76b8bd7cdc2895d35ab3 Mon Sep 17 00:00:00 2001 From: Gerfried Fuchs Date: Tue, 22 Dec 2009 22:02:58 +0100 Subject: [PATCH] Imported Debian patch 2.8.1-1 --- debian/changelog | 7 ++ debian/control | 1 - debian/patches/01_fix-manpage | 180 ---------------------------------- debian/patches/series | 1 - debian/rules | 8 +- 5 files changed, 10 insertions(+), 187 deletions(-) delete mode 100644 debian/patches/01_fix-manpage delete mode 100644 debian/patches/series diff --git a/debian/changelog b/debian/changelog index 71c858a..3cda219 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +t-prot (2.8.1-1) unstable; urgency=low + + * New upstream release, integrating the manpage fix patch. + * Dropping quilt handling as we don't have any patch around anymore. + + -- Gerfried Fuchs Tue, 22 Dec 2009 22:02:58 +0100 + t-prot (2.8-1) unstable; urgency=low * The "Marry Christmas" new upstream release. diff --git a/debian/control b/debian/control index 15a1b86..3aee630 100644 --- a/debian/control +++ b/debian/control @@ -2,7 +2,6 @@ Source: t-prot Section: mail Priority: optional Maintainer: Gerfried Fuchs -Build-Depends: quilt Build-Depends-Indep: po-debconf, patch Standards-Version: 3.8.3 Homepage: http://www.escape.de/~tolot/mutt/ diff --git a/debian/patches/01_fix-manpage b/debian/patches/01_fix-manpage deleted file mode 100644 index 591d842..0000000 --- a/debian/patches/01_fix-manpage +++ /dev/null @@ -1,180 +0,0 @@ -Author: Gerfried Fuchs vim:ft=diff: -Description: Escape hyphens in manpage where they mean the minus sign - -Index: t-prot-2.8/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 - .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 -@@ -333,7 +333,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. -@@ -388,7 +388,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" -@@ -440,7 +440,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 -@@ -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 --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. -@@ -514,7 +514,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 -@@ -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 --(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. -@@ -545,13 +545,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 explicitly stated otherwise). -@@ -630,7 +630,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. -@@ -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 --.IR . -+.IR . - Thank you. - .SH TODO - Fix bugs (see the diff --git a/debian/patches/series b/debian/patches/series deleted file mode 100644 index 6b5e0b1..0000000 --- a/debian/patches/series +++ /dev/null @@ -1 +0,0 @@ -01_fix-manpage diff --git a/debian/rules b/debian/rules index 25d6593..63edcc9 100755 --- a/debian/rules +++ b/debian/rules @@ -13,16 +13,14 @@ INSTALL_SCRIPT = $(INSTALL) -p -oroot -groot -m755 INSTALL_DIR = $(INSTALL) -p -d -oroot -groot -m755 -include /usr/share/quilt/quilt.make - -clean: unpatch +clean: $(checkdir) $(checkroot) -rm -rf $(TMP) debian/files build-stamp build-stamp: build -build: patch +build: # uhm, build for a binary-indep package? Don't try to be funny ;) touch build-stamp @@ -50,7 +48,7 @@ install: build $(INSTALL_FILE) TODO README $(TMP)/usr/share/doc/$(PKG) #$(INSTALL_FILE) contrib/README.patches contrib/t-prot-r*-gol.diff \ - # contrib/t-prot-r*-indentms.diff \ + # \ # $(TMP)/usr/share/doc/$(PKG)/contrib $(INSTALL_FILE) contrib/filter_innd.pl contrib/README.examples \ $(TMP)/usr/share/doc/$(PKG)/examples -- 2.39.2