r25021 - in /trunk/libio-compress-base-perl: Changes META.yml README debian/changelog debian/control lib/IO/Compress/Base.pm lib/IO/Compress/Base/Common.pm lib/IO/Uncompress/AnyUncompress.pm lib/IO/Uncompress/Base.pm private/MakeUtil.pm t/01misc.t
gwolf at users.alioth.debian.org
gwolf at users.alioth.debian.org
Fri Sep 12 04:41:17 UTC 2008
Author: gwolf
Date: Fri Sep 12 04:41:12 2008
New Revision: 25021
URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=25021
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/debian/control
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
trunk/libio-compress-base-perl/private/MakeUtil.pm
trunk/libio-compress-base-perl/t/01misc.t
Modified: trunk/libio-compress-base-perl/Changes
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libio-compress-base-perl/Changes?rev=25021&op=diff
==============================================================================
--- trunk/libio-compress-base-perl/Changes (original)
+++ trunk/libio-compress-base-perl/Changes Fri Sep 12 04:41:12 2008
@@ -1,6 +1,20 @@
CHANGES
-------
+ 2.015 3 September 2008
+
+ * Makefile.PL
+ Backout changes made in 2.014
+
+ 2.014 2 September 2008
+
+ * Makefile.PL
+ Updated to check for indirect dependencies.
+
+ 2.013 18 July 2008
+
+ * IO::Compress::Base
+ - Allow IO::Compress::Base::Parameters::parse to accept an IO::Compress::Base::Parameters object.
2.012 15 July 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=25021&op=diff
==============================================================================
--- trunk/libio-compress-base-perl/META.yml (original)
+++ trunk/libio-compress-base-perl/META.yml Fri Sep 12 04:41:12 2008
@@ -1,6 +1,6 @@
--- #YAML:1.0
name: IO-Compress-Base
-version: 2.012
+version: 2.015
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=25021&op=diff
==============================================================================
--- trunk/libio-compress-base-perl/README (original)
+++ trunk/libio-compress-base-perl/README Fri Sep 12 04:41:12 2008
@@ -1,9 +1,9 @@
IO-Compress-Base
- Version 2.012
+ Version 2.015
- 15th July 2008
+ 2nd September 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.012" ;
+ $VERSION = "2.015" ;
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=25021&op=diff
==============================================================================
--- trunk/libio-compress-base-perl/debian/changelog (original)
+++ trunk/libio-compress-base-perl/debian/changelog Fri Sep 12 04:41:12 2008
@@ -1,8 +1,13 @@
-libio-compress-base-perl (2.012-2) UNRELEASED; urgency=low
+libio-compress-base-perl (2.015-1) unstable; urgency=low
+ [ Damyan Ivanov ]
* trim debian/rules another bit. Thanks to Peter Penchev
+
+ [ Gunnar Wolf ]
+ * New upstream release
+ * Added myself as an uploader
- -- Damyan Ivanov <dmn at debian.org> Thu, 17 Jul 2008 13:41:57 +0300
+ -- Gunnar Wolf <gwolf at debian.org> Thu, 11 Sep 2008 23:34:40 -0500
libio-compress-base-perl (2.012-1) unstable; urgency=low
Modified: trunk/libio-compress-base-perl/debian/control
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libio-compress-base-perl/debian/control?rev=25021&op=diff
==============================================================================
--- trunk/libio-compress-base-perl/debian/control (original)
+++ trunk/libio-compress-base-perl/debian/control Fri Sep 12 04:41:12 2008
@@ -5,7 +5,7 @@
Build-Depends-Indep: perl (>= 5.8.8-7), libtest-pod-perl
Maintainer: Debian Perl Group <pkg-perl-maintainers at lists.alioth.debian.org>
Uploaders: gregor herrmann <gregoa at debian.org>,
- Damyan Ivanov <dmn at debian.org>
+ Damyan Ivanov <dmn at debian.org>, Gunnar Wolf <gwolf at debian.org>
Standards-Version: 3.8.0
Homepage: http://search.cpan.org/dist/IO-Compress-Base/
Vcs-Svn: svn://svn.debian.org/pkg-perl/trunk/libio-compress-base-perl/
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=25021&op=diff
==============================================================================
--- trunk/libio-compress-base-perl/lib/IO/Compress/Base.pm (original)
+++ trunk/libio-compress-base-perl/lib/IO/Compress/Base.pm Fri Sep 12 04:41:12 2008
@@ -6,7 +6,7 @@
use strict ;
use warnings;
-use IO::Compress::Base::Common 2.012 ;
+use IO::Compress::Base::Common 2.015 ;
use IO::File ;
use Scalar::Util qw(blessed readonly);
@@ -20,7 +20,7 @@
our (@ISA, $VERSION);
@ISA = qw(Exporter IO::File);
-$VERSION = '2.012';
+$VERSION = '2.015';
#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.
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=25021&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 Fri Sep 12 04:41:12 2008
@@ -11,7 +11,7 @@
require Exporter;
our ($VERSION, @ISA, @EXPORT, %EXPORT_TAGS, $HAS_ENCODE);
@ISA = qw(Exporter);
-$VERSION = '2.012';
+$VERSION = '2.015';
@EXPORT = qw( isaFilehandle isaFilename whatIsInput whatIsOutput
isaFileGlobString cleanFileGlobString oneTarget
@@ -485,7 +485,11 @@
my $sub = (caller($level + 1))[3] ;
local $Carp::CarpLevel = 1 ;
- my $p = new IO::Compress::Base::Parameters() ;
+
+ return $_[1]
+ if @_ == 2 && defined $_[1] && UNIVERSAL::isa($_[1], "IO::Compress::Base::Parameters");
+
+ my $p = new IO::Compress::Base::Parameters() ;
$p->parse(@_)
or croak "$sub: $p->{Error}" ;
@@ -534,6 +538,7 @@
my $got = $self->{Got} ;
my $firstTime = keys %{ $got } == 0 ;
+ my $other;
my (@Bad) ;
my @entered = () ;
@@ -544,9 +549,7 @@
@entered = () ;
}
elsif (@_ == 1) {
- my $href = $_[0] ;
- return $_[0]
- if UNIVERSAL::isa($_[0], "IO::Compress::Base::Parameters");
+ my $href = $_[0] ;
return $self->setError("Expected even number of parameters, got 1")
if ! defined $href or ! ref $href or ref $href ne "HASH" ;
@@ -562,8 +565,13 @@
if $count % 2 != 0 ;
for my $i (0.. $count / 2 - 1) {
- push @entered, $_[2* $i] ;
- push @entered, \$_[2* $i+1] ;
+ if ($_[2 * $i] eq '__xxx__') {
+ $other = $_[2 * $i + 1] ;
+ }
+ else {
+ push @entered, $_[2 * $i] ;
+ push @entered, \$_[2 * $i + 1] ;
+ }
}
}
@@ -591,6 +599,24 @@
}
my %parsed = ();
+
+ if ($other)
+ {
+ for my $key (keys %$default)
+ {
+ my $canonkey = lc $key;
+ if ($other->parsed($canonkey))
+ {
+ my $value = $other->value($canonkey);
+#print "SET '$canonkey' to $value [$$value]\n";
+ ++ $parsed{$canonkey};
+ $got->{$canonkey}[OFF_PARSED] = 1;
+ $got->{$canonkey}[OFF_DEFAULT] = $value;
+ $got->{$canonkey}[OFF_FIXED] = $value;
+ }
+ }
+ }
+
for my $i (0.. @entered / 2 - 1) {
my $key = $entered[2* $i] ;
my $value = $entered[2* $i+1] ;
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=25021&op=diff
==============================================================================
--- trunk/libio-compress-base-perl/lib/IO/Uncompress/AnyUncompress.pm (original)
+++ trunk/libio-compress-base-perl/lib/IO/Uncompress/AnyUncompress.pm Fri Sep 12 04:41:12 2008
@@ -4,16 +4,16 @@
use warnings;
use bytes;
-use IO::Compress::Base::Common 2.012 qw(createSelfTiedObject);
-
-use IO::Uncompress::Base 2.012 ;
+use IO::Compress::Base::Common 2.015 qw(createSelfTiedObject);
+
+use IO::Uncompress::Base 2.015 ;
require Exporter ;
our ($VERSION, @ISA, @EXPORT_OK, %EXPORT_TAGS, $AnyUncompressError);
-$VERSION = '2.012';
+$VERSION = '2.015';
$AnyUncompressError = '';
@ISA = qw( Exporter IO::Uncompress::Base );
@@ -27,18 +27,18 @@
BEGIN
{
- eval ' use IO::Uncompress::Adapter::Inflate 2.012 ;';
- eval ' use IO::Uncompress::Adapter::Bunzip2 2.012 ;';
- eval ' use IO::Uncompress::Adapter::LZO 2.012 ;';
- eval ' use IO::Uncompress::Adapter::Lzf 2.012 ;';
-
- eval ' use IO::Uncompress::Bunzip2 2.012 ;';
- eval ' use IO::Uncompress::UnLzop 2.012 ;';
- eval ' use IO::Uncompress::Gunzip 2.012 ;';
- eval ' use IO::Uncompress::Inflate 2.012 ;';
- eval ' use IO::Uncompress::RawInflate 2.012 ;';
- eval ' use IO::Uncompress::Unzip 2.012 ;';
- eval ' use IO::Uncompress::UnLzf 2.012 ;';
+ eval ' use IO::Uncompress::Adapter::Inflate 2.015 ;';
+ eval ' use IO::Uncompress::Adapter::Bunzip2 2.015 ;';
+ eval ' use IO::Uncompress::Adapter::LZO 2.015 ;';
+ eval ' use IO::Uncompress::Adapter::Lzf 2.015 ;';
+
+ eval ' use IO::Uncompress::Bunzip2 2.015 ;';
+ eval ' use IO::Uncompress::UnLzop 2.015 ;';
+ eval ' use IO::Uncompress::Gunzip 2.015 ;';
+ eval ' use IO::Uncompress::Inflate 2.015 ;';
+ eval ' use IO::Uncompress::RawInflate 2.015 ;';
+ eval ' use IO::Uncompress::Unzip 2.015 ;';
+ eval ' use IO::Uncompress::UnLzf 2.015 ;';
}
sub new
@@ -56,7 +56,7 @@
sub getExtraParams
{
- use IO::Compress::Base::Common 2.012 qw(:Parse);
+ use IO::Compress::Base::Common 2.015 qw(:Parse);
return ( 'RawInflate' => [1, 1, Parse_boolean, 0] ) ;
}
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=25021&op=diff
==============================================================================
--- trunk/libio-compress-base-perl/lib/IO/Uncompress/Base.pm (original)
+++ trunk/libio-compress-base-perl/lib/IO/Uncompress/Base.pm Fri Sep 12 04:41:12 2008
@@ -9,12 +9,12 @@
@ISA = qw(Exporter IO::File);
-$VERSION = '2.012';
+$VERSION = '2.015';
use constant G_EOF => 0 ;
use constant G_ERR => -1 ;
-use IO::Compress::Base::Common 2.012 ;
+use IO::Compress::Base::Common 2.015 ;
#use Parse::Parameters ;
use IO::File ;
@@ -1453,3 +1453,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/private/MakeUtil.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libio-compress-base-perl/private/MakeUtil.pm?rev=25021&op=diff
==============================================================================
--- trunk/libio-compress-base-perl/private/MakeUtil.pm (original)
+++ trunk/libio-compress-base-perl/private/MakeUtil.pm Fri Sep 12 04:41:12 2008
@@ -297,6 +297,83 @@
}
}
+
+sub FindBrokenDependencies
+{
+ my $version = shift ;
+ my %thisModule = map { $_ => 1} @_;
+
+ my @modules = qw(
+ IO::Compress::Base
+ IO::Compress::Base::Common
+ IO::Uncompress::Base
+
+ Compress::Raw::Zlib
+ Compress::Raw::Bzip2
+
+ IO::Compress::RawDeflate
+ IO::Uncompress::RawInflate
+ IO::Compress::Deflate
+ IO::Uncompress::Inflate
+ IO::Compress::Gzip
+ IO::Compress::Gzip::Constants
+ IO::Uncompress::Gunzip
+ IO::Compress::Zip
+ IO::Uncompress::Unzip
+
+ IO::Compress::Bzip2
+ IO::Uncompress::Bunzip2
+
+ IO::Compress::Lzf
+ IO::Uncompress::UnLzf
+
+ IO::Compress::Lzop
+ IO::Uncompress::UnLzop
+
+ Compress::Zlib
+ );
+
+ my @broken = ();
+
+ foreach my $module ( grep { ! $thisModule{$_} } @modules)
+ {
+ my $hasVersion = getInstalledVersion($module);
+
+ # No need to upgrade if the module isn't installed at all
+ next
+ if ! defined $hasVersion;
+
+ # If already have C::Z version 1, then an upgrade to any of the
+ # IO::Compress modules will not break it.
+ next
+ if $module eq 'Compress::Zlib' && $hasVersion < 2;
+
+ if ($hasVersion < $version)
+ {
+ push @broken, $module
+ }
+ }
+
+ return @broken;
+}
+
+sub getInstalledVersion
+{
+ my $module = shift;
+ my $version;
+
+ eval " require $module; ";
+
+ if ($@ eq '')
+ {
+ no strict 'refs';
+ $version = ${ $module . "::VERSION" };
+ $version = 0
+ }
+
+ return $version;
+}
+
package MakeUtil ;
1;
Modified: trunk/libio-compress-base-perl/t/01misc.t
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libio-compress-base-perl/t/01misc.t?rev=25021&op=diff
==============================================================================
--- trunk/libio-compress-base-perl/t/01misc.t (original)
+++ trunk/libio-compress-base-perl/t/01misc.t Fri Sep 12 04:41:12 2008
@@ -19,7 +19,7 @@
$extra = 1
if eval { require Test::NoWarnings ; import Test::NoWarnings; 1 };
- plan tests => 78 + $extra ;
+ plan tests => 88 + $extra ;
use_ok('Scalar::Util');
use_ok('IO::Compress::Base::Common');
@@ -95,13 +95,11 @@
my $got = ParseParameters(1, {'Fred' => [1, 1, 0x1000000, 0]}, Fred => 'abc') ;
is $got->value('Fred'), "abc", "other" ;
- $got = ParseParameters(1, {'Fred' => [0, 1, Parse_any, undef]}, Fred =>
-undef) ;
+ $got = ParseParameters(1, {'Fred' => [0, 1, Parse_any, undef]}, Fred => undef) ;
ok $got->parsed('Fred'), "undef" ;
ok ! defined $got->value('Fred'), "undef" ;
- $got = ParseParameters(1, {'Fred' => [0, 1, Parse_string, undef]}, Fred =>
-undef) ;
+ $got = ParseParameters(1, {'Fred' => [0, 1, Parse_string, undef]}, Fred => undef) ;
ok $got->parsed('Fred'), "undef" ;
is $got->value('Fred'), "", "empty string" ;
@@ -117,15 +115,40 @@
ok $got->parsed('Fred'), "parsed" ;
$xx_ref = $got->value('Fred');
+
$$xx_ref = 666 ;
is $xx, 666;
-# my $got1 = ParseParameters(1, {'Fred' => [1, 1, Parse_writable_scalar, undef]}, $got) ;
-# ok $got->parsed('Fred'), "parsed" ;
-# $xx_ref = $got->value('Fred');
-# $$xx_ref = 666 ;
-# is $xx, 666;
-}
+ {
+ my $got1 = ParseParameters(1, {'Fred' => [1, 1, Parse_writable_scalar, undef]}, $got) ;
+ is $got1, $got, "Same object";
+
+ ok $got1->parsed('Fred'), "parsed" ;
+ $xx_ref = $got1->value('Fred');
+
+ $$xx_ref = 777 ;
+ is $xx, 777;
+ }
+
+ my $got2 = ParseParameters(1, {'Fred' => [1, 1, Parse_writable_scalar, undef]}, '__xxx__' => $got) ;
+ isnt $got2, $got, "not the Same object";
+
+ ok $got2->parsed('Fred'), "parsed" ;
+ $xx_ref = $got2->value('Fred');
+ $$xx_ref = 888 ;
+ is $xx, 888;
+
+ my $other;
+ my $got3 = ParseParameters(1, {'Fred' => [1, 1, Parse_writable_scalar, undef]}, '__xxx__' => $got, Fred => \$other) ;
+ isnt $got3, $got, "not the Same object";
+
+ ok $got3->parsed('Fred'), "parsed" ;
+ $xx_ref = $got3->value('Fred');
+ $$xx_ref = 999 ;
+ is $other, 999;
+ is $xx, 888;
+}
+
My::testParseParameters();
More information about the Pkg-perl-cvs-commits
mailing list