r62188 - in /trunk/libdbix-class-encodedcolumn-perl: ./ debian/ debian/patches/ inc/Module/ inc/Module/Install/ lib/DBIx/Class/ lib/DBIx/Class/EncodedColumn/ t/
ansgar-guest at users.alioth.debian.org
ansgar-guest at users.alioth.debian.org
Sun Aug 29 12:27:18 UTC 2010
Author: ansgar-guest
Date: Sun Aug 29 12:27:04 2010
New Revision: 62188
URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=62188
Log:
* New upstream release (0.00009).
* New upstream release (0.00010).
* Update patch no-Dir-Self.patch.
* debian/copyright: Update copyright information; refer to
/usr/share/common-licenses/GPL-1; refer to "Debian systems" instead of
"Debian GNU/Linux systems".
* Use debhelper compat level 8.
* Bump Standards-Version to 3.9.1.
Added:
trunk/libdbix-class-encodedcolumn-perl/inc/Module/AutoInstall.pm
- copied unchanged from r62187, branches/upstream/libdbix-class-encodedcolumn-perl/current/inc/Module/AutoInstall.pm
trunk/libdbix-class-encodedcolumn-perl/inc/Module/Install/AutoInstall.pm
- copied unchanged from r62187, branches/upstream/libdbix-class-encodedcolumn-perl/current/inc/Module/Install/AutoInstall.pm
trunk/libdbix-class-encodedcolumn-perl/inc/Module/Install/Include.pm
- copied unchanged from r62187, branches/upstream/libdbix-class-encodedcolumn-perl/current/inc/Module/Install/Include.pm
trunk/libdbix-class-encodedcolumn-perl/lib/DBIx/Class/EncodedColumn/Crypt.pm
- copied unchanged from r62187, branches/upstream/libdbix-class-encodedcolumn-perl/current/lib/DBIx/Class/EncodedColumn/Crypt.pm
trunk/libdbix-class-encodedcolumn-perl/t/crypt.t
- copied unchanged from r62187, branches/upstream/libdbix-class-encodedcolumn-perl/current/t/crypt.t
Modified:
trunk/libdbix-class-encodedcolumn-perl/Changes
trunk/libdbix-class-encodedcolumn-perl/MANIFEST
trunk/libdbix-class-encodedcolumn-perl/META.yml
trunk/libdbix-class-encodedcolumn-perl/Makefile.PL
trunk/libdbix-class-encodedcolumn-perl/debian/changelog
trunk/libdbix-class-encodedcolumn-perl/debian/compat
trunk/libdbix-class-encodedcolumn-perl/debian/control
trunk/libdbix-class-encodedcolumn-perl/debian/copyright
trunk/libdbix-class-encodedcolumn-perl/debian/patches/no-Dir-Self.patch
trunk/libdbix-class-encodedcolumn-perl/inc/Module/Install.pm
trunk/libdbix-class-encodedcolumn-perl/inc/Module/Install/Base.pm
trunk/libdbix-class-encodedcolumn-perl/inc/Module/Install/Can.pm
trunk/libdbix-class-encodedcolumn-perl/inc/Module/Install/Fetch.pm
trunk/libdbix-class-encodedcolumn-perl/inc/Module/Install/Makefile.pm
trunk/libdbix-class-encodedcolumn-perl/inc/Module/Install/Metadata.pm
trunk/libdbix-class-encodedcolumn-perl/inc/Module/Install/Win32.pm
trunk/libdbix-class-encodedcolumn-perl/inc/Module/Install/WriteAll.pm
trunk/libdbix-class-encodedcolumn-perl/lib/DBIx/Class/EncodedColumn.pm
Modified: trunk/libdbix-class-encodedcolumn-perl/Changes
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libdbix-class-encodedcolumn-perl/Changes?rev=62188&op=diff
==============================================================================
--- trunk/libdbix-class-encodedcolumn-perl/Changes (original)
+++ trunk/libdbix-class-encodedcolumn-perl/Changes Sun Aug 29 12:27:04 2010
@@ -1,3 +1,5 @@
+0.00010 2010-08-27
+ - Support for crypt()
0.00009 2010-05-17
- Rewritten test suite
0.00008 2010-04-30
Modified: trunk/libdbix-class-encodedcolumn-perl/MANIFEST
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libdbix-class-encodedcolumn-perl/MANIFEST?rev=62188&op=diff
==============================================================================
--- trunk/libdbix-class-encodedcolumn-perl/MANIFEST (original)
+++ trunk/libdbix-class-encodedcolumn-perl/MANIFEST Sun Aug 29 12:27:04 2010
@@ -1,13 +1,17 @@
Changes
+inc/Module/AutoInstall.pm
inc/Module/Install.pm
+inc/Module/Install/AutoInstall.pm
inc/Module/Install/Base.pm
inc/Module/Install/Can.pm
inc/Module/Install/Fetch.pm
+inc/Module/Install/Include.pm
inc/Module/Install/Makefile.pm
inc/Module/Install/Metadata.pm
inc/Module/Install/Win32.pm
inc/Module/Install/WriteAll.pm
lib/DBIx/Class/EncodedColumn.pm
+lib/DBIx/Class/EncodedColumn/Crypt.pm
lib/DBIx/Class/EncodedColumn/Crypt/Eksblowfish/Bcrypt.pm
lib/DBIx/Class/EncodedColumn/Crypt/OpenPGP.pm
lib/DBIx/Class/EncodedColumn/Digest.pm
@@ -17,6 +21,7 @@
README
t/bcrypt.t
t/class_level_encoders.t
+t/crypt.t
t/digest_sha.t
t/lib/DigestTest/Schema.pm
t/lib/DigestTest/Schema/Bcrypt.pm
Modified: trunk/libdbix-class-encodedcolumn-perl/META.yml
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libdbix-class-encodedcolumn-perl/META.yml?rev=62188&op=diff
==============================================================================
--- trunk/libdbix-class-encodedcolumn-perl/META.yml (original)
+++ trunk/libdbix-class-encodedcolumn-perl/META.yml Sun Aug 29 12:27:04 2010
@@ -12,7 +12,7 @@
configure_requires:
ExtUtils::MakeMaker: 6.42
distribution_type: module
-generated_by: 'Module::Install version 0.95'
+generated_by: 'Module::Install version 0.92'
license: perl
meta-spec:
url: http://module-build.sourceforge.net/META-spec-v1.4.html
@@ -28,4 +28,4 @@
resources:
license: http://dev.perl.org/licenses/
repository: http://dev.catalyst.perl.org/repos/bast/trunk/DBIx-Class-EncodedColumn
-version: 0.00009
+version: 0.00010
Modified: trunk/libdbix-class-encodedcolumn-perl/Makefile.PL
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libdbix-class-encodedcolumn-perl/Makefile.PL?rev=62188&op=diff
==============================================================================
--- trunk/libdbix-class-encodedcolumn-perl/Makefile.PL (original)
+++ trunk/libdbix-class-encodedcolumn-perl/Makefile.PL Sun Aug 29 12:27:04 2010
@@ -21,4 +21,6 @@
test_requires 'File::Temp';
test_requires 'File::Spec';
+auto_install;
+
WriteAll;
Modified: trunk/libdbix-class-encodedcolumn-perl/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libdbix-class-encodedcolumn-perl/debian/changelog?rev=62188&op=diff
==============================================================================
--- trunk/libdbix-class-encodedcolumn-perl/debian/changelog (original)
+++ trunk/libdbix-class-encodedcolumn-perl/debian/changelog Sun Aug 29 12:27:04 2010
@@ -1,12 +1,18 @@
-libdbix-class-encodedcolumn-perl (0.00009-1) UNRELEASED; urgency=low
-
- IGNORE-VERSION: 0.00009-1
- Changes to test suite.
+libdbix-class-encodedcolumn-perl (0.00010-1) unstable; urgency=low
[ Jonathan Yu ]
- * New upstream release.
+ * New upstream release (0.00009).
- -- Ansgar Burchardt <ansgar at 43-1.org> Wed, 19 May 2010 19:44:27 +0900
+ [ Ansgar Burchardt ]
+ * New upstream release (0.00010).
+ * Update patch no-Dir-Self.patch.
+ * debian/copyright: Update copyright information; refer to
+ /usr/share/common-licenses/GPL-1; refer to "Debian systems" instead of
+ "Debian GNU/Linux systems".
+ * Use debhelper compat level 8.
+ * Bump Standards-Version to 3.9.1.
+
+ -- Ansgar Burchardt <ansgar at 43-1.org> Sun, 29 Aug 2010 21:26:36 +0900
libdbix-class-encodedcolumn-perl (0.00007-1) unstable; urgency=low
Modified: trunk/libdbix-class-encodedcolumn-perl/debian/compat
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libdbix-class-encodedcolumn-perl/debian/compat?rev=62188&op=diff
==============================================================================
--- trunk/libdbix-class-encodedcolumn-perl/debian/compat (original)
+++ trunk/libdbix-class-encodedcolumn-perl/debian/compat Sun Aug 29 12:27:04 2010
@@ -1,1 +1,1 @@
-7
+8
Modified: trunk/libdbix-class-encodedcolumn-perl/debian/control
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libdbix-class-encodedcolumn-perl/debian/control?rev=62188&op=diff
==============================================================================
--- trunk/libdbix-class-encodedcolumn-perl/debian/control (original)
+++ trunk/libdbix-class-encodedcolumn-perl/debian/control Sun Aug 29 12:27:04 2010
@@ -1,13 +1,13 @@
Source: libdbix-class-encodedcolumn-perl
Section: perl
Priority: optional
-Build-Depends: debhelper (>= 7)
+Build-Depends: debhelper (>= 8)
Build-Depends-Indep: perl, libsql-translator-perl (>= 0.11002),
libsub-name-perl (>= 0.04), libdbix-class-perl, libdbd-sqlite3-perl
Maintainer: Debian Perl Group <pkg-perl-maintainers at lists.alioth.debian.org>
Uploaders: Jonathan Yu <jawnsy at cpan.org>,
Ansgar Burchardt <ansgar at 43-1.org>
-Standards-Version: 3.8.4
+Standards-Version: 3.9.1
Homepage: http://search.cpan.org/dist/DBIx-Class-EncodedColumn/
Vcs-Svn: svn://svn.debian.org/pkg-perl/trunk/libdbix-class-encodedcolumn-perl/
Vcs-Browser: http://svn.debian.org/viewsvn/pkg-perl/trunk/libdbix-class-encodedcolumn-perl/
Modified: trunk/libdbix-class-encodedcolumn-perl/debian/copyright
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libdbix-class-encodedcolumn-perl/debian/copyright?rev=62188&op=diff
==============================================================================
--- trunk/libdbix-class-encodedcolumn-perl/debian/copyright (original)
+++ trunk/libdbix-class-encodedcolumn-perl/debian/copyright Sun Aug 29 12:27:04 2010
@@ -6,6 +6,10 @@
Copyright: 2008-2009, Guillermo Roditi <groditi at cpan.org>
2008-2009, Matt S Trout <mst at shadowcat.co.uk>
2008-2009, Kent Fredric <kentnl at cpan.org>
+License: Artistic or GPL-1+
+
+Files: lib/DBIx/Class/EncodedColumn/Crypt.pm
+Copyright: 2010, Wallace reis <wreis at cpan.org>
License: Artistic or GPL-1+
Files: debian/*
@@ -19,15 +23,17 @@
License: Artistic or GPL-1+
License: Artistic
- This program is free software; you can redistribute it and/or modify
- it under the terms of the Artistic License, which comes with Perl.
- On Debian GNU/Linux systems, the complete text of the Artistic License
- can be found in `/usr/share/common-licenses/Artistic'
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the Artistic License, which comes with Perl.
+ .
+ On Debian systems, the complete text of the Artistic License
+ can be found in `/usr/share/common-licenses/Artistic'
License: GPL-1+
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 1, or (at your option)
- any later version.
- On Debian GNU/Linux systems, the complete text of the GNU General
- Public License can be found in `/usr/share/common-licenses/GPL'
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 1, or (at your option)
+ any later version.
+ .
+ On Debian systems, the complete text of version 1 of the GNU General
+ Public License can be found in `/usr/share/common-licenses/GPL-1'.
Modified: trunk/libdbix-class-encodedcolumn-perl/debian/patches/no-Dir-Self.patch
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libdbix-class-encodedcolumn-perl/debian/patches/no-Dir-Self.patch?rev=62188&op=diff
==============================================================================
--- trunk/libdbix-class-encodedcolumn-perl/debian/patches/no-Dir-Self.patch (original)
+++ trunk/libdbix-class-encodedcolumn-perl/debian/patches/no-Dir-Self.patch Sun Aug 29 12:27:04 2010
@@ -13,43 +13,79 @@
the same terms as Perl itself, either Perl version 5.8.8 or, at your option,
any later version of Perl 5 you may have available.
---- libdbix-class-encodedcolumn-perl.orig/t/02digest.t
-+++ libdbix-class-encodedcolumn-perl/t/02digest.t
-@@ -4,10 +4,16 @@
+--- libdbix-class-encodedcolumn-perl.orig/t/bcrypt.t
++++ libdbix-class-encodedcolumn-perl/t/bcrypt.t
+@@ -3,9 +3,15 @@
use warnings;
use Test::More;
-use Dir::Self;
use File::Spec;
use File::Temp 'tempdir';
-
-+### from Dir::Self 0.10
++
+sub __DIR__ () {
-+ my $level = shift || 0;
-+ my $file = (caller $level)[1];
-+ File::Spec->rel2abs(join '', (File::Spec->splitpath($file))[0, 1])
++ my $level = shift || 0;
++ my $file = (caller $level)[1];
++ File::Spec->rel2abs(join '', (File::Spec->splitpath($file))[0, 1])
+}
+
use lib File::Spec->catdir(__DIR__, 'lib');
- my ($sha_ok, $bcrypt_ok, $pgp_ok, $whirlpool_ok);
---- libdbix-class-encodedcolumn-perl.orig/t/03crosstable_leak.t
-+++ libdbix-class-encodedcolumn-perl/t/03crosstable_leak.t
-@@ -4,10 +4,16 @@
+ BEGIN {
+--- libdbix-class-encodedcolumn-perl.orig/t/digest_sha.t
++++ libdbix-class-encodedcolumn-perl/t/digest_sha.t
+@@ -3,9 +3,15 @@
use warnings;
- use Test::More tests => 5;
+ use Test::More;
-use Dir::Self;
use File::Spec;
use File::Temp 'tempdir';
-
-+## from Dir::Self 0.10
++
+sub __DIR__ () {
-+ my $level = shift || 0;
-+ my $file = (caller $level)[1];
-+ File::Spec->rel2abs(join '', (File::Spec->splitpath($file))[0, 1])
++ my $level = shift || 0;
++ my $file = (caller $level)[1];
++ File::Spec->rel2abs(join '', (File::Spec->splitpath($file))[0, 1])
+}
+
use lib File::Spec->catdir(__DIR__, 'lib');
- #1
+ use DigestTest::Schema;
+--- libdbix-class-encodedcolumn-perl.orig/t/open_pgp.t
++++ libdbix-class-encodedcolumn-perl/t/open_pgp.t
+@@ -3,9 +3,15 @@
+ use warnings;
+ use Test::More;
+
+-use Dir::Self;
+ use File::Spec;
+ use File::Temp 'tempdir';
++
++sub __DIR__ () {
++ my $level = shift || 0;
++ my $file = (caller $level)[1];
++ File::Spec->rel2abs(join '', (File::Spec->splitpath($file))[0, 1])
++}
++
+ use lib File::Spec->catdir(__DIR__, 'lib');
+ use DigestTest::Schema;
+
+--- libdbix-class-encodedcolumn-perl.orig/t/whirlpool.t
++++ libdbix-class-encodedcolumn-perl/t/whirlpool.t
+@@ -3,9 +3,15 @@
+ use warnings;
+ use Test::More;
+
+-use Dir::Self;
+ use File::Spec;
+ use File::Temp 'tempdir';
++
++sub __DIR__ () {
++ my $level = shift || 0;
++ my $file = (caller $level)[1];
++ File::Spec->rel2abs(join '', (File::Spec->splitpath($file))[0, 1])
++}
++
+ use lib File::Spec->catdir(__DIR__, 'lib');
+ use DigestTest::Schema;
+
Modified: trunk/libdbix-class-encodedcolumn-perl/inc/Module/Install.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libdbix-class-encodedcolumn-perl/inc/Module/Install.pm?rev=62188&op=diff
==============================================================================
--- trunk/libdbix-class-encodedcolumn-perl/inc/Module/Install.pm (original)
+++ trunk/libdbix-class-encodedcolumn-perl/inc/Module/Install.pm Sun Aug 29 12:27:04 2010
@@ -19,10 +19,6 @@
use 5.005;
use strict 'vars';
-use Cwd ();
-use File::Find ();
-use File::Path ();
-use FindBin;
use vars qw{$VERSION $MAIN};
BEGIN {
@@ -32,7 +28,7 @@
# This is not enforced yet, but will be some time in the next few
# releases once we can make sure it won't clash with custom
# Module::Install extensions.
- $VERSION = '0.95';
+ $VERSION = '0.92';
# Storage for the pseudo-singleton
$MAIN = undef;
@@ -42,25 +38,18 @@
}
-sub import {
- my $class = shift;
- my $self = $class->new(@_);
- my $who = $self->_caller;
-
- #-------------------------------------------------------------
- # all of the following checks should be included in import(),
- # to allow "eval 'require Module::Install; 1' to test
- # installation of Module::Install. (RT #51267)
- #-------------------------------------------------------------
-
- # Whether or not inc::Module::Install is actually loaded, the
- # $INC{inc/Module/Install.pm} is what will still get set as long as
- # the caller loaded module this in the documented manner.
- # If not set, the caller may NOT have loaded the bundled version, and thus
- # they may not have a MI version that works with the Makefile.PL. This would
- # result in false errors or unexpected behaviour. And we don't want that.
- my $file = join( '/', 'inc', split /::/, __PACKAGE__ ) . '.pm';
- unless ( $INC{$file} ) { die <<"END_DIE" }
+
+
+
+
+# Whether or not inc::Module::Install is actually loaded, the
+# $INC{inc/Module/Install.pm} is what will still get set as long as
+# the caller loaded module this in the documented manner.
+# If not set, the caller may NOT have loaded the bundled version, and thus
+# they may not have a MI version that works with the Makefile.PL. This would
+# result in false errors or unexpected behaviour. And we don't want that.
+my $file = join( '/', 'inc', split /::/, __PACKAGE__ ) . '.pm';
+unless ( $INC{$file} ) { die <<"END_DIE" }
Please invoke ${\__PACKAGE__} with:
@@ -72,28 +61,26 @@
END_DIE
- # This reportedly fixes a rare Win32 UTC file time issue, but
- # as this is a non-cross-platform XS module not in the core,
- # we shouldn't really depend on it. See RT #24194 for detail.
- # (Also, this module only supports Perl 5.6 and above).
- eval "use Win32::UTCFileTime" if $^O eq 'MSWin32' && $] >= 5.006;
-
- # If the script that is loading Module::Install is from the future,
- # then make will detect this and cause it to re-run over and over
- # again. This is bad. Rather than taking action to touch it (which
- # is unreliable on some platforms and requires write permissions)
- # for now we should catch this and refuse to run.
- if ( -f $0 ) {
- my $s = (stat($0))[9];
-
- # If the modification time is only slightly in the future,
- # sleep briefly to remove the problem.
- my $a = $s - time;
- if ( $a > 0 and $a < 5 ) { sleep 5 }
-
- # Too far in the future, throw an error.
- my $t = time;
- if ( $s > $t ) { die <<"END_DIE" }
+
+
+
+
+# If the script that is loading Module::Install is from the future,
+# then make will detect this and cause it to re-run over and over
+# again. This is bad. Rather than taking action to touch it (which
+# is unreliable on some platforms and requires write permissions)
+# for now we should catch this and refuse to run.
+if ( -f $0 ) {
+ my $s = (stat($0))[9];
+
+ # If the modification time is only slightly in the future,
+ # sleep briefly to remove the problem.
+ my $a = $s - time;
+ if ( $a > 0 and $a < 5 ) { sleep 5 }
+
+ # Too far in the future, throw an error.
+ my $t = time;
+ if ( $s > $t ) { die <<"END_DIE" }
Your installer $0 has a modification time in the future ($s > $t).
@@ -102,12 +89,15 @@
Please correct this, then run $0 again.
END_DIE
- }
-
-
- # Build.PL was formerly supported, but no longer is due to excessive
- # difficulty in implementing every single feature twice.
- if ( $0 =~ /Build.PL$/i ) { die <<"END_DIE" }
+}
+
+
+
+
+
+# Build.PL was formerly supported, but no longer is due to excessive
+# difficulty in implementing every single feature twice.
+if ( $0 =~ /Build.PL$/i ) { die <<"END_DIE" }
Module::Install no longer supports Build.PL.
@@ -117,36 +107,23 @@
END_DIE
- #-------------------------------------------------------------
-
- # To save some more typing in Module::Install installers, every...
- # use inc::Module::Install
- # ...also acts as an implicit use strict.
- $^H |= strict::bits(qw(refs subs vars));
-
- #-------------------------------------------------------------
-
- unless ( -f $self->{file} ) {
- require "$self->{path}/$self->{dispatch}.pm";
- File::Path::mkpath("$self->{prefix}/$self->{author}");
- $self->{admin} = "$self->{name}::$self->{dispatch}"->new( _top => $self );
- $self->{admin}->init;
- @_ = ($class, _self => $self);
- goto &{"$self->{name}::import"};
- }
-
- *{"${who}::AUTOLOAD"} = $self->autoload;
- $self->preload;
-
- # Unregister loader and worker packages so subdirs can use them again
- delete $INC{"$self->{file}"};
- delete $INC{"$self->{path}.pm"};
-
- # Save to the singleton
- $MAIN = $self;
-
- return 1;
-}
+
+
+
+
+# To save some more typing in Module::Install installers, every...
+# use inc::Module::Install
+# ...also acts as an implicit use strict.
+$^H |= strict::bits(qw(refs subs vars));
+
+
+
+
+
+use Cwd ();
+use File::Find ();
+use File::Path ();
+use FindBin;
sub autoload {
my $self = shift;
@@ -175,6 +152,33 @@
};
}
+sub import {
+ my $class = shift;
+ my $self = $class->new(@_);
+ my $who = $self->_caller;
+
+ unless ( -f $self->{file} ) {
+ require "$self->{path}/$self->{dispatch}.pm";
+ File::Path::mkpath("$self->{prefix}/$self->{author}");
+ $self->{admin} = "$self->{name}::$self->{dispatch}"->new( _top => $self );
+ $self->{admin}->init;
+ @_ = ($class, _self => $self);
+ goto &{"$self->{name}::import"};
+ }
+
+ *{"${who}::AUTOLOAD"} = $self->autoload;
+ $self->preload;
+
+ # Unregister loader and worker packages so subdirs can use them again
+ delete $INC{"$self->{file}"};
+ delete $INC{"$self->{path}.pm"};
+
+ # Save to the singleton
+ $MAIN = $self;
+
+ return 1;
+}
+
sub preload {
my $self = shift;
unless ( $self->{extensions} ) {
Modified: trunk/libdbix-class-encodedcolumn-perl/inc/Module/Install/Base.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libdbix-class-encodedcolumn-perl/inc/Module/Install/Base.pm?rev=62188&op=diff
==============================================================================
--- trunk/libdbix-class-encodedcolumn-perl/inc/Module/Install/Base.pm (original)
+++ trunk/libdbix-class-encodedcolumn-perl/inc/Module/Install/Base.pm Sun Aug 29 12:27:04 2010
@@ -4,7 +4,7 @@
use strict 'vars';
use vars qw{$VERSION};
BEGIN {
- $VERSION = '0.95';
+ $VERSION = '0.92';
}
# Suspend handler for "redefined" warnings
Modified: trunk/libdbix-class-encodedcolumn-perl/inc/Module/Install/Can.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libdbix-class-encodedcolumn-perl/inc/Module/Install/Can.pm?rev=62188&op=diff
==============================================================================
--- trunk/libdbix-class-encodedcolumn-perl/inc/Module/Install/Can.pm (original)
+++ trunk/libdbix-class-encodedcolumn-perl/inc/Module/Install/Can.pm Sun Aug 29 12:27:04 2010
@@ -9,7 +9,7 @@
use vars qw{$VERSION @ISA $ISCORE};
BEGIN {
- $VERSION = '0.95';
+ $VERSION = '0.92';
@ISA = 'Module::Install::Base';
$ISCORE = 1;
}
Modified: trunk/libdbix-class-encodedcolumn-perl/inc/Module/Install/Fetch.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libdbix-class-encodedcolumn-perl/inc/Module/Install/Fetch.pm?rev=62188&op=diff
==============================================================================
--- trunk/libdbix-class-encodedcolumn-perl/inc/Module/Install/Fetch.pm (original)
+++ trunk/libdbix-class-encodedcolumn-perl/inc/Module/Install/Fetch.pm Sun Aug 29 12:27:04 2010
@@ -6,7 +6,7 @@
use vars qw{$VERSION @ISA $ISCORE};
BEGIN {
- $VERSION = '0.95';
+ $VERSION = '0.92';
@ISA = 'Module::Install::Base';
$ISCORE = 1;
}
Modified: trunk/libdbix-class-encodedcolumn-perl/inc/Module/Install/Makefile.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libdbix-class-encodedcolumn-perl/inc/Module/Install/Makefile.pm?rev=62188&op=diff
==============================================================================
--- trunk/libdbix-class-encodedcolumn-perl/inc/Module/Install/Makefile.pm (original)
+++ trunk/libdbix-class-encodedcolumn-perl/inc/Module/Install/Makefile.pm Sun Aug 29 12:27:04 2010
@@ -7,7 +7,7 @@
use vars qw{$VERSION @ISA $ISCORE};
BEGIN {
- $VERSION = '0.95';
+ $VERSION = '0.92';
@ISA = 'Module::Install::Base';
$ISCORE = 1;
}
@@ -25,8 +25,8 @@
die "Caught an potential prompt infinite loop ($c[1]|$c[2]|$_[0])";
}
- # In automated testing or non-interactive session, always use defaults
- if ( ($ENV{AUTOMATED_TESTING} or -! -t STDIN) and ! $ENV{PERL_MM_USE_DEFAULT} ) {
+ # In automated testing, always use defaults
+ if ( $ENV{AUTOMATED_TESTING} and ! $ENV{PERL_MM_USE_DEFAULT} ) {
local $ENV{PERL_MM_USE_DEFAULT} = 1;
goto &ExtUtils::MakeMaker::prompt;
} else {
@@ -45,88 +45,10 @@
( @_ < 2 or $makemaker >= eval($_[1]) ) ? $makemaker : 0
}
-# Ripped from ExtUtils::MakeMaker 6.56, and slightly modified
-# as we only need to know here whether the attribute is an array
-# or a hash or something else (which may or may not be appendable).
-my %makemaker_argtype = (
- C => 'ARRAY',
- CONFIG => 'ARRAY',
-# CONFIGURE => 'CODE', # ignore
- DIR => 'ARRAY',
- DL_FUNCS => 'HASH',
- DL_VARS => 'ARRAY',
- EXCLUDE_EXT => 'ARRAY',
- EXE_FILES => 'ARRAY',
- FUNCLIST => 'ARRAY',
- H => 'ARRAY',
- IMPORTS => 'HASH',
- INCLUDE_EXT => 'ARRAY',
- LIBS => 'ARRAY', # ignore ''
- MAN1PODS => 'HASH',
- MAN3PODS => 'HASH',
- META_ADD => 'HASH',
- META_MERGE => 'HASH',
- PL_FILES => 'HASH',
- PM => 'HASH',
- PMLIBDIRS => 'ARRAY',
- PMLIBPARENTDIRS => 'ARRAY',
- PREREQ_PM => 'HASH',
- CONFIGURE_REQUIRES => 'HASH',
- SKIP => 'ARRAY',
- TYPEMAPS => 'ARRAY',
- XS => 'HASH',
-# VERSION => ['version',''], # ignore
-# _KEEP_AFTER_FLUSH => '',
-
- clean => 'HASH',
- depend => 'HASH',
- dist => 'HASH',
- dynamic_lib=> 'HASH',
- linkext => 'HASH',
- macro => 'HASH',
- postamble => 'HASH',
- realclean => 'HASH',
- test => 'HASH',
- tool_autosplit => 'HASH',
-
- # special cases where you can use makemaker_append
- CCFLAGS => 'APPENDABLE',
- DEFINE => 'APPENDABLE',
- INC => 'APPENDABLE',
- LDDLFLAGS => 'APPENDABLE',
- LDFROM => 'APPENDABLE',
-);
-
sub makemaker_args {
- my ($self, %new_args) = @_;
+ my $self = shift;
my $args = ( $self->{makemaker_args} ||= {} );
- foreach my $key (keys %new_args) {
- if ($makemaker_argtype{$key} eq 'ARRAY') {
- $args->{$key} = [] unless defined $args->{$key};
- unless (ref $args->{$key} eq 'ARRAY') {
- $args->{$key} = [$args->{$key}]
- }
- push @{$args->{$key}},
- ref $new_args{$key} eq 'ARRAY'
- ? @{$new_args{$key}}
- : $new_args{$key};
- }
- elsif ($makemaker_argtype{$key} eq 'HASH') {
- $args->{$key} = {} unless defined $args->{$key};
- foreach my $skey (keys %{ $new_args{$key} }) {
- $args->{$key}{$skey} = $new_args{$key}{$skey};
- }
- }
- elsif ($makemaker_argtype{$key} eq 'APPENDABLE') {
- $self->makemaker_append($key => $new_args{$key});
- }
- else {
- if (defined $args->{$key}) {
- warn qq{MakeMaker attribute "$key" is overriden; use "makemaker_append" to append values\n};
- }
- $args->{$key} = $new_args{$key};
- }
- }
+ %$args = ( %$args, @_ );
return $args;
}
@@ -136,8 +58,8 @@
my $self = shift;
my $name = shift;
my $args = $self->makemaker_args;
- $args->{$name} = defined $args->{$name}
- ? join( ' ', $args->{$name}, @_ )
+ $args->{name} = defined $args->{$name}
+ ? join( ' ', $args->{name}, @_ )
: join( ' ', @_ );
}
@@ -196,9 +118,6 @@
%test_dir = ();
require File::Find;
File::Find::find( \&_wanted_t, $dir );
- if ( -d 'xt' and ($Module::Install::AUTHOR or $ENV{RELEASE_TESTING}) ) {
- File::Find::find( \&_wanted_t, 'xt' );
- }
$self->tests( join ' ', map { "$_/*.t" } sort keys %test_dir );
}
@@ -236,42 +155,23 @@
my $args = $self->makemaker_args;
$args->{DISTNAME} = $self->name;
$args->{NAME} = $self->module_name || $self->name;
+ $args->{VERSION} = $self->version;
$args->{NAME} =~ s/-/::/g;
- $args->{VERSION} = $self->version or die <<'EOT';
-ERROR: Can't determine distribution version. Please specify it
-explicitly via 'version' in Makefile.PL, or set a valid $VERSION
-in a module, and provide its file path via 'version_from' (or
-'all_from' if you prefer) in Makefile.PL.
-EOT
-
- $DB::single = 1;
if ( $self->tests ) {
- my @tests = split ' ', $self->tests;
- my %seen;
- $args->{test} = {
- TESTS => (join ' ', grep {!$seen{$_}++} @tests),
- };
- } elsif ( -d 'xt' and ($Module::Install::AUTHOR or $ENV{RELEASE_TESTING}) ) {
- $args->{test} = {
- TESTS => join( ' ', map { "$_/*.t" } grep { -d $_ } qw{ t xt } ),
- };
+ $args->{test} = { TESTS => $self->tests };
}
if ( $] >= 5.005 ) {
$args->{ABSTRACT} = $self->abstract;
- $args->{AUTHOR} = join ', ', @{$self->author || []};
+ $args->{AUTHOR} = $self->author;
}
if ( $self->makemaker(6.10) ) {
- $args->{NO_META} = 1;
- #$args->{NO_MYMETA} = 1;
+ $args->{NO_META} = 1;
}
if ( $self->makemaker(6.17) and $self->sign ) {
$args->{SIGN} = 1;
}
unless ( $self->is_admin ) {
delete $args->{SIGN};
- }
- if ( $self->makemaker(6.31) and $self->license ) {
- $args->{LICENSE} = $self->license;
}
my $prereq = ($args->{PREREQ_PM} ||= {});
@@ -322,17 +222,12 @@
}
}
- if ($self->installdirs) {
- warn qq{old INSTALLDIRS (probably set by makemaker_args) is overriden by installdirs\n} if $args->{INSTALLDIRS};
- $args->{INSTALLDIRS} = $self->installdirs;
- }
-
- my %args = map {
- ( $_ => $args->{$_} ) } grep {defined($args->{$_} )
- } keys %$args;
+ $args->{INSTALLDIRS} = $self->installdirs;
+
+ my %args = map { ( $_ => $args->{$_} ) } grep {defined($args->{$_})} keys %$args;
my $user_preop = delete $args{dist}->{PREOP};
- if ( my $preop = $self->admin->preop($user_preop) ) {
+ if (my $preop = $self->admin->preop($user_preop)) {
foreach my $key ( keys %$preop ) {
$args{dist}->{$key} = $preop->{$key};
}
@@ -402,4 +297,4 @@
__END__
-#line 531
+#line 426
Modified: trunk/libdbix-class-encodedcolumn-perl/inc/Module/Install/Metadata.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libdbix-class-encodedcolumn-perl/inc/Module/Install/Metadata.pm?rev=62188&op=diff
==============================================================================
--- trunk/libdbix-class-encodedcolumn-perl/inc/Module/Install/Metadata.pm (original)
+++ trunk/libdbix-class-encodedcolumn-perl/inc/Module/Install/Metadata.pm Sun Aug 29 12:27:04 2010
@@ -6,7 +6,7 @@
use vars qw{$VERSION @ISA $ISCORE};
BEGIN {
- $VERSION = '0.95';
+ $VERSION = '0.92';
@ISA = 'Module::Install::Base';
$ISCORE = 1;
}
@@ -19,6 +19,7 @@
name
module_name
abstract
+ author
version
distribution_type
tests
@@ -42,10 +43,7 @@
my @array_keys = qw{
keywords
- author
};
-
-*authors = \&author;
sub Meta { shift }
sub Meta_BooleanKeys { @boolean_keys }
@@ -232,7 +230,7 @@
die("The path '$file' does not exist, or is not a file");
}
- $self->{values}{all_from} = $file;
+ $self->{values}{all_from} = $file;
# Some methods pull from POD instead of code.
# If there is a matching .pod, use that instead
@@ -244,7 +242,7 @@
$self->name_from($file) unless $self->name;
$self->version_from($file) unless $self->version;
$self->perl_version_from($file) unless $self->perl_version;
- $self->author_from($pod) unless @{$self->author || []};
+ $self->author_from($pod) unless $self->author;
$self->license_from($pod) unless $self->license;
$self->abstract_from($pod) unless $self->abstract;
@@ -430,49 +428,8 @@
([^\n]*)
/ixms) {
my $author = $1 || $2;
-
- # XXX: ugly but should work anyway...
- if (eval "require Pod::Escapes; 1") {
- # Pod::Escapes has a mapping table.
- # It's in core of perl >= 5.9.3, and should be installed
- # as one of the Pod::Simple's prereqs, which is a prereq
- # of Pod::Text 3.x (see also below).
- $author =~ s{ E<( (\d+) | ([A-Za-z]+) )> }
- {
- defined $2
- ? chr($2)
- : defined $Pod::Escapes::Name2character_number{$1}
- ? chr($Pod::Escapes::Name2character_number{$1})
- : do {
- warn "Unknown escape: E<$1>";
- "E<$1>";
- };
- }gex;
- }
- elsif (eval "require Pod::Text; 1" && $Pod::Text::VERSION < 3) {
- # Pod::Text < 3.0 has yet another mapping table,
- # though the table name of 2.x and 1.x are different.
- # (1.x is in core of Perl < 5.6, 2.x is in core of
- # Perl < 5.9.3)
- my $mapping = ($Pod::Text::VERSION < 2)
- ? \%Pod::Text::HTML_Escapes
- : \%Pod::Text::ESCAPES;
- $author =~ s{ E<( (\d+) | ([A-Za-z]+) )> }
- {
- defined $2
- ? chr($2)
- : defined $mapping->{$1}
- ? $mapping->{$1}
- : do {
- warn "Unknown escape: E<$1>";
- "E<$1>";
- };
- }gex;
- }
- else {
- $author =~ s{E<lt>}{<}g;
- $author =~ s{E<gt>}{>}g;
- }
+ $author =~ s{E<lt>}{<}g;
+ $author =~ s{E<gt>}{>}g;
$self->author($author);
} else {
warn "Cannot determine author info from $_[0]\n";
@@ -480,47 +437,43 @@
}
sub _extract_license {
- my $pod = shift;
- my $matched;
- return __extract_license(
- ($matched) = $pod =~ m/
- (=head \d \s+ (?:licen[cs]e|licensing)\b.*?)
- (=head \d.*|=cut.*|)\z
- /ixms
- ) || __extract_license(
- ($matched) = $pod =~ m/
- (=head \d \s+ (?:copyrights?|legal)\b.*?)
- (=head \d.*|=cut.*|)\z
- /ixms
- );
-}
-
-sub __extract_license {
- my $license_text = shift or return;
- my @phrases = (
- 'under the same (?:terms|license) as (?:perl|the perl programming language)' => 'perl', 1,
- 'under the terms of (?:perl|the perl programming language) itself' => 'perl', 1,
- 'Artistic and GPL' => 'perl', 1,
- 'GNU general public license' => 'gpl', 1,
- 'GNU public license' => 'gpl', 1,
- 'GNU lesser general public license' => 'lgpl', 1,
- 'GNU lesser public license' => 'lgpl', 1,
- 'GNU library general public license' => 'lgpl', 1,
- 'GNU library public license' => 'lgpl', 1,
- 'BSD license' => 'bsd', 1,
- 'Artistic license' => 'artistic', 1,
- 'GPL' => 'gpl', 1,
- 'LGPL' => 'lgpl', 1,
- 'BSD' => 'bsd', 1,
- 'Artistic' => 'artistic', 1,
- 'MIT' => 'mit', 1,
- 'proprietary' => 'proprietary', 0,
- );
- while ( my ($pattern, $license, $osi) = splice(@phrases, 0, 3) ) {
- $pattern =~ s#\s+#\\s+#gs;
- if ( $license_text =~ /\b$pattern\b/i ) {
- return $license;
- }
+ if (
+ $_[0] =~ m/
+ (
+ =head \d \s+
+ (?:licen[cs]e|licensing|copyrights?|legal)\b
+ .*?
+ )
+ (=head\\d.*|=cut.*|)
+ \z
+ /ixms ) {
+ my $license_text = $1;
+ my @phrases = (
+ 'under the same (?:terms|license) as (?:perl|the perl programming language)' => 'perl', 1,
+ 'under the terms of (?:perl|the perl programming language) itself' => 'perl', 1,
+ 'GNU general public license' => 'gpl', 1,
+ 'GNU public license' => 'gpl', 1,
+ 'GNU lesser general public license' => 'lgpl', 1,
+ 'GNU lesser public license' => 'lgpl', 1,
+ 'GNU library general public license' => 'lgpl', 1,
+ 'GNU library public license' => 'lgpl', 1,
+ 'BSD license' => 'bsd', 1,
+ 'Artistic license' => 'artistic', 1,
+ 'GPL' => 'gpl', 1,
+ 'LGPL' => 'lgpl', 1,
+ 'BSD' => 'bsd', 1,
+ 'Artistic' => 'artistic', 1,
+ 'MIT' => 'mit', 1,
+ 'proprietary' => 'proprietary', 0,
+ );
+ while ( my ($pattern, $license, $osi) = splice(@phrases, 0, 3) ) {
+ $pattern =~ s#\s+#\\s+#gs;
+ if ( $license_text =~ /\b$pattern\b/i ) {
+ return $license;
+ }
+ }
+ } else {
+ return;
}
}
Modified: trunk/libdbix-class-encodedcolumn-perl/inc/Module/Install/Win32.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libdbix-class-encodedcolumn-perl/inc/Module/Install/Win32.pm?rev=62188&op=diff
==============================================================================
--- trunk/libdbix-class-encodedcolumn-perl/inc/Module/Install/Win32.pm (original)
+++ trunk/libdbix-class-encodedcolumn-perl/inc/Module/Install/Win32.pm Sun Aug 29 12:27:04 2010
@@ -6,7 +6,7 @@
use vars qw{$VERSION @ISA $ISCORE};
BEGIN {
- $VERSION = '0.95';
+ $VERSION = '0.92';
@ISA = 'Module::Install::Base';
$ISCORE = 1;
}
Modified: trunk/libdbix-class-encodedcolumn-perl/inc/Module/Install/WriteAll.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libdbix-class-encodedcolumn-perl/inc/Module/Install/WriteAll.pm?rev=62188&op=diff
==============================================================================
--- trunk/libdbix-class-encodedcolumn-perl/inc/Module/Install/WriteAll.pm (original)
+++ trunk/libdbix-class-encodedcolumn-perl/inc/Module/Install/WriteAll.pm Sun Aug 29 12:27:04 2010
@@ -6,7 +6,7 @@
use vars qw{$VERSION @ISA $ISCORE};
BEGIN {
- $VERSION = '0.95';;
+ $VERSION = '0.92';;
@ISA = qw{Module::Install::Base};
$ISCORE = 1;
}
@@ -26,10 +26,7 @@
$self->check_nmake if $args{check_nmake};
unless ( $self->makemaker_args->{PL_FILES} ) {
- # XXX: This still may be a bit over-defensive...
- unless ($self->makemaker(6.25)) {
- $self->makemaker_args( PL_FILES => {} ) if -f 'Build.PL';
- }
+ $self->makemaker_args( PL_FILES => {} );
}
# Until ExtUtils::MakeMaker support MYMETA.yml, make sure
Modified: trunk/libdbix-class-encodedcolumn-perl/lib/DBIx/Class/EncodedColumn.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libdbix-class-encodedcolumn-perl/lib/DBIx/Class/EncodedColumn.pm?rev=62188&op=diff
==============================================================================
--- trunk/libdbix-class-encodedcolumn-perl/lib/DBIx/Class/EncodedColumn.pm (original)
+++ trunk/libdbix-class-encodedcolumn-perl/lib/DBIx/Class/EncodedColumn.pm Sun Aug 29 12:27:04 2010
@@ -8,7 +8,7 @@
__PACKAGE__->mk_classdata( '_column_encoders' );
-our $VERSION = '0.00009';
+our $VERSION = '0.00010';
$VERSION = eval $VERSION;
sub register_column {
More information about the Pkg-perl-cvs-commits
mailing list