[mb2md] 01/01: Refresh all patches to get rid of small line offsets
Axel Beckert
abe at deuxchevaux.org
Sun May 22 13:15:03 UTC 2016
This is an automated email from the git hooks/post-receive script.
abe pushed a commit to branch master
in repository mb2md.
commit eeaf609628a6793ef635ec27f595f38398e1d76b
Author: Axel Beckert <abe at deuxchevaux.org>
Date: Sun May 22 12:31:10 2016 +0200
Refresh all patches to get rid of small line offsets
---
debian/changelog | 1 +
.../Make-source-and-destination-path-expansion-behave-mo.patch | 10 ++++------
debian/patches/better-separator-line-detection.patch | 10 ++++------
debian/patches/fix-dash-r-option.patch | 10 ++++------
debian/patches/fix-uw-imap-misspellings.patch | 8 +++-----
5 files changed, 16 insertions(+), 23 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index c19e87f..1da24c8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -13,6 +13,7 @@ mb2md (3.20-8) UNRELEASED; urgency=medium
* Convert debian/copyright to machine-readable DEP5 format
+ The packaging is licensed under GPLv3 as Noël stated in a private,
signed e-mail to me.
+ * Refresh all patches to get rid of small line offsets.
-- Salvatore Bonaccorso <carnil at debian.org> Sat, 30 Jan 2016 20:07:36 +0100
diff --git a/debian/patches/Make-source-and-destination-path-expansion-behave-mo.patch b/debian/patches/Make-source-and-destination-path-expansion-behave-mo.patch
index 6574483..a773ad4 100644
--- a/debian/patches/Make-source-and-destination-path-expansion-behave-mo.patch
+++ b/debian/patches/Make-source-and-destination-path-expansion-behave-mo.patch
@@ -9,11 +9,9 @@ Author: Axel Beckert <abe at debian.org>
mb2md-3.20.pl | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
-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
+@@ -411,6 +411,7 @@
my $dest = undef;
my $strip_ext = undef;
my $use_cl = undef; # defines whether we use the Content-Length: header if present
@@ -21,7 +19,7 @@ index 2945254..d18d224 100644
# 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 @@ elsif (defined($opts{s}))
+@@ -443,7 +444,7 @@
# it is a subdir of the users $home
# if it does start with a "/" then
# let's take $mbroot as a absolut path
@@ -30,7 +28,7 @@ index 2945254..d18d224 100644
# check if the given source is a mbox file
if (-f $opts{s})
-@@ -493,13 +494,13 @@ if(defined($opts{l}))
+@@ -493,13 +494,13 @@
# if the destination is relative to the home dir,
# check that the home dir exists
@@ -46,7 +44,7 @@ index 2945254..d18d224 100644
# get rid of trailing /'s
$dest =~ s/\/$//;
-@@ -754,6 +755,7 @@ sub convert
+@@ -755,6 +756,7 @@
# Change to the target mailbox directory.
chdir "$maildir" ;
diff --git a/debian/patches/better-separator-line-detection.patch b/debian/patches/better-separator-line-detection.patch
index 88767fc..ae6432b 100644
--- a/debian/patches/better-separator-line-detection.patch
+++ b/debian/patches/better-separator-line-detection.patch
@@ -3,11 +3,9 @@ Bug-Debian: https://bugs.debian.org/578084
Author: Pete Ashdown <pashdown at xmission.com>
Author: Axel Beckert <abe at debian.org>
-Index: mb2md/mb2md-3.20.pl
-===================================================================
---- mb2md.orig/mb2md-3.20.pl 2013-10-16 22:53:45.000000000 +0200
-+++ mb2md/mb2md-3.20.pl 2013-10-16 23:10:04.000000000 +0200
-@@ -601,7 +601,7 @@
+--- a/mb2md-3.20.pl
++++ b/mb2md-3.20.pl
+@@ -600,7 +600,7 @@
return 1 if(-z $mbxfile);
sysopen(MBXFILE, "$mbxfile", O_RDONLY) or die "Could not open $mbxfile ! \n";
while(<MBXFILE>) {
@@ -16,7 +14,7 @@ Index: mb2md/mb2md-3.20.pl
close(MBXFILE);
return 1;
}
-@@ -1005,7 +1005,7 @@
+@@ -1003,7 +1003,7 @@
# exchange possible Windows EOL (CRLF) with Unix EOL (LF)
$_ =~ s/\r\n$/\n/;
diff --git a/debian/patches/fix-dash-r-option.patch b/debian/patches/fix-dash-r-option.patch
index f9d188b..d295a5d 100644
--- a/debian/patches/fix-dash-r-option.patch
+++ b/debian/patches/fix-dash-r-option.patch
@@ -3,11 +3,9 @@ Bug-Debian: https://bugs.debian.org/333499
Author: Bastien Mourgues <b.mourgues at newtech.fr>
Reviewd-By: Axel Beckert <abe at debian.org>
-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 @@
+--- a/mb2md-3.20.pl
++++ b/mb2md-3.20.pl
+@@ -642,6 +642,7 @@
# Appending $oldpath => path is only missing $dest
$destinationdir = "$temppath.$destinationdir";
@@ -15,7 +13,7 @@ Index: mb2md/mb2md-3.20.pl
# Converting '/' to '.' in $destinationdir
$destinationdir =~s/\/+/\./g;
-@@ -678,7 +679,7 @@
+@@ -677,7 +678,7 @@
#
# if $strip_extension is defined,
# strip it off the $targetfile
diff --git a/debian/patches/fix-uw-imap-misspellings.patch b/debian/patches/fix-uw-imap-misspellings.patch
index 4477242..bf2c13f 100644
--- a/debian/patches/fix-uw-imap-misspellings.patch
+++ b/debian/patches/fix-uw-imap-misspellings.patch
@@ -2,10 +2,8 @@ Description: Fix UW-IMAP misspellings
Bug-Debian: https://bugs.debian.org/757601
Author: Axel Beckert <abe at debian.org>
-Index: mb2md/mb2md-3.20.pl
-===================================================================
---- mb2md.orig/mb2md-3.20.pl 2014-08-10 14:26:10.536087525 +0200
-+++ mb2md/mb2md-3.20.pl 2014-08-10 14:26:48.218778318 +0200
+--- a/mb2md-3.20.pl
++++ b/mb2md-3.20.pl
@@ -172,8 +172,8 @@
# the corresponding maildir. The extension must be
# given without the leading dot ("."). See the example below.
@@ -17,7 +15,7 @@ Index: mb2md/mb2md-3.20.pl
# be found in the file called .mailboxlist in the users
# home directory. This will convert all subscribed folders
# for a single user:
-@@ -705,7 +705,7 @@
+@@ -704,7 +704,7 @@
# ------------------------
#
# It checks that the folder to be converted is in the list of subscribed
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-perl/packages/mb2md.git
More information about the Pkg-perl-cvs-commits
mailing list