Imported Debian patch 1.96-1

diff --git a/debian/Muttrc.t-prot b/debian/Muttrc.t-prot
index 729b0d602f089c964c7ec494277f3a3f5b3786cd..74c1131c9881592924a8948acde372556e40a462 100644 (file)
--- 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 145df3f4fc62648ce836a31abdc0139fd48d01f4..0502a7e72820c002795282296bf6041dedc6fbd1 100644 (file)
--- 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 <alfie@debian.org>  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 975043f43372744cbe9fe4e363702ba46dd37865..84729842373d4b0d4363b97b005772eeaf2b0028 100644 (file)
--- 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 <alfie@debian.org>  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 969afaae7b8b9d2c75470a72dcd7e64613ad5a15..db0c8aa9bf7a6b8c4f11fa680ac43a59f986474c 100644 (file)
--- 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 b6de4d8b5efd35464eca4a6cd4e5f50113bff6ec..bd83c2845aae70b6474a67966b6f28c603cb8697 100755 (executable)
--- 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