From 389333ed2c618ebd9ddf34e7c54991422a8d6fff Mon Sep 17 00:00:00 2001 From: Axel Beckert Date: Tue, 29 Oct 2013 13:29:57 +0100 Subject: [PATCH] New upstream release; drop no more needed patches * Drop quilt patch t-prot-20120207 (was cherry-picked from upstream anyways). * Drop applying mutt 1.5.x upstream contrib patches, they're default now. * Drop applying slang-2 upstream contrib patches, they're default now, too. --- debian/changelog | 9 ++++++ debian/patches/series | 2 -- debian/patches/t-prot-20120207 | 52 ---------------------------------- debian/rules | 6 ---- 4 files changed, 9 insertions(+), 60 deletions(-) delete mode 100644 debian/patches/series delete mode 100644 debian/patches/t-prot-20120207 diff --git a/debian/changelog b/debian/changelog index cdcdd14..3f747f6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,12 @@ +t-prot (3.0-1) UNRELEASED; urgency=low + + * New upstream release + + Drop quilt patch t-prot-20120207 (was cherry-picked from upstream) + + Drop applying mutt 1.5.x patches, they're default now + + Drop applying slang-2 patches, they're default now + + -- Axel Beckert Tue, 29 Oct 2013 13:23:47 +0100 + t-prot (2.101-3) unstable; urgency=low * Updated package description and Enhances header by Justin B Rye diff --git a/debian/patches/series b/debian/patches/series deleted file mode 100644 index 9fd34c4..0000000 --- a/debian/patches/series +++ /dev/null @@ -1,2 +0,0 @@ - -t-prot-20120207 diff --git a/debian/patches/t-prot-20120207 b/debian/patches/t-prot-20120207 deleted file mode 100644 index 8358416..0000000 --- a/debian/patches/t-prot-20120207 +++ /dev/null @@ -1,52 +0,0 @@ -Author: Jochen Striepe -Description: two patches pulled from upstream: - * t-prot: Fix eYou Webmail Tofu. - * t-prot: Fix text/plain content-type detection with several user - agents. - -Index: b/t-prot -=================================================================== ---- a/t-prot -+++ b/t-prot -@@ -1,5 +1,5 @@ - #!/usr/bin/perl -w --# $Id: t-prot,v 1.312 2010/10/31 11:18:15 jochen Exp $ -+# $Id: t-prot,v 1.314 2012/01/19 14:56:16 jochen Exp $ - - require 5.006; - use strict; -@@ -7,7 +7,7 @@ use Fcntl qw(O_EXCL O_WRONLY O_CREAT); - use Getopt::Long qw(:config gnu_getopt no_ignore_case); - use constant VER => '2.101'; - use constant REV => ''; --use constant REL => q$Revision: 1.312 $=~m/(\d+(?:\.\d+)+)/; -+use constant REL => q$Revision: 1.314 $=~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'; -@@ -564,7 +564,7 @@ sub process_msg { - } - if ($x>=scalar(@$lines)) { exit(EX_DATAERR); } - -- if ($bar =~ m!^text/plain!) { -+ if ($bar =~ m!^text/plain!i) { - my $z; - for ($z=1; $x+$z<@$lines; $z++) { - if (index($$lines[$x+$z], '--'.$foo)==0) { -@@ -659,7 +659,7 @@ sub process_msg { - (?:\e[^\a]+\a)? - (?:\Q$mutt_contenttype\E) - (?:text/plain|application/pgp) -- !ox))) || -+ !oxi))) || - ($$lines[$x] =~ /^ - (?:\e[^\a]+\a)? - (?:\Q$mutt_pgpsigned\E | -@@ -800,6 +800,7 @@ sub process_msg { - 'Ursprungligt meddelande', - 'Oorspronkelijk bericht', - 'Message d\'origine', -+ 'Origin message', - 'Forwarded message', - 'Weitergeleitete Nachricht / Forwarded Message', - '[A-Za-z ]+ <(\w[\w.+-]*@(?:[\w.+-]+\.)+[A-Za-z]{2,})> schrieb:'); diff --git a/debian/rules b/debian/rules index 1ae3125..1c075f5 100755 --- a/debian/rules +++ b/debian/rules @@ -39,16 +39,10 @@ debian/stamp-install: build usr/share/doc/$(PKG)/examples # usr/share/doc/$(PKG)/contrib $(INSTALL_SCRIPT) t-prot $(TMP)/usr/bin - patch $(TMP)/usr/bin/t-prot \ - contrib/t-prot-r*-mutt15*.diff - -rm -f $(TMP)/usr/bin/t-prot.orig $(INSTALL_FILE) t-prot.1 $(TMP)/usr/share/man/man1 $(INSTALL_FILE) debian/Muttrc $(TMP)/etc/t-prot $(INSTALL_FILE) debian/footers/* $(TMP)/etc/t-prot/footers $(INSTALL_FILE) contrib/t-prot.sl $(TMP)/usr/share/slrn/macros - patch $(TMP)/usr/share/slrn/macros/t-prot.sl \ - contrib/t-prot.sl-slang2.diff - -rm -f $(TMP)/usr/share/slrn/macros/t-prot.sl.orig $(INSTALL_FILE) TODO README $(TMP)/usr/share/doc/$(PKG) #$(INSTALL_FILE) contrib/README.patches contrib/t-prot-r*-gol.diff \ -- 2.39.2