From 7d2bb16dcffa20095fc43fa36ed0178ca6d287d7 Mon Sep 17 00:00:00 2001
From: Gerfried Fuchs <rhonda@debian.at>
Date: Wed, 17 Feb 2010 20:48:48 +0100
Subject: [PATCH] Imported Upstream version 2.2

---
 ChangeLog                                       | 17 +++++++++++++++++
 README                                          |  4 ++--
 ...utt1511.diff => t-prot-r1.246-mutt1512.diff} |  0
 contrib/t-prot.sl-slang2.diff                   |  4 ++--
 t-prot                                          |  7 ++++---
 t-prot.1                                        |  6 +++---
 6 files changed, 28 insertions(+), 10 deletions(-)
 rename contrib/{t-prot-r1.246-mutt1511.diff => t-prot-r1.246-mutt1512.diff} (100%)

diff --git a/ChangeLog b/ChangeLog
index b474caf..45b6bc8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,20 @@
+2006-11-30 14:06  Jochen Striepe
+
+	* t-prot: Release as v2.2.
+
+2006-11-30 13:02  Jochen Striepe
+
+	* t-prot: Add string to detect gmx.de's M$ style TOFU.
+
+2006-09-25 14:42  Jochen Striepe
+
+	* t-prot.1: Make sure we can ship files not copyrighted by the
+	author of the package.
+
+2006-07-16 08:50  Jochen Striepe
+
+	* t-prot.1: There are no patches for locales of old mutt versions.
+
 2006-07-11 14:05  Jochen Striepe
 
 	* t-prot.1: Updated time stamp.
diff --git a/README b/README
index 669b3a5..164abf3 100644
--- a/README
+++ b/README
@@ -18,8 +18,8 @@
    It detects,  and when demanded  hides annoying parts in rfc2822 messages:
    TOFU, huge quoted blocks, signatures (especially when they are too long),
    excessive punktuation,  blocks of empty lines,  trailing spaces and tabs.
-   For use  inside of MTAs  or MDAs  it may exit with appropriate  libc exit
-   codes, so annoying messages may be bounced easily.
+   For use inside of MTAs or MDAs it exits with appropriate libc exit codes,
+   so annoying messages may be bounced easily.
    
 3. For what can I use it?
    There are  several possibilities.  One is  to filter your email  or news 
diff --git a/contrib/t-prot-r1.246-mutt1511.diff b/contrib/t-prot-r1.246-mutt1512.diff
similarity index 100%
rename from contrib/t-prot-r1.246-mutt1511.diff
rename to contrib/t-prot-r1.246-mutt1512.diff
diff --git a/contrib/t-prot.sl-slang2.diff b/contrib/t-prot.sl-slang2.diff
index 0635ff7..a710d60 100644
--- a/contrib/t-prot.sl-slang2.diff
+++ b/contrib/t-prot.sl-slang2.diff
@@ -1,5 +1,5 @@
-Patch 2005-12-23 by Gregor Herrmann, making t-prot.sl run with slang2.
-His comment:
+Patch 2005-12-23 (c) by Gregor Herrmann, making t-prot.sl run with
+slang2. His comment:
 
 | After some fiddling around and reading manuals I found a workaround:
 | replace "error" by "message".
diff --git a/t-prot b/t-prot
index 81fbd71..ff9d811 100755
--- a/t-prot
+++ b/t-prot
@@ -1,13 +1,13 @@
 #!/usr/bin/perl -w
-# $Id: t-prot,v 1.246 2006/06/17 22:45:55 jochen Exp $
+# $Id: t-prot,v 1.248 2006/11/30 14:06:27 jochen Exp $
 
 require 5.006;
 use strict;
 use Fcntl qw(O_EXCL O_WRONLY O_CREAT);
 use Getopt::Mixed qw(nextOption);
-use constant VER            => '2.1';
+use constant VER            => '2.2';
 use constant REV            => '';
-use constant REL            => q$Revision: 1.246 $=~m/(\d+(?:\.\d+)+)/;
+use constant REL            => q$Revision: 1.248 $=~m/(\d+(?:\.\d+)+)/;
 # MTA expecting mail on STDIN
 # (you might have to adjust this if using a different MTA)
 use constant SENDMAIL       => '/usr/sbin/sendmail -oi';
@@ -684,6 +684,7 @@ sub process_msg {
     if ($ms) {
         # bloat this array if you want more internationalization:
         my @tofu = ('Original Message',
+                    'Original-Nachricht',
                     'Ursprüngliche Nachricht',
                     'Ursprungliche Nachricht',
                     'Mensagem original',
diff --git a/t-prot.1 b/t-prot.1
index a26c798..d73bda5 100644
--- a/t-prot.1
+++ b/t-prot.1
@@ -1,4 +1,4 @@
-.\" $Id: t-prot.1,v 1.125 2006/07/11 14:05:53 jochen Exp $
+.\" $Id: t-prot.1,v 1.127 2006/09/25 14:42:18 jochen Exp $
 .\"
 .TH T-PROT "1" "July 2006" "T-PROT"
 .SH NAME
@@ -263,7 +263,7 @@ and
 .B mutt
 locales of the recent stable versions of those programs, earlier versions
 might not work well with a recent version of t-prot. There are patches available
-to make t-prot fit into environments with old
+to make t-prot fit into environments with some other
 .B mutt
 and
 .B gnupg
@@ -545,7 +545,7 @@ Text coming now is not.
 Written by Jochen Striepe <t-prot@tolot.escape.de>.
 .SH COPYRIGHT
 All of the documentation and software included in the t-prot releases
-is copyrighted by Jochen Striepe.
+is copyrighted by Jochen Striepe (except when explicitely stated otherwise).
 .PP
 Copyright \(co 2001-2006 Jochen Striepe. All rights reserved.                     
 .PP
-- 
2.39.2