This is an automated email from the git hooks/post-receive script. bremner pushed a commit to branch master in repository mb2md.
commit 9994dad99514896004525473f8e9322f528f3722 Author: David Bremner <[email protected]> Date: Sat Aug 30 17:56:26 2014 -0700 update path expansion patch. This is a proposed fix for 759912: prepend the working directory only to relative paths (i.e. those that don't start with /) --- ...and-destination-path-expansion-behave-mo.patch} | 27 ++++++++++++++-------- debian/patches/series | 2 +- 2 files changed, 18 insertions(+), 11 deletions(-) diff --git a/debian/patches/fix-path-expansion.patch b/debian/patches/Make-source-and-destination-path-expansion-behave-mo.patch similarity index 68% rename from debian/patches/fix-path-expansion.patch rename to debian/patches/Make-source-and-destination-path-expansion-behave-mo.patch index d14a46e..c0f78b1 100644 --- a/debian/patches/fix-path-expansion.patch +++ b/debian/patches/Make-source-and-destination-path-expansion-behave-mo.patch @@ -1,12 +1,19 @@ -Description: Make source and destination path expansion behave more like users expect it +From: Debian Perl Group <[email protected]> +Date: Sat, 30 Aug 2014 17:12:45 -0700 +Subject: Make source and destination path expansion behave more like users + expect it + Bug-Debian: http://bugs.debian.org/594049 Author: Axel Beckert <[email protected]> +--- + mb2md-3.20.pl | 8 +++++--- + 1 file changed, 5 insertions(+), 3 deletions(-) -Index: mb2md/mb2md-3.20.pl -=================================================================== ---- mb2md.orig/mb2md-3.20.pl 2013-10-16 14:41:39.000000000 +0200 -+++ mb2md/mb2md-3.20.pl 2013-10-16 16:52:21.000000000 +0200 -@@ -411,6 +411,7 @@ +diff --git a/mb2md-3.20.pl b/mb2md-3.20.pl +index 2945254..d18d224 100644 +--- a/mb2md-3.20.pl ++++ b/mb2md-3.20.pl +@@ -411,6 +411,7 @@ my $mbfile = undef; # this is an mbox file my $dest = undef; my $strip_ext = undef; my $use_cl = undef; # defines whether we use the Content-Length: header if present @@ -14,7 +21,7 @@ Index: mb2md/mb2md-3.20.pl # if option "-c" is given, we use the Content-Length: header if present # dangerous! may be unreliable, as the whole CL stuff is a bad idea -@@ -443,7 +444,7 @@ +@@ -443,7 +444,7 @@ elsif (defined($opts{s})) # it is a subdir of the users $home # if it does start with a "/" then # let's take $mbroot as a absolut path @@ -23,7 +30,7 @@ Index: mb2md/mb2md-3.20.pl # check if the given source is a mbox file if (-f $opts{s}) -@@ -493,13 +494,13 @@ +@@ -493,13 +494,13 @@ if(defined($opts{l})) # if the destination is relative to the home dir, # check that the home dir exists @@ -39,11 +46,11 @@ Index: mb2md/mb2md-3.20.pl # get rid of trailing /'s $dest =~ s/\/$//; -@@ -754,6 +755,7 @@ +@@ -754,6 +755,7 @@ sub convert # Change to the target mailbox directory. chdir "$maildir" ; -+ $mbox = "$pwd/$mbox"; ++ $mbox = "$pwd/$mbox" if ($mbox !~ m(^[/.])); # Converts a Mbox to multiple files # in a Maildir. diff --git a/debian/patches/series b/debian/patches/series index 2c0e2d0..2107c0d 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,4 +1,4 @@ -fix-path-expansion.patch fix-dash-r-option.patch better-separator-line-detection.patch fix-uw-imap-misspellings.patch +Make-source-and-destination-path-expansion-behave-mo.patch -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-perl/packages/mb2md.git _______________________________________________ Pkg-perl-cvs-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-perl-cvs-commits
