r37814 - in /trunk/libemail-send-perl/debian: changelog patches/add_usr_sbin_to_path
nhandler-guest at users.alioth.debian.org
nhandler-guest at users.alioth.debian.org
Sun Jun 7 20:25:31 UTC 2009
Author: nhandler-guest
Date: Sun Jun 7 20:25:26 2009
New Revision: 37814
URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=37814
Log:
* debian/patches/add_usr_sbin_to_path:
- Modify to apply cleanly
- There is no longer a need to patch lib/Email/Send/Sendmail.pm
Modified:
trunk/libemail-send-perl/debian/changelog
trunk/libemail-send-perl/debian/patches/add_usr_sbin_to_path
Modified: trunk/libemail-send-perl/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libemail-send-perl/debian/changelog?rev=37814&op=diff
==============================================================================
--- trunk/libemail-send-perl/debian/changelog (original)
+++ trunk/libemail-send-perl/debian/changelog Sun Jun 7 20:25:26 2009
@@ -6,8 +6,11 @@
* debian/control:
- Add myself to list of Uploaders
- Bump Standards-Version to 3.8.1
+ * debian/patches/add_usr_sbin_to_path:
+ - Modify to apply cleanly
+ - There is no longer a need to patch lib/Email/Send/Sendmail.pm
- -- Nathan Handler <nhandler at ubuntu.com> Sun, 07 Jun 2009 19:12:55 +0000
+ -- Nathan Handler <nhandler at ubuntu.com> Sun, 07 Jun 2009 20:17:59 +0000
libemail-send-perl (2.194-1) unstable; urgency=low
Modified: trunk/libemail-send-perl/debian/patches/add_usr_sbin_to_path
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libemail-send-perl/debian/patches/add_usr_sbin_to_path?rev=37814&op=diff
==============================================================================
--- trunk/libemail-send-perl/debian/patches/add_usr_sbin_to_path (original)
+++ trunk/libemail-send-perl/debian/patches/add_usr_sbin_to_path Sun Jun 7 20:25:26 2009
@@ -7,31 +7,22 @@
Description: turn off tests that expect an empty PATH (won't happen anywhere
after we push /usr/sbin in ...)
+Author: Nathan Handler <nhandler at ubuntu.com>
+Description: In 2.195-1, this patch was updated to apply cleanly after changes
+upstream. There is no longer a need to patch lib/Email/Send/Sendmail.pm.
+
--- a/lib/Email/Send/Qmail.pm
+++ b/lib/Email/Send/Qmail.pm
-@@ -21,7 +21,9 @@ sub _find_qmail {
- my $class = shift;
+@@ -26,7 +26,9 @@
+ return $QMAIL;
+ }
- my $sendmail;
- for my $dir (File::Spec->path) {
+ my @path = File::Spec->path;
+ push @path, '/usr/sbin' unless grep m!^/usr/sbin/?$!, @path;
+ for my $dir (@path) {
if ( -x "$dir/$QMAIL" ) {
$sendmail = "$dir/$QMAIL";
- last;
---- a/lib/Email/Send/Sendmail.pm
-+++ b/lib/Email/Send/Sendmail.pm
-@@ -23,7 +23,9 @@ sub _find_sendmail {
- return $SENDMAIL if defined $SENDMAIL;
-
- my $sendmail;
-- for my $dir (File::Spec->path) {
-+ my @path = File::Spec->path;
-+ push @path, '/usr/sbin' unless grep m!^/usr/sbin/?$!, @path;
-+ for my $dir (@path) {
- if ( -x "$dir/sendmail" ) {
- $sendmail = "$dir/sendmail";
last;
--- a/t/sendmail.t
+++ b/t/sendmail.t
@@ -41,7 +32,7 @@
use strict;
$^W = 1;
-@@ -14,15 +14,15 @@ Subject: This should never show up in my
+@@ -14,15 +14,15 @@
blah blah blah
EOF
More information about the Pkg-perl-cvs-commits
mailing list