r20195 - in /trunk/libio-compress-base-perl: Changes META.yml README debian/changelog lib/IO/Compress/Base.pm lib/IO/Compress/Base/Common.pm lib/IO/Uncompress/AnyUncompress.pm lib/IO/Uncompress/Base.pm

gregoa at users.alioth.debian.org gregoa at users.alioth.debian.org
Mon May 19 19:21:30 UTC 2008


Author: gregoa
Date: Mon May 19 19:21:30 2008
New Revision: 20195

URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=20195
Log:
New upstream release.

Modified:
    trunk/libio-compress-base-perl/Changes
    trunk/libio-compress-base-perl/META.yml
    trunk/libio-compress-base-perl/README
    trunk/libio-compress-base-perl/debian/changelog
    trunk/libio-compress-base-perl/lib/IO/Compress/Base.pm
    trunk/libio-compress-base-perl/lib/IO/Compress/Base/Common.pm
    trunk/libio-compress-base-perl/lib/IO/Uncompress/AnyUncompress.pm
    trunk/libio-compress-base-perl/lib/IO/Uncompress/Base.pm

Modified: trunk/libio-compress-base-perl/Changes
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libio-compress-base-perl/Changes?rev=20195&op=diff
==============================================================================
--- trunk/libio-compress-base-perl/Changes (original)
+++ trunk/libio-compress-base-perl/Changes Mon May 19 19:21:30 2008
@@ -1,5 +1,17 @@
 CHANGES
 -------
+
+  2.011 17 May 2008
+
+      * IO::Compress::Base
+        - Fixed problem that prevented the creation of a zip file that
+          contained more than one compression method.
+
+      * IO::Compress::Base::Common
+        - The private Validator class in this module clashes with another
+          CPAN module. Moved Validator into the IO::Compress::Base::Common
+          namespace.
+          [RT #35954]
 
   2.010 5 May 2008
 

Modified: trunk/libio-compress-base-perl/META.yml
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libio-compress-base-perl/META.yml?rev=20195&op=diff
==============================================================================
--- trunk/libio-compress-base-perl/META.yml (original)
+++ trunk/libio-compress-base-perl/META.yml Mon May 19 19:21:30 2008
@@ -1,6 +1,6 @@
 --- #YAML:1.0
 name:                IO-Compress-Base
-version:             2.010
+version:             2.011
 abstract:            Base Class for IO::Compress modules 
 license:             perl
 author:              

Modified: trunk/libio-compress-base-perl/README
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libio-compress-base-perl/README?rev=20195&op=diff
==============================================================================
--- trunk/libio-compress-base-perl/README (original)
+++ trunk/libio-compress-base-perl/README Mon May 19 19:21:30 2008
@@ -1,9 +1,9 @@
 
                              IO-Compress-Base
 
-                             Version 2.010
+                             Version 2.011
 
-                               5th May 2008
+                               17th May 2008
 
        Copyright (c) 2005-2008 Paul Marquess. All rights reserved.
           This program is free software; you can redistribute it
@@ -76,7 +76,7 @@
         If you haven't installed IO-Compress-Base then search IO::Compress::Base.pm
         for a line like this:
 
-          $VERSION = "2.010" ;
+          $VERSION = "2.011" ;
 
  2. If you are having problems building IO-Compress-Base, send me a
     complete log of what happened. Start by unpacking the IO-Compress-Base

Modified: trunk/libio-compress-base-perl/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libio-compress-base-perl/debian/changelog?rev=20195&op=diff
==============================================================================
--- trunk/libio-compress-base-perl/debian/changelog (original)
+++ trunk/libio-compress-base-perl/debian/changelog Mon May 19 19:21:30 2008
@@ -1,3 +1,9 @@
+libio-compress-base-perl (2.011-1) UNRELEASED; urgency=low
+
+  * New upstream release.
+
+ -- gregor herrmann <gregoa at debian.org>  Mon, 19 May 2008 21:20:04 +0200
+
 libio-compress-base-perl (2.010-1) unstable; urgency=low
 
   * New upstream release.

Modified: trunk/libio-compress-base-perl/lib/IO/Compress/Base.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libio-compress-base-perl/lib/IO/Compress/Base.pm?rev=20195&op=diff
==============================================================================
--- trunk/libio-compress-base-perl/lib/IO/Compress/Base.pm (original)
+++ trunk/libio-compress-base-perl/lib/IO/Compress/Base.pm Mon May 19 19:21:30 2008
@@ -6,7 +6,7 @@
 use strict ;
 use warnings;
 
-use IO::Compress::Base::Common 2.010 ;
+use IO::Compress::Base::Common 2.011 ;
 
 use IO::File ;
 use Scalar::Util qw(blessed readonly);
@@ -20,7 +20,7 @@
 our (@ISA, $VERSION);
 @ISA    = qw(Exporter IO::File);
 
-$VERSION = '2.010';
+$VERSION = '2.011';
 
 #Can't locate object method "SWASHNEW" via package "utf8" (perhaps you forgot to load "utf8"?) at .../ext/Compress-Zlib/Gzip/blib/lib/Compress/Zlib/Common.pm line 16.
 
@@ -236,7 +236,7 @@
     my $status ;
     if (! $merge)
     {
-        *$obj->{Compress} = $obj->mkComp($class, $got)
+        *$obj->{Compress} = $obj->mkComp($got)
             or return undef;
         
         *$obj->{UnCompSize} = new U64 ;
@@ -323,7 +323,7 @@
     my $haveOut = @_ ;
     my $output = shift ;
 
-    my $x = new Validator($class, *$obj->{Error}, $name, $input, $output)
+    my $x = new IO::Compress::Base::Validator($class, *$obj->{Error}, $name, $input, $output)
         or return undef ;
 
     push @_, $output if $haveOut && $x->{Hash};
@@ -699,15 +699,13 @@
     $self->ckParams($got)
         or $self->croakError("newStream: $self->{Error}");
 
+    *$self->{Compress} = $self->mkComp($got)
+        or return 0;
+
     *$self->{Header} = $self->mkHeader($got) ;
     $self->output(*$self->{Header} )
         or return 0;
     
-    my $status = $self->reset() ;
-    return $self->saveErrorString(0, *$self->{Compress}{Error}, 
-                                  *$self->{Compress}{ErrorNo})
-        if $status == STATUS_ERROR;
-
     *$self->{UnCompSize}->reset();
     *$self->{CompSize}->reset();
 
@@ -977,3 +975,4 @@
 This program is free software; you can redistribute it and/or
 modify it under the same terms as Perl itself.
 
+

Modified: trunk/libio-compress-base-perl/lib/IO/Compress/Base/Common.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libio-compress-base-perl/lib/IO/Compress/Base/Common.pm?rev=20195&op=diff
==============================================================================
--- trunk/libio-compress-base-perl/lib/IO/Compress/Base/Common.pm (original)
+++ trunk/libio-compress-base-perl/lib/IO/Compress/Base/Common.pm Mon May 19 19:21:30 2008
@@ -11,7 +11,7 @@
 require Exporter;
 our ($VERSION, @ISA, @EXPORT, %EXPORT_TAGS, $HAS_ENCODE);
 @ISA = qw(Exporter);
-$VERSION = '2.010';
+$VERSION = '2.011';
 
 @EXPORT = qw( isaFilehandle isaFilename whatIsInput whatIsOutput 
               isaFileGlobString cleanFileGlobString oneTarget
@@ -192,7 +192,7 @@
     return $_[0] =~ /^(code|handle|buffer|filename)$/;
 }
 
-sub Validator::new
+sub IO::Compress::Base::Validator::new
 {
     my $class = shift ;
 
@@ -320,7 +320,7 @@
     return $obj ;
 }
 
-sub Validator::saveErrorString
+sub IO::Compress::Base::Validator::saveErrorString
 {
     my $self   = shift ;
     ${ $self->{Error} } = shift ;
@@ -328,7 +328,7 @@
     
 }
 
-sub Validator::croakError
+sub IO::Compress::Base::Validator::croakError
 {
     my $self   = shift ;
     $self->saveErrorString($_[0]);
@@ -337,7 +337,7 @@
 
 
 
-sub Validator::validateInputFilenames
+sub IO::Compress::Base::Validator::validateInputFilenames
 {
     my $self = shift ;
 
@@ -367,7 +367,7 @@
     return 1 ;
 }
 
-sub Validator::validateInputArray
+sub IO::Compress::Base::Validator::validateInputArray
 {
     my $self = shift ;
 
@@ -398,7 +398,7 @@
     return 1 ;
 }
 
-#sub Validator::validateHash
+#sub IO::Compress::Base::Validator::validateHash
 #{
 #    my $self = shift ;
 #    my $href = shift ;

Modified: trunk/libio-compress-base-perl/lib/IO/Uncompress/AnyUncompress.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libio-compress-base-perl/lib/IO/Uncompress/AnyUncompress.pm?rev=20195&op=diff
==============================================================================
--- trunk/libio-compress-base-perl/lib/IO/Uncompress/AnyUncompress.pm (original)
+++ trunk/libio-compress-base-perl/lib/IO/Uncompress/AnyUncompress.pm Mon May 19 19:21:30 2008
@@ -4,16 +4,16 @@
 use warnings;
 use bytes;
 
-use IO::Compress::Base::Common 2.010 qw(createSelfTiedObject);
-
-use IO::Uncompress::Base 2.010 ;
+use IO::Compress::Base::Common 2.011 qw(createSelfTiedObject);
+
+use IO::Uncompress::Base 2.011 ;
 
 
 require Exporter ;
 
 our ($VERSION, @ISA, @EXPORT_OK, %EXPORT_TAGS, $AnyUncompressError);
 
-$VERSION = '2.010';
+$VERSION = '2.011';
 $AnyUncompressError = '';
 
 @ISA = qw( Exporter IO::Uncompress::Base );
@@ -27,18 +27,18 @@
 
 BEGIN
 {
-   eval ' use IO::Uncompress::Adapter::Inflate 2.010 ;';
-   eval ' use IO::Uncompress::Adapter::Bunzip2 2.010 ;';
-   eval ' use IO::Uncompress::Adapter::LZO 2.010 ;';
-   eval ' use IO::Uncompress::Adapter::Lzf 2.010 ;';
-
-   eval ' use IO::Uncompress::Bunzip2 2.010 ;';
-   eval ' use IO::Uncompress::UnLzop 2.010 ;';
-   eval ' use IO::Uncompress::Gunzip 2.010 ;';
-   eval ' use IO::Uncompress::Inflate 2.010 ;';
-   eval ' use IO::Uncompress::RawInflate 2.010 ;';
-   eval ' use IO::Uncompress::Unzip 2.010 ;';
-   eval ' use IO::Uncompress::UnLzf 2.010 ;';
+   eval ' use IO::Uncompress::Adapter::Inflate 2.011 ;';
+   eval ' use IO::Uncompress::Adapter::Bunzip2 2.011 ;';
+   eval ' use IO::Uncompress::Adapter::LZO 2.011 ;';
+   eval ' use IO::Uncompress::Adapter::Lzf 2.011 ;';
+
+   eval ' use IO::Uncompress::Bunzip2 2.011 ;';
+   eval ' use IO::Uncompress::UnLzop 2.011 ;';
+   eval ' use IO::Uncompress::Gunzip 2.011 ;';
+   eval ' use IO::Uncompress::Inflate 2.011 ;';
+   eval ' use IO::Uncompress::RawInflate 2.011 ;';
+   eval ' use IO::Uncompress::Unzip 2.011 ;';
+   eval ' use IO::Uncompress::UnLzf 2.011 ;';
 }
 
 sub new
@@ -56,7 +56,7 @@
 
 sub getExtraParams
 {
-    use IO::Compress::Base::Common 2.010 qw(:Parse);
+    use IO::Compress::Base::Common 2.011 qw(:Parse);
     return ( 'RawInflate' => [1, 1, Parse_boolean,  0] ) ;
 }
 
@@ -75,7 +75,6 @@
 sub mkUncomp
 {
     my $self = shift ;
-    my $class = shift ;
     my $got = shift ;
 
     my $magic ;

Modified: trunk/libio-compress-base-perl/lib/IO/Uncompress/Base.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libio-compress-base-perl/lib/IO/Uncompress/Base.pm?rev=20195&op=diff
==============================================================================
--- trunk/libio-compress-base-perl/lib/IO/Uncompress/Base.pm (original)
+++ trunk/libio-compress-base-perl/lib/IO/Uncompress/Base.pm Mon May 19 19:21:30 2008
@@ -9,12 +9,12 @@
 @ISA    = qw(Exporter IO::File);
 
 
-$VERSION = '2.010';
+$VERSION = '2.011';
 
 use constant G_EOF => 0 ;
 use constant G_ERR => -1 ;
 
-use IO::Compress::Base::Common 2.010 ;
+use IO::Compress::Base::Common 2.011 ;
 #use Parse::Parameters ;
 
 use IO::File ;
@@ -468,7 +468,7 @@
         return $obj
     }
 
-    my $status = $obj->mkUncomp($class, $got);
+    my $status = $obj->mkUncomp($got);
 
     return undef
         unless defined $status;
@@ -533,7 +533,7 @@
     my $output = shift ;
 
 
-    my $x = new Validator($class, *$obj->{Error}, $name, $input, $output)
+    my $x = new IO::Compress::Base::Validator($class, *$obj->{Error}, $name, $input, $output)
         or return undef ;
     
     push @_, $output if $haveOut && $x->{Hash};
@@ -1451,3 +1451,4 @@
 This program is free software; you can redistribute it and/or
 modify it under the same terms as Perl itself.
 
+




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