r25018 - in /trunk/libcompress-raw-zlib-perl: Changes META.yml README Zlib.xs debian/changelog debian/control lib/Compress/Raw/Zlib.pm private/MakeUtil.pm t/000prereq.t
gwolf at users.alioth.debian.org
gwolf at users.alioth.debian.org
Fri Sep 12 04:32:13 UTC 2008
Author: gwolf
Date: Fri Sep 12 04:32:10 2008
New Revision: 25018
URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=25018
Log:
New upstream release
Modified:
trunk/libcompress-raw-zlib-perl/Changes
trunk/libcompress-raw-zlib-perl/META.yml
trunk/libcompress-raw-zlib-perl/README
trunk/libcompress-raw-zlib-perl/Zlib.xs
trunk/libcompress-raw-zlib-perl/debian/changelog
trunk/libcompress-raw-zlib-perl/debian/control
trunk/libcompress-raw-zlib-perl/lib/Compress/Raw/Zlib.pm
trunk/libcompress-raw-zlib-perl/private/MakeUtil.pm
trunk/libcompress-raw-zlib-perl/t/000prereq.t
Modified: trunk/libcompress-raw-zlib-perl/Changes
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libcompress-raw-zlib-perl/Changes?rev=25018&op=diff
==============================================================================
--- trunk/libcompress-raw-zlib-perl/Changes (original)
+++ trunk/libcompress-raw-zlib-perl/Changes Fri Sep 12 04:32:10 2008
@@ -1,5 +1,15 @@
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.012 15 July 2008
Modified: trunk/libcompress-raw-zlib-perl/META.yml
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libcompress-raw-zlib-perl/META.yml?rev=25018&op=diff
==============================================================================
--- trunk/libcompress-raw-zlib-perl/META.yml (original)
+++ trunk/libcompress-raw-zlib-perl/META.yml Fri Sep 12 04:32:10 2008
@@ -1,6 +1,6 @@
--- #YAML:1.0
name: Compress-Raw-Zlib
-version: 2.012
+version: 2.015
abstract: Low-Level Interface to zlib compression library
license: perl
author:
Modified: trunk/libcompress-raw-zlib-perl/README
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libcompress-raw-zlib-perl/README?rev=25018&op=diff
==============================================================================
--- trunk/libcompress-raw-zlib-perl/README (original)
+++ trunk/libcompress-raw-zlib-perl/README Fri Sep 12 04:32:10 2008
@@ -1,9 +1,9 @@
Compress-Raw-Zlib
- Version 2.012
-
- 15th July 2008
+ Version 2.015
+
+ 2nd September 2008
Copyright (c) 2005-2008 Paul Marquess. All rights reserved.
This program is free software; you can redistribute it
@@ -326,7 +326,7 @@
If you haven't installed Compress-Raw-Zlib then search Compress::Raw::Zlib.pm
for a line like this:
- $VERSION = "2.012" ;
+ $VERSION = "2.015" ;
c. The version of zlib you have used.
If you have successfully installed Compress-Raw-Zlib, this one-liner
Modified: trunk/libcompress-raw-zlib-perl/Zlib.xs
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libcompress-raw-zlib-perl/Zlib.xs?rev=25018&op=diff
==============================================================================
--- trunk/libcompress-raw-zlib-perl/Zlib.xs (original)
+++ trunk/libcompress-raw-zlib-perl/Zlib.xs Fri Sep 12 04:32:10 2008
@@ -112,6 +112,7 @@
#define FLAG_CRC32 2
#define FLAG_ADLER32 4
#define FLAG_CONSUME_INPUT 8
+#define FLAG_LIMIT_OUTPUT 16
uLong crc32 ;
uLong adler32 ;
z_stream stream;
@@ -470,6 +471,8 @@
printf(" CRC32 %s\n", EnDis(FLAG_CRC32));
printf(" ADLER32 %s\n", EnDis(FLAG_ADLER32));
printf(" CONSUME %s\n", EnDis(FLAG_CONSUME_INPUT));
+ printf(" LIMIT %s\n", EnDis(FLAG_LIMIT_OUTPUT));
+
#ifdef MAGIC_APPEND
printf(" window 0x%p\n", s->window);
@@ -1329,7 +1332,16 @@
RETVAL = inflate(&(s->stream), Z_SYNC_FLUSH);
- if (RETVAL == Z_STREAM_ERROR || RETVAL == Z_MEM_ERROR ||
+
+ if (RETVAL == Z_NEED_DICT && s->dictionary) {
+ s->dict_adler = s->stream.adler ;
+ RETVAL = inflateSetDictionary(&(s->stream),
+ (const Bytef*)SvPVbyte_nolen(s->dictionary),
+ SvCUR(s->dictionary));
+ }
+
+ if (s->flags & FLAG_LIMIT_OUTPUT ||
+ RETVAL == Z_STREAM_ERROR || RETVAL == Z_MEM_ERROR ||
RETVAL == Z_DATA_ERROR || RETVAL == Z_STREAM_END )
break ;
@@ -1341,17 +1353,9 @@
break ;
}
}
-
- if (RETVAL == Z_NEED_DICT && s->dictionary) {
- s->dict_adler = s->stream.adler ;
- RETVAL = inflateSetDictionary(&(s->stream),
- (const Bytef*)SvPVbyte_nolen(s->dictionary),
- SvCUR(s->dictionary));
- }
-
}
#ifdef NEED_DUMMY_BYTE_AT_END
- if (eof && RETVAL == Z_OK) {
+ if (eof && RETVAL == Z_OK && s->flags & FLAG_LIMIT_OUTPUT == 0) {
Bytef* nextIn = s->stream.next_in;
uInt availIn = s->stream.avail_in;
s->stream.next_in = (Bytef*) " ";
@@ -1399,7 +1403,7 @@
SvCUR(output)-prefix_length) ;
/* fix the input buffer */
- if (s->flags & FLAG_CONSUME_INPUT) {
+ if (s->flags & FLAG_CONSUME_INPUT || s->flags & FLAG_LIMIT_OUTPUT) {
in = s->stream.avail_in ;
SvCUR_set(buf, in) ;
if (in)
Modified: trunk/libcompress-raw-zlib-perl/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libcompress-raw-zlib-perl/debian/changelog?rev=25018&op=diff
==============================================================================
--- trunk/libcompress-raw-zlib-perl/debian/changelog (original)
+++ trunk/libcompress-raw-zlib-perl/debian/changelog Fri Sep 12 04:32:10 2008
@@ -1,3 +1,10 @@
+libcompress-raw-zlib-perl (2.015-1) unstable; urgency=low
+
+ * (NOT RELEASED YET) New upstream release
+ * Added myself as an uploader
+
+ -- Gunnar Wolf <gwolf at debian.org> Thu, 11 Sep 2008 23:31:35 -0500
+
libcompress-raw-zlib-perl (2.012-1) unstable; urgency=low
* New upstream release
Modified: trunk/libcompress-raw-zlib-perl/debian/control
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libcompress-raw-zlib-perl/debian/control?rev=25018&op=diff
==============================================================================
--- trunk/libcompress-raw-zlib-perl/debian/control (original)
+++ trunk/libcompress-raw-zlib-perl/debian/control Fri Sep 12 04:32:10 2008
@@ -4,7 +4,8 @@
Build-Depends: debhelper (>= 7), perl (>= 5.8.8-7),
libtest-pod-perl, zlib1g-dev, quilt (>= 0.40)
Uploaders: Krzysztof Krzyzaniak (eloy) <eloy at debian.org>,
- Damyan Ivanov <dmn at debian.org>, gregor herrmann <gregoa at debian.org>
+ Damyan Ivanov <dmn at debian.org>, gregor herrmann <gregoa at debian.org>,
+ Gunnar Wolf <gwolf at debian.org>
Maintainer: Debian Perl Group <pkg-perl-maintainers at lists.alioth.debian.org>
Standards-Version: 3.8.0
Homepage: http://search.cpan.org/dist/Compress-Raw-Zlib/
Modified: trunk/libcompress-raw-zlib-perl/lib/Compress/Raw/Zlib.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libcompress-raw-zlib-perl/lib/Compress/Raw/Zlib.pm?rev=25018&op=diff
==============================================================================
--- trunk/libcompress-raw-zlib-perl/lib/Compress/Raw/Zlib.pm (original)
+++ trunk/libcompress-raw-zlib-perl/lib/Compress/Raw/Zlib.pm Fri Sep 12 04:32:10 2008
@@ -13,7 +13,7 @@
use bytes ;
our ($VERSION, $XS_VERSION, @ISA, @EXPORT, $AUTOLOAD);
-$VERSION = '2.012';
+$VERSION = '2.015';
$XS_VERSION = $VERSION;
$VERSION = eval $VERSION;
@@ -84,6 +84,7 @@
use constant FLAG_CRC => 2 ;
use constant FLAG_ADLER => 4 ;
use constant FLAG_CONSUME_INPUT => 8 ;
+use constant FLAG_LIMIT_OUTPUT => 16 ;
eval {
require XSLoader;
@@ -387,6 +388,7 @@
my ($got) = ParseParameters(0,
{
'AppendOutput' => [1, 1, Parse_boolean, 0],
+ 'LimitOutput' => [1, 1, Parse_boolean, 0],
'CRC32' => [1, 1, Parse_boolean, 0],
'ADLER32' => [1, 1, Parse_boolean, 0],
'ConsumeInput' => [1, 1, Parse_boolean, 1],
@@ -406,6 +408,8 @@
$flags |= FLAG_CRC if $got->value('CRC32') ;
$flags |= FLAG_ADLER if $got->value('ADLER32') ;
$flags |= FLAG_CONSUME_INPUT if $got->value('ConsumeInput') ;
+ $flags |= FLAG_LIMIT_OUTPUT if $got->value('LimitOutput') ;
+
my $windowBits = $got->value('WindowBits');
$windowBits += MAX_WBITS()
Modified: trunk/libcompress-raw-zlib-perl/private/MakeUtil.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libcompress-raw-zlib-perl/private/MakeUtil.pm?rev=25018&op=diff
==============================================================================
--- trunk/libcompress-raw-zlib-perl/private/MakeUtil.pm (original)
+++ trunk/libcompress-raw-zlib-perl/private/MakeUtil.pm Fri Sep 12 04:32:10 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/libcompress-raw-zlib-perl/t/000prereq.t
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libcompress-raw-zlib-perl/t/000prereq.t?rev=25018&op=diff
==============================================================================
--- trunk/libcompress-raw-zlib-perl/t/000prereq.t (original)
+++ trunk/libcompress-raw-zlib-perl/t/000prereq.t Fri Sep 12 04:32:10 2008
@@ -19,7 +19,7 @@
if eval { require Test::NoWarnings ; import Test::NoWarnings; 1 };
- my $VERSION = '2.012';
+ my $VERSION = '2.015';
my @NAMES = qw(
);
More information about the Pkg-perl-cvs-commits
mailing list