[mb2md] 24/30: Add patch by Bastien Mourgues to fix the -r option

[Axel Beckert]

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

abe pushed a commit to branch master
in repository mb2md.

commit 99198739703d17fbc538eea8176507c1e0e11229
Author: Axel Beckert <abe at deuxchevaux.org>
Date:   Wed Oct 16 20:23:24 2013 +0200

    Add patch by Bastien Mourgues to fix the -r option
    
    Closes: #333499
---
 debian/changelog                       |    1 +
 debian/patches/fix-dash-r-option.patch |   21 +++++++++++++++++++++
 debian/patches/series                  |    1 +
 3 files changed, 23 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index cecee47..41288b8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -26,6 +26,7 @@ mb2md (3.20-5) UNRELEASED; urgency=low
   * Add patch to make source and destination path expansion behave more
     like most users expect it. (Closes: #594049)
     + Update man page and USAGE accordingly
+  * Add patch by Bastien Mourgues to fix the -r option (Closes: #333499)
 
  -- Axel Beckert <abe at debian.org>  Wed, 16 Oct 2013 14:44:56 +0200
 
diff --git a/debian/patches/fix-dash-r-option.patch b/debian/patches/fix-dash-r-option.patch
new file mode 100644
index 0000000..9e48a2b
--- /dev/null
+++ b/debian/patches/fix-dash-r-option.patch
@@ -0,0 +1,21 @@
+Index: mb2md/mb2md-3.20.pl
+===================================================================
+--- mb2md.orig/mb2md-3.20.pl	2013-10-16 20:20:35.000000000 +0200
++++ mb2md/mb2md-3.20.pl	2013-10-16 20:21:13.000000000 +0200
+@@ -643,6 +643,7 @@
+ 	
+ 	# Appending $oldpath => path is only missing $dest
+ 	$destinationdir = "$temppath.$destinationdir";
++	defined($strip_ext) && ($destinationdir =~ s/\_$strip_ext$//);
+ 
+ 	# Converting '/' to '.' in $destinationdir
+ 	$destinationdir =~s/\/+/\./g;
+@@ -678,7 +679,7 @@
+ 		#
+ 		# if $strip_extension is defined,
+ 		# strip it off the $targetfile
+-	    	defined($strip_ext) && ($destinationdir =~ s/\.$strip_ext$//);
++#	    	defined($strip_ext) && ($destinationdir =~ s/\_$strip_ext$//);
+ 		&convert("$mbroot/$oldpath/$dir","$dest/$destinationdir");
+ 		$mailboxcount++;
+ 	}
diff --git a/debian/patches/series b/debian/patches/series
index 363de90..2903631 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 fix-path-expansion.patch
+fix-dash-r-option.patch

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