[libmail-mbox-messageparser-perl] 07/12: Drop xz-support.patch, merged upstream.

gregor herrmann gregoa at debian.org
Sun Jul 5 15:35:39 UTC 2015


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

gregoa pushed a commit to branch master
in repository libmail-mbox-messageparser-perl.

commit ec9c083daf04aeea45d42de70f8d03fe22166e02
Author: gregor herrmann <gregoa at debian.org>
Date:   Sun Jul 5 16:50:24 2015 +0200

    Drop xz-support.patch, merged upstream.
---
 debian/patches/series           |  1 -
 debian/patches/xz-support.patch | 44 -----------------------------------------
 2 files changed, 45 deletions(-)

diff --git a/debian/patches/series b/debian/patches/series
index 371deca..5e75259 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,2 @@
 paths.patch
 warnings.patch
-xz-support.patch
diff --git a/debian/patches/xz-support.patch b/debian/patches/xz-support.patch
deleted file mode 100644
index a3997e0..0000000
--- a/debian/patches/xz-support.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-Description: Add support for XZ-compressed mailboxes
-Origin: https://rt.cpan.org/Public/Bug/Display.html?id=68286
-Bug-Debian: https://bugs.debian.org/770077
-Bug: https://rt.cpan.org/Public/Bug/Display.html?id=68286
-
---- a/lib/Mail/Mbox/MessageParser/Config.pm
-+++ b/lib/Mail/Mbox/MessageParser/Config.pm
-@@ -13,6 +13,7 @@ $VERSION = sprintf "%d.%02d%02d", q/0.1.
-     'diff' => '/usr/bin/diff',
-     'grep' => '/bin/grep',
-     'gzip' => '/bin/gzip',
-+    'xz' => '/usr/bin/xz',
-   },
- 
-   'max_testchar_buffer_size' => 1048576,
---- a/lib/Mail/Mbox/MessageParser.pm
-+++ b/lib/Mail/Mbox/MessageParser.pm
-@@ -390,6 +390,7 @@ sub _GET_FILE_TYPE
-   # See "magic" on unix systems for details on how to identify file types
-   return 'bzip2' if substr($test_chars, 0, 3) eq 'BZh';
-   return 'bzip' if substr($test_chars, 0, 2) eq 'BZ';
-+  return 'xz' if substr($test_chars, 1, 4) eq '7zXZ';
- #  return 'zip' if substr($test_chars, 0, 2) eq 'PK' &&
- #    ord(substr($test_chars,3,1)) == 0003 && ord(substr($test_chars,4,1)) == 0004;
-   return 'gzip' if
-@@ -483,7 +484,7 @@ sub _IS_COMPRESSED_TYPE
-   
-   local $" = '|';
- 
--  my @types = qw( gzip bzip bzip2 compress );
-+  my @types = qw( gzip bzip bzip2 xz compress );
-   my $file_type_pattern = "(@types)";
- 
-   return $file_type =~ /^$file_type_pattern$/;
---- a/Makefile.PL
-+++ b/Makefile.PL
-@@ -55,6 +55,7 @@ sub Configure_Programs
-                                    numbers => '[2.1,)', },
-                       },
-                     },
-+      'xz'       => { default => 'xz', argname => 'XZ' },
-       'gzip'     => { default => 'gzip', argname => 'GZIP' },
-       'bzip'     => { default => 'bzip2', argname => 'BZIP',
-                       types => {

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



More information about the Pkg-perl-cvs-commits mailing list