[libarchive-zip-perl] 03/07: Refresh patches (offset, renamed file, whitespace defuzzying).

[gregor herrmann]

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

gregoa pushed a commit to branch master
in repository libarchive-zip-perl.

commit 62ab6814166bdcb7b0a96a73dc1c44947a2a0320
Author: gregor herrmann <gregoa at debian.org>
Date:   Wed Oct 22 20:55:23 2014 +0200

    Refresh patches (offset, renamed file, whitespace defuzzying).
---
 ...O-test-for-rt.cpan.org-73797-deflated-empty-file-.patch | 14 ++------------
 ...-for-rt.cpan.org-73797-deflated-empty-file-direct.patch | 10 +++++-----
 debian/patches/fix_example_shebangs.patch                  |  5 +++--
 3 files changed, 10 insertions(+), 19 deletions(-)

diff --git a/debian/patches/0002-TODO-test-for-rt.cpan.org-73797-deflated-empty-file-.patch b/debian/patches/0002-TODO-test-for-rt.cpan.org-73797-deflated-empty-file-.patch
index b986d23..c249e76 100644
--- a/debian/patches/0002-TODO-test-for-rt.cpan.org-73797-deflated-empty-file-.patch
+++ b/debian/patches/0002-TODO-test-for-rt.cpan.org-73797-deflated-empty-file-.patch
@@ -23,12 +23,9 @@ from OpenJDK 6:
  create mode 100644 t/17_bug_73797.t
  create mode 100644 t/data/jar.zip
 
-diff --git a/t/17_bug_73797.t b/t/17_bug_73797.t
-new file mode 100644
-index 0000000..9280d84
 --- /dev/null
 +++ b/t/17_bug_73797.t
-@@ -0,0 +1,29 @@
+@@ -0,0 +1,25 @@
 +#!/usr/bin/perl
 +
 +use strict;
@@ -40,11 +37,7 @@ index 0000000..9280d84
 +use Archive::Zip qw( :ERROR_CODES );
 +use Test::More tests => 4;
 +
-+BEGIN {
-+    unshift @INC, "t/"; 
-+    require( File::Spec->catfile('t', 'common.pl') )
-+                or die "Can't load t/common.pl";
-+}
++use t::common;
 +
 +my $zip = Archive::Zip->new();
 +isa_ok( $zip, 'Archive::Zip' );
@@ -58,6 +51,3 @@ index 0000000..9280d84
 +    local $TODO = "deflated empty files/directories corrupt the output";
 +is( $status, 0, "output zip isn't corrupted" );
 +}
--- 
-1.7.8.2
-
diff --git a/debian/patches/0003-Fix-for-rt.cpan.org-73797-deflated-empty-file-direct.patch b/debian/patches/0003-Fix-for-rt.cpan.org-73797-deflated-empty-file-direct.patch
index 16ff9ed..c441928 100644
--- a/debian/patches/0003-Fix-for-rt.cpan.org-73797-deflated-empty-file-direct.patch
+++ b/debian/patches/0003-Fix-for-rt.cpan.org-73797-deflated-empty-file-direct.patch
@@ -14,15 +14,15 @@ of an empty file.)
 
 --- a/lib/Archive/Zip/Member.pm
 +++ b/lib/Archive/Zip/Member.pm
-@@ -1062,7 +1062,7 @@
+@@ -1042,7 +1042,7 @@
      # I need to do this if I can't refresh the header
      # and I don't know compressed size or crc32 fields.
      my $headerFieldsUnknown = (
--        ( $self->uncompressedSize() > 0 )
-+        ( $self->uncompressedSize() > 0 or $self->compressedSize > 0 )
+-        ($self->uncompressedSize() > 0)
++        ($self->uncompressedSize() > 0 or $self->compressedSize > 0)
            and ($self->compressionMethod() == COMPRESSION_STORED
-             or $self->desiredCompressionMethod() == COMPRESSION_DEFLATED )
-     );
+             or $self->desiredCompressionMethod() == COMPRESSION_DEFLATED));
+ 
 --- a/t/17_bug_73797.t
 +++ b/t/17_bug_73797.t
 @@ -23,7 +23,4 @@
diff --git a/debian/patches/fix_example_shebangs.patch b/debian/patches/fix_example_shebangs.patch
index b087b7f..0eb5ede 100644
--- a/debian/patches/fix_example_shebangs.patch
+++ b/debian/patches/fix_example_shebangs.patch
@@ -4,7 +4,8 @@ Description: The module provides several example scripts written in Perl
 Bug-Debian: http://bugs.debian.org/543659
 Forwarded: not-needed
 Author: Ernesto Hernández-Novich <emhn at usb.ve>
-Last-Update: 2010-05-06
+Reviewed-by: gregor herrmann <gregoa at debian.org>
+Last-Update: 2014-10-22
 
 --- a/examples/calcSizes.pl
 +++ b/examples/calcSizes.pl
@@ -43,7 +44,7 @@ Last-Update: 2010-05-06
  #
  # Shows one way to write a self-extracting archive file.
  # This is not intended for production use, and it always extracts to a
-@@ -46,7 +46,7 @@
+@@ -44,7 +44,7 @@
  
  # below the __DATA__ line is the extraction stub:
  __DATA__

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