[libmail-sendmail-perl] 05/07: Refresh patches, drop man-whatis.patch applied upstream

[Florian Schlichting]

This is an automated email from the git hooks/post-receive script.

fsfs pushed a commit to branch master
in repository libmail-sendmail-perl.

commit 3e92e0aac94c9bbf7d3a7c0ada99e54823b12da2
Author: Florian Schlichting <fsfs at debian.org>
Date:   Mon Sep 18 22:13:45 2017 +0200

    Refresh patches, drop man-whatis.patch applied upstream
---
 debian/patches/helo-hostname-long.patch | 17 ++++++++---------
 debian/patches/man-whatis.patch         | 15 ---------------
 debian/patches/series                   |  1 -
 debian/patches/spelling.patch           | 12 ++++++------
 4 files changed, 14 insertions(+), 31 deletions(-)

diff --git a/debian/patches/helo-hostname-long.patch b/debian/patches/helo-hostname-long.patch
index 14ead35..112a3f2 100644
--- a/debian/patches/helo-hostname-long.patch
+++ b/debian/patches/helo-hostname-long.patch
@@ -1,11 +1,10 @@
 Author: gregor herrmann <gregoa at debian.org>
 Bug: #482339
 Description: use Sys::Hostname::Long in order to get FQDN for HELO
-Index: libmail-sendmail-perl/Sendmail.pm
-===================================================================
---- libmail-sendmail-perl.orig/Sendmail.pm	2008-08-26 15:55:08.000000000 -0500
-+++ libmail-sendmail-perl/Sendmail.pm	2008-08-26 16:12:58.000000000 -0500
-@@ -54,6 +54,7 @@
+
+--- a/lib/Mail/Sendmail.pm
++++ b/lib/Mail/Sendmail.pm
+@@ -53,6 +53,7 @@
  use Socket;
  use Time::Local; # for automatic time zone detection
  use Sys::Hostname; # for use of hostname in HELO
@@ -13,7 +12,7 @@ Index: libmail-sendmail-perl/Sendmail.pm
  
  #use Digest::HMAC_MD5 qw(hmac_md5 hmac_md5_hex);
  
-@@ -337,7 +338,7 @@
+@@ -339,7 +340,7 @@
      }
  
      # get local hostname for polite HELO
@@ -22,9 +21,9 @@ Index: libmail-sendmail-perl/Sendmail.pm
  
      foreach $server ( @{$mailcfg{'smtp'}} ) {
          # open socket needs to be inside this foreach loop on Linux,
-@@ -999,6 +1000,9 @@
- because you installed through PPM, you can also find the latest
- one on F<http://alma.ch/perl/scripts/Sendmail/Changes>.
+@@ -1024,6 +1025,9 @@
+ Last revision: 06.02.2003. Latest version should be available on
+ CPAN: F<http://www.cpan.org/modules/by-authors/id/M/MI/MIVKOVIC/>.
  
 +On Debian systems Sys::Hostname::Long is tried before Sys::Hostname in order
 +get a fully qualified domain name.
diff --git a/debian/patches/man-whatis.patch b/debian/patches/man-whatis.patch
deleted file mode 100644
index 4ae0842..0000000
--- a/debian/patches/man-whatis.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Author: gregor herrmann <gregoa at debian.org>
-Description: make man happy about whatis part
-Index: libmail-sendmail-perl/Sendmail.pm
-===================================================================
---- libmail-sendmail-perl.orig/Sendmail.pm	2008-08-26 16:13:17.000000000 -0500
-+++ libmail-sendmail-perl/Sendmail.pm	2008-08-26 16:14:24.000000000 -0500
-@@ -5,7 +5,7 @@
- 
- =head1 NAME
- 
--Mail::Sendmail v. 0.79_16 - Simple platform independent mailer
-+Mail::Sendmail - Simple platform independent mailer
- 
- =cut
- 
diff --git a/debian/patches/series b/debian/patches/series
index 2a0fb13..4ae6ad4 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,2 @@
 helo-hostname-long.patch
-man-whatis.patch
 spelling.patch
diff --git a/debian/patches/spelling.patch b/debian/patches/spelling.patch
index af60ce0..54d1eb0 100644
--- a/debian/patches/spelling.patch
+++ b/debian/patches/spelling.patch
@@ -2,9 +2,9 @@ Description: fix typos in POD
 Author: Florian Schlichting <fsfs at debian.org>
 Forwarded: https://rt.cpan.org/Ticket/Display.html?id=119000
 
---- a/Sendmail.pm
-+++ b/Sendmail.pm
-@@ -544,7 +544,7 @@
+--- a/lib/Mail/Sendmail.pm
++++ b/lib/Mail/Sendmail.pm
+@@ -546,7 +546,7 @@
              || return fail("send $header: error");
      };
  
@@ -13,7 +13,7 @@ Forwarded: https://rt.cpan.org/Ticket/Display.html?id=119000
      #- print STDERR "DISCONNECT NOW!\n";
      #- sleep 4;
      #- print STDERR "trying to continue, expecting an error... \n";
-@@ -756,7 +756,7 @@
+@@ -758,7 +758,7 @@
  
  =item $mail{auth}
  
@@ -22,7 +22,7 @@ Forwarded: https://rt.cpan.org/Ticket/Display.html?id=119000
  
  $mail{auth} = \%options;
  or
-@@ -966,7 +966,7 @@
+@@ -968,7 +968,7 @@
  
  
    $mail{Smtp} = 'special_server.for-this-message-only.domain.com';
@@ -31,7 +31,7 @@ Forwarded: https://rt.cpan.org/Ticket/Display.html?id=119000
    $mail{'mESSaGE : '} = "The message key looks terrible, but works.";
    # cheat on the date:
    $mail{Date} = Mail::Sendmail::time_to_date( time() - 86400 );
-@@ -1024,7 +1024,7 @@
+@@ -1019,7 +1019,7 @@
  spam, or ...?)
  
  Thanks to the many users who sent me feedback, bug reports, suggestions, etc.

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-perl/packages/libmail-sendmail-perl.git