From bdd330d442942d616f8aad8ec793eae863a6e25b Mon Sep 17 00:00:00 2001 From: Gerfried Fuchs Date: Tue, 15 Feb 2005 15:12:57 +0100 Subject: [PATCH] Imported Debian patch 1.96-1 --- debian/Muttrc.t-prot | 2 +- debian/NEWS.Debian | 10 ++++++++++ debian/changelog | 9 +++++++++ debian/control | 11 +++++------ debian/rules | 5 +---- 5 files changed, 26 insertions(+), 11 deletions(-) diff --git a/debian/Muttrc.t-prot b/debian/Muttrc.t-prot index 729b0d6..74c1131 100644 --- a/debian/Muttrc.t-prot +++ b/debian/Muttrc.t-prot @@ -10,5 +10,5 @@ macro pager \e0 ":unset display_filter; exec exit\n:exec display-message\n" "Tur macro pager \e1 ":set display_filter='t-prot -cemktS --bigq --pgp-move-vrf -Mmutt -L/usr/share/doc/t-prot/examples/footers'; exec exit\n:exec display-message\n" "Turn TOFU protection on" # highlight TOFU protection: -color body brightmagenta black "^\\[---.*" +color body brightmagenta black "^\\[---.*" color body green black "^#v[-+]" diff --git a/debian/NEWS.Debian b/debian/NEWS.Debian index 145df3f..0502a7e 100644 --- a/debian/NEWS.Debian +++ b/debian/NEWS.Debian @@ -1,3 +1,13 @@ +t-prot (1.96-1) unstable; urgency=low + + * This is a v2.0 pre-release. It contains a switch from inline locale strings + to the Locale::gettext perl module. Pretty please report any things you + notice with this release soon so it can be fixed for the upcoming v2.0 + release. This isn't targeted at sarge because of this, and will only flow + in if gnupg 1.4.0 is allowed into sarge (my personal rules for it). + + -- Gerfried Fuchs Tue, 15 Feb 2005 15:12:57 +0100 + t-prot (1.47-2) unstable; urgency=medium * The automatic addition to /etc/Muttrc was removed due to a policy diff --git a/debian/changelog b/debian/changelog index 975043f..8472984 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,12 @@ +t-prot (1.96-1) unstable; urgency=low + + * New upstream release: v2.0 pre-release, uses Locale::gettext from now on. + Added a note to NEWS.Debian.gz about this. + * debconf removed from Depends, forgotten. + * Change long description a bit. + + -- Gerfried Fuchs Tue, 15 Feb 2005 15:12:57 +0100 + t-prot (1.49-1) unstable; urgency=medium * New upstream release, fixes problem with multiline From: headers. diff --git a/debian/control b/debian/control index 969afaa..db0c8aa 100644 --- a/debian/control +++ b/debian/control @@ -7,7 +7,7 @@ Standards-Version: 3.6.1 Package: t-prot Architecture: all -Depends: perl (>= 5.6.0-16), libgetopt-mixed-perl, debconf (>= 0.5) +Depends: perl (>= 5.6.0-16), libgetopt-mixed-perl, liblocale-gettext-perl Recommends: mutt (>= 1.5.5.1) Enhances: mutt, slrn, inn2 Suggests: mail-transport-agent @@ -22,8 +22,7 @@ Description: display filter for RFC822 messages the quotes in a reply and add some own lines above. This acronym is what gave the script its name - TOFU Protection. . - It currently offers hints how to include it within mutt. It should be - possible to do similars with other mailers that allow to have a message run - through a program before it's displayed. If you have such an mailer I'd be - interested if you could let me know of your setup. There are also example - files for using t-prot within slrn or inn2. + 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. diff --git a/debian/rules b/debian/rules index b6de4d8..bd83c28 100755 --- a/debian/rules +++ b/debian/rules @@ -31,10 +31,7 @@ install: build # usr/share/doc/$(PACKAGE)/contrib $(INSTALL_SCRIPT) t-prot $(TMP)/usr/bin cd $(TMP)/usr/bin/ && patch t-prot \ - $(TMP)/../../contrib/t-prot-r*-mutt156.diff - cd $(TMP)/usr/bin/ && patch t-prot \ - $(TMP)/../../contrib/t-prot-r*-gpg125.diff - rm $(TMP)/usr/bin/t-prot.orig + $(TMP)/../../contrib/t-prot-r*-mutt157.diff $(INSTALL_FILE) t-prot.1 $(TMP)/usr/share/man/man1 $(INSTALL_FILE) debian/Muttrc.t-prot $(TMP)/etc $(INSTALL_FILE) contrib/t-prot.sl $(TMP)/usr/share/slrn/macros -- 2.39.2