This is an automated email from the git hooks/post-receive script. hlieberman-guest pushed a commit to branch master in repository libarchive-zip-perl.
commit f323d635b0feaa4090a881d99d66c80ade6f4f27 Author: Harlan Lieberman-Berg <h.liebermanb...@gmail.com> Date: Tue Mar 25 13:09:31 2014 -0400 Delete patches applied upstream and refresh remaining patches. --- ...bedded-File-Which-which-work-in-BEGIN-blo.patch | 42 ---------------------- ...cpan.org-73797-deflated-empty-file-direct.patch | 11 ++---- debian/patches/fix-spelling-error.patch | 18 ---------- .../fix_META.yml_min_required_perl_version.patch | 22 ------------ debian/patches/fix_clean_target.patch | 19 ---------- debian/patches/series | 4 --- 6 files changed, 2 insertions(+), 114 deletions(-) diff --git a/debian/patches/0001-Make-the-embedded-File-Which-which-work-in-BEGIN-blo.patch b/debian/patches/0001-Make-the-embedded-File-Which-which-work-in-BEGIN-blo.patch deleted file mode 100644 index c29d916..0000000 --- a/debian/patches/0001-Make-the-embedded-File-Which-which-work-in-BEGIN-blo.patch +++ /dev/null @@ -1,42 +0,0 @@ -From c191ff37a6998471dd37d6f5f383236a2e6f492c Mon Sep 17 00:00:00 2001 -From: Niko Tyni <nt...@debian.org> -Date: Tue, 10 Jan 2012 20:28:48 +0200 -Subject: [PATCH 1/3] Make the embedded File::Which::which() work in BEGIN - blocks - -The File::Which::which() subroutine uses a lexical variable @path_ext, -which used to be uninitialized when the subroutine was called -from BEGIN blocks. - -This included the 'use constant' lines, making both HAVEZIP and HAVEUNZIP -constants unconditionally false and disabling 'testzip' functionality -in for instance t/02_main.t: - - ok 132 # skip No 'unzip' program to test against ---- - t/common.pl | 2 ++ - 1 files changed, 2 insertions(+), 0 deletions(-) - -diff --git a/t/common.pl b/t/common.pl -index 808d6b8..1560fd2 100644 ---- a/t/common.pl -+++ b/t/common.pl -@@ -7,6 +7,7 @@ use constant OUTPUTZIP => 'testout.zip'; - - # Do we have the 'zip' and 'unzip' programs? - # Embed a copy of the module, rather than adding a dependency -+BEGIN { - SCOPE: { - package File::Which; - -@@ -103,6 +104,7 @@ SCOPE: { - } - } - } -+} - use constant HAVEZIP => !! File::Which::which('zip'); - use constant HAVEUNZIP => !! File::Which::which('unzip'); - --- -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 49aba6a..16ff9ed 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 @@ -12,11 +12,9 @@ of an empty file.) t/17_bug_73797.t | 3 --- 2 files changed, 1 insertions(+), 4 deletions(-) -diff --git a/lib/Archive/Zip/Member.pm b/lib/Archive/Zip/Member.pm -index f86ef75..d4d709a 100644 --- a/lib/Archive/Zip/Member.pm +++ b/lib/Archive/Zip/Member.pm -@@ -1011,7 +1011,7 @@ sub _writeToFileHandle { +@@ -1062,7 +1062,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 = ( @@ -25,11 +23,9 @@ index f86ef75..d4d709a 100644 and ($self->compressionMethod() == COMPRESSION_STORED or $self->desiredCompressionMethod() == COMPRESSION_DEFLATED ) ); -diff --git a/t/17_bug_73797.t b/t/17_bug_73797.t -index 9280d84..8cacf54 100644 --- a/t/17_bug_73797.t +++ b/t/17_bug_73797.t -@@ -23,7 +23,4 @@ is($zip->writeToFileNamed(OUTPUTZIP), AZ_OK, 'Wrote file'); +@@ -23,7 +23,4 @@ my ($status, $zipout) = testZip(); # STDERR->print("status= $status, out=$zipout\n"); skip( "test zip doesn't work", 1 ) if $testZipDoesntWork; @@ -37,6 +33,3 @@ index 9280d84..8cacf54 100644 - 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/fix-spelling-error.patch b/debian/patches/fix-spelling-error.patch deleted file mode 100644 index 0213d28..0000000 --- a/debian/patches/fix-spelling-error.patch +++ /dev/null @@ -1,18 +0,0 @@ -Description: Fix spelling error in manpage reported by lintian. -Origin: vendor -Bug: https://rt.cpan.org/Public/Bug/Display.html?id=59102 -Forwarded: yes -Author: Salvatore Bonaccorso <salvatore.bonacco...@gmail.com> -Last-Update: 2010-07-05 - ---- a/lib/Archive/Zip.pm -+++ b/lib/Archive/Zip.pm -@@ -2014,7 +2014,7 @@ - - * Handle tainted paths correctly - --* Work on better compatability with other IO:: modules -+* Work on better compatibility with other IO:: modules - - =head1 SUPPORT - diff --git a/debian/patches/fix_META.yml_min_required_perl_version.patch b/debian/patches/fix_META.yml_min_required_perl_version.patch deleted file mode 100644 index f773066..0000000 --- a/debian/patches/fix_META.yml_min_required_perl_version.patch +++ /dev/null @@ -1,22 +0,0 @@ -Description: libarchive-zip-perl FTBFS with Perl::MinimumVersion >= - 1.22. libarchive-zip-perl uses functions in tests which requires Perl - >= 5.6. Bump required version of Perl in META.yml. -Origin: vendor -Bug: http://rt.cpan.org/Public/Bug/Display.html?id=52696 -Bug-Debian: http://bugs.debian.org/560632 -Forwarded: yes -Author: Salvatore Bonaccorso <salvatore.bonacco...@gmail.com> -Last-Update: 2010-05-06 -Applied-Upstream: yes, http://svn.ali.as/cpan/trunk/Archive-Zip/ - ---- a/META.yml -+++ b/META.yml -@@ -21,7 +21,7 @@ - IO::File: 0 - IO::Handle: 0 - IO::Seekable: 0 -- perl: 5.00396 -+ perl: 5.006 - Test::More: 0.42 - Time::Local: 0 - no_index: diff --git a/debian/patches/fix_clean_target.patch b/debian/patches/fix_clean_target.patch deleted file mode 100644 index 5a74099..0000000 --- a/debian/patches/fix_clean_target.patch +++ /dev/null @@ -1,19 +0,0 @@ -Description: fix clean target - Mangling all filenames into one long string is not what we want. -Origin: vendor -Bug: https://rt.cpan.org/Ticket/Display.html?id=75197 -Forwarded: https://rt.cpan.org/Ticket/Display.html?id=75197 -Author: gregor herrmann <gre...@debian.org> -Last-Update: 2012-02-21 - ---- a/Makefile.PL -+++ b/Makefile.PL -@@ -28,7 +28,7 @@ - 'Time::Local' => 0, - }, - clean => { -- FILES => join( '', qw{ -+ FILES => join( ' ', qw{ - test.log - testdir/* - testdir/ diff --git a/debian/patches/series b/debian/patches/series index eb7a19d..971a7a6 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,7 +1,3 @@ fix_example_shebangs.patch -fix_META.yml_min_required_perl_version.patch -fix-spelling-error.patch -0001-Make-the-embedded-File-Which-which-work-in-BEGIN-blo.patch 0002-TODO-test-for-rt.cpan.org-73797-deflated-empty-file-.patch 0003-Fix-for-rt.cpan.org-73797-deflated-empty-file-direct.patch -fix_clean_target.patch -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-perl/packages/libarchive-zip-perl.git _______________________________________________ Pkg-perl-cvs-commits mailing list Pkg-perl-cvs-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-perl-cvs-commits