r15106 - in /trunk/libmime-lite-perl: debian/changelog debian/control debian/patches/ debian/patches/no_sendmail.patch debian/patches/series debian/rules lib/MIME/Lite.pm

[gregoa-guest at users.alioth.debian.org]

Author: gregoa-guest
Date: Sun Feb 17 23:42:02 2008
New Revision: 15106

URL: http://svn.debian.org/wsvn/?sc=1&rev=15106
Log:
* Split out patch for #465342 into no_sendmail.patch; add quilt framework.
* Add /me to Uploaders.

Added:
    trunk/libmime-lite-perl/debian/patches/
    trunk/libmime-lite-perl/debian/patches/no_sendmail.patch
    trunk/libmime-lite-perl/debian/patches/series
Modified:
    trunk/libmime-lite-perl/debian/changelog
    trunk/libmime-lite-perl/debian/control
    trunk/libmime-lite-perl/debian/rules
    trunk/libmime-lite-perl/lib/MIME/Lite.pm

Modified: trunk/libmime-lite-perl/debian/changelog
URL: http://svn.debian.org/wsvn/trunk/libmime-lite-perl/debian/changelog?rev=15106&op=diff
==============================================================================
--- trunk/libmime-lite-perl/debian/changelog (original)
+++ trunk/libmime-lite-perl/debian/changelog Sun Feb 17 23:42:02 2008
@@ -1,3 +1,10 @@
+libmime-lite-perl (3.021-4) UNRELEASED; urgency=low
+
+  * Split out patch for #465342 into no_sendmail.patch; add quilt framework.
+  * Add /me to Uploaders.
+
+ -- gregor herrmann <gregor+debian at comodo.priv.at>  Mon, 18 Feb 2008 00:41:25 +0100
+
 libmime-lite-perl (3.021-3) unstable; urgency=low
 
   * Patch upstream to not die if sendmail is not available (closes: #465342)

Modified: trunk/libmime-lite-perl/debian/control
URL: http://svn.debian.org/wsvn/trunk/libmime-lite-perl/debian/control?rev=15106&op=diff
==============================================================================
--- trunk/libmime-lite-perl/debian/control (original)
+++ trunk/libmime-lite-perl/debian/control Sun Feb 17 23:42:02 2008
@@ -5,12 +5,13 @@
 Uploaders: Gunnar Wolf <gwolf at debian.org>,
  Carlo Segre <segre at debian.org>,
  Damyan Ivanov <dmn at debian.org>,
- Dominic Hargreaves <dom at earth.li>
+ Dominic Hargreaves <dom at earth.li>,
+ gregor herrmann <gregor+debian at comodo.priv.at>
 Standards-Version: 3.7.3
 Homepage: http://search.cpan.org/dist/MIME-Lite/
 Vcs-Svn: svn://svn.debian.org/pkg-perl/trunk/libmime-lite-perl/
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-perl/trunk/libmime-lite-perl/
-Build-Depends: debhelper (>= 6)
+Build-Depends: debhelper (>= 6), quilt
 Build-Depends-Indep: perl (>> 5.8.1), libmime-types-perl,
  libtest-pod-perl, libtest-pod-coverage-perl,
  perl-modules, libmailtools-perl,

Added: trunk/libmime-lite-perl/debian/patches/no_sendmail.patch
URL: http://svn.debian.org/wsvn/trunk/libmime-lite-perl/debian/patches/no_sendmail.patch?rev=15106&op=file
==============================================================================
--- trunk/libmime-lite-perl/debian/patches/no_sendmail.patch (added)
+++ trunk/libmime-lite-perl/debian/patches/no_sendmail.patch Sun Feb 17 23:42:02 2008
@@ -1,0 +1,26 @@
+--- libmime-lite-perl.orig/lib/MIME/Lite.pm
++++ libmime-lite-perl/lib/MIME/Lite.pm
+@@ -401,13 +401,13 @@
+         }
+     }
+     unless (-x $SENDMAIL) {
+-        Carp::croak "can't find an executable sendmail"
++        undef $SENDMAIL;
+     }
+ }
+ 
+ ### Our sending facilities:
+ my %SenderArgs = (
+-  sendmail  => ["$SENDMAIL -t -oi -oem"],
++  sendmail  => [$SENDMAIL ? "$SENDMAIL -t -oi -oem" : undef],
+   smtp      => [],
+   sub       => [],
+ );
+@@ -2666,6 +2666,7 @@
+     if ( @_ == 1 and !ref $_[0] ) {
+         ### Use the given command...
+         my $sendmailcmd = shift @_;
++        Carp::croak "No sendmail command available" unless $sendmailcmd;
+ 
+         ### Do it:
+         local *SENDMAIL;

Added: trunk/libmime-lite-perl/debian/patches/series
URL: http://svn.debian.org/wsvn/trunk/libmime-lite-perl/debian/patches/series?rev=15106&op=file
==============================================================================
--- trunk/libmime-lite-perl/debian/patches/series (added)
+++ trunk/libmime-lite-perl/debian/patches/series Sun Feb 17 23:42:02 2008
@@ -1,0 +1,1 @@
+no_sendmail.patch

Modified: trunk/libmime-lite-perl/debian/rules
URL: http://svn.debian.org/wsvn/trunk/libmime-lite-perl/debian/rules?rev=15106&op=diff
==============================================================================
--- trunk/libmime-lite-perl/debian/rules (original)
+++ trunk/libmime-lite-perl/debian/rules Sun Feb 17 23:42:02 2008
@@ -1,6 +1,8 @@
 #! /usr/bin/make -f
 # -*-makefile-*-
 # debian/rules file for libmime-lite-perl
+
+include /usr/share/quilt/quilt.make
 
 PERL	?= /usr/bin/perl
 
@@ -10,14 +12,14 @@
 export PERL_MM_USE_DEFAULT=true; 
 
 build:	build-stamp
-build-stamp:
+build-stamp: $(QUILT_STAMPFN)
 	dh_testdir
 	$(PERL) Makefile.PL INSTALLDIRS=vendor PERL=$(PERL)
 	$(MAKE)
 	$(MAKE) test
 	touch $@
 
-clean:	checkroot
+clean:	checkroot unpatch
 	rm -f build-stamp
 	dh_clean debian/changes
 	dh_clean testout/*

Modified: trunk/libmime-lite-perl/lib/MIME/Lite.pm
URL: http://svn.debian.org/wsvn/trunk/libmime-lite-perl/lib/MIME/Lite.pm?rev=15106&op=diff
==============================================================================
--- trunk/libmime-lite-perl/lib/MIME/Lite.pm (original)
+++ trunk/libmime-lite-perl/lib/MIME/Lite.pm Sun Feb 17 23:42:02 2008
@@ -401,13 +401,13 @@
         }
     }
     unless (-x $SENDMAIL) {
-        undef $SENDMAIL;
+        Carp::croak "can't find an executable sendmail"
     }
 }
 
 ### Our sending facilities:
 my %SenderArgs = (
-  sendmail  => [$SENDMAIL ? "$SENDMAIL -t -oi -oem" : undef],
+  sendmail  => ["$SENDMAIL -t -oi -oem"],
   smtp      => [],
   sub       => [],
 );
@@ -2666,7 +2666,6 @@
     if ( @_ == 1 and !ref $_[0] ) {
         ### Use the given command...
         my $sendmailcmd = shift @_;
-        Carp::croak "No sendmail command available" unless $sendmailcmd;
 
         ### Do it:
         local *SENDMAIL;