r72917 - in /trunk/libclass-adapter-perl: ./ debian/ debian/patches/ inc/Module/ inc/Module/Install/ lib/Class/ lib/Class/Adapter/ xt/
ansgar at users.alioth.debian.org
ansgar at users.alioth.debian.org
Thu Apr 21 14:42:06 UTC 2011
Author: ansgar
Date: Thu Apr 21 14:41:40 2011
New Revision: 72917
URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=72917
Log:
IGNORE-VERSION: 1.08-1
Only fixes spelling with a patch from us.
* New upstream release.
* debian/copyright: update years of copyright, refer to GPL-1, refer to
"Debian systems" instead of "Debian GNU/Linux systems".
* Drop patch spelling.patch: applied upstream.
Removed:
trunk/libclass-adapter-perl/debian/patches/
Modified:
trunk/libclass-adapter-perl/Changes
trunk/libclass-adapter-perl/META.yml
trunk/libclass-adapter-perl/Makefile.PL
trunk/libclass-adapter-perl/README
trunk/libclass-adapter-perl/debian/changelog
trunk/libclass-adapter-perl/debian/copyright
trunk/libclass-adapter-perl/inc/Module/Install.pm
trunk/libclass-adapter-perl/inc/Module/Install/Base.pm
trunk/libclass-adapter-perl/inc/Module/Install/Can.pm
trunk/libclass-adapter-perl/inc/Module/Install/DSL.pm
trunk/libclass-adapter-perl/inc/Module/Install/Fetch.pm
trunk/libclass-adapter-perl/inc/Module/Install/Makefile.pm
trunk/libclass-adapter-perl/inc/Module/Install/Metadata.pm
trunk/libclass-adapter-perl/inc/Module/Install/Win32.pm
trunk/libclass-adapter-perl/inc/Module/Install/WriteAll.pm
trunk/libclass-adapter-perl/lib/Class/Adapter.pm
trunk/libclass-adapter-perl/lib/Class/Adapter/Builder.pm
trunk/libclass-adapter-perl/lib/Class/Adapter/Clear.pm
trunk/libclass-adapter-perl/xt/meta.t
trunk/libclass-adapter-perl/xt/pmv.t
trunk/libclass-adapter-perl/xt/pod.t
Modified: trunk/libclass-adapter-perl/Changes
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libclass-adapter-perl/Changes?rev=72917&op=diff
==============================================================================
--- trunk/libclass-adapter-perl/Changes (original)
+++ trunk/libclass-adapter-perl/Changes Thu Apr 21 14:41:40 2011
@@ -1,4 +1,8 @@
Revision history for Perl extension Class-Adapter
+
+1.08 Thu 24 Mar 2011
+ - Upgrading to Module::Install 1.00
+ - Fixed #56492: [PATCH] Fix spelling error
1.07 Mon 12 Apr 2010
- Upgrading to Module::Install 0.95
Modified: trunk/libclass-adapter-perl/META.yml
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libclass-adapter-perl/META.yml?rev=72917&op=diff
==============================================================================
--- trunk/libclass-adapter-perl/META.yml (original)
+++ trunk/libclass-adapter-perl/META.yml Thu Apr 21 14:41:40 2011
@@ -8,7 +8,7 @@
configure_requires:
ExtUtils::MakeMaker: 6.42
distribution_type: module
-generated_by: 'Module::Install version 0.95'
+generated_by: 'Module::Install version 1.00'
license: perl
meta-spec:
url: http://module-build.sourceforge.net/META-spec-v1.4.html
@@ -27,4 +27,4 @@
ChangeLog: http://fisheye2.atlassian.com/changelog/cpan/trunk/Class-Adapter
license: http://dev.perl.org/licenses/
repository: http://svn.ali.as/cpan/trunk/Class-Adapter
-version: 1.07
+version: 1.08
Modified: trunk/libclass-adapter-perl/Makefile.PL
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libclass-adapter-perl/Makefile.PL?rev=72917&op=diff
==============================================================================
--- trunk/libclass-adapter-perl/Makefile.PL (original)
+++ trunk/libclass-adapter-perl/Makefile.PL Thu Apr 21 14:41:40 2011
@@ -1,5 +1,5 @@
-use inc::Module::Install::DSL 0.91;
+use inc::Module::Install::DSL 1.00;
all_from lib/Class/Adapter.pm
-requires Scalar::Util 1.10
+requires_from lib/Class/Adapter.pm
test_requires Test::More 0.47
Modified: trunk/libclass-adapter-perl/README
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libclass-adapter-perl/README?rev=72917&op=diff
==============================================================================
--- trunk/libclass-adapter-perl/README (original)
+++ trunk/libclass-adapter-perl/README Thu Apr 21 14:41:40 2011
@@ -82,7 +82,7 @@
Class::Adapter::Clear, Class::Adapter::Builder, Class::Decorator
COPYRIGHT
- Copyright 2005 - 2010 Adam Kennedy.
+ Copyright 2005 - 2011 Adam Kennedy.
This program is free software; you can redistribute it and/or modify it
under the same terms as Perl itself.
Modified: trunk/libclass-adapter-perl/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libclass-adapter-perl/debian/changelog?rev=72917&op=diff
==============================================================================
--- trunk/libclass-adapter-perl/debian/changelog (original)
+++ trunk/libclass-adapter-perl/debian/changelog Thu Apr 21 14:41:40 2011
@@ -1,8 +1,15 @@
-libclass-adapter-perl (1.07-2) UNRELEASED; urgency=low
+libclass-adapter-perl (1.08-1) UNRELEASED; urgency=low
+ IGNORE-VERSION: 1.08-1
+ Only fixes spelling with a patch from us.
+
+ * New upstream release.
+ * debian/copyright: update years of copyright, refer to GPL-1, refer to
+ "Debian systems" instead of "Debian GNU/Linux systems".
+ * Drop patch spelling.patch: applied upstream.
* Update my email address.
- -- Ansgar Burchardt <ansgar at debian.org> Mon, 01 Nov 2010 11:16:22 +0100
+ -- Ansgar Burchardt <ansgar at debian.org> Thu, 21 Apr 2011 16:36:49 +0200
libclass-adapter-perl (1.07-1) unstable; urgency=low
Modified: trunk/libclass-adapter-perl/debian/copyright
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libclass-adapter-perl/debian/copyright?rev=72917&op=diff
==============================================================================
--- trunk/libclass-adapter-perl/debian/copyright (original)
+++ trunk/libclass-adapter-perl/debian/copyright Thu Apr 21 14:41:40 2011
@@ -3,11 +3,11 @@
Maintainer: Adam Kennedy <adamk at cpan.org>
Source: http://search.cpan.org/dist/Class-Adapter/
-Copyright: © 2005-2010, Adam Kennedy <adamk at cpan.org>
+Copyright: © 2005-2011, Adam Kennedy <adamk at cpan.org>
License: Artistic or GPL-1+
Files: inc/*
-Copyright: © 2002-2010, Brian Ingerson, Audrey Tang and Adam Kennedy.
+Copyright: © 2002-2011, Brian Ingerson, Audrey Tang and Adam Kennedy.
License: Artistic or GPL-1+
Files: debian/*
@@ -15,15 +15,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/libclass-adapter-perl/inc/Module/Install.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libclass-adapter-perl/inc/Module/Install.pm?rev=72917&op=diff
==============================================================================
--- trunk/libclass-adapter-perl/inc/Module/Install.pm (original)
+++ trunk/libclass-adapter-perl/inc/Module/Install.pm Thu Apr 21 14:41:40 2011
@@ -22,7 +22,6 @@
use Cwd ();
use File::Find ();
use File::Path ();
-use FindBin;
use vars qw{$VERSION $MAIN};
BEGIN {
@@ -32,7 +31,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 = '1.00';
# Storage for the pseudo-singleton
$MAIN = undef;
@@ -127,6 +126,11 @@
#-------------------------------------------------------------
unless ( -f $self->{file} ) {
+ foreach my $key (keys %INC) {
+ delete $INC{$key} if $key =~ /Module\/Install/;
+ }
+
+ local $^W;
require "$self->{path}/$self->{dispatch}.pm";
File::Path::mkpath("$self->{prefix}/$self->{author}");
$self->{admin} = "$self->{name}::$self->{dispatch}"->new( _top => $self );
@@ -135,12 +139,13 @@
goto &{"$self->{name}::import"};
}
+ local $^W;
*{"${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"};
+ delete $INC{'inc/Module/Install.pm'};
+ delete $INC{'Module/Install.pm'};
# Save to the singleton
$MAIN = $self;
@@ -159,7 +164,21 @@
# Delegate back to parent dirs
goto &$code unless $cwd eq $pwd;
}
- $$sym =~ /([^:]+)$/ or die "Cannot autoload $who - $sym";
+ unless ($$sym =~ s/([^:]+)$//) {
+ # XXX: it looks like we can't retrieve the missing function
+ # via $$sym (usually $main::AUTOLOAD) in this case.
+ # I'm still wondering if we should slurp Makefile.PL to
+ # get some context or not ...
+ my ($package, $file, $line) = caller;
+ die <<"EOT";
+Unknown function is found at $file line $line.
+Execution of $file aborted due to runtime errors.
+
+If you're a contributor to a project, you may need to install
+some Module::Install extensions from CPAN (or other repository).
+If you're a user of a module, please contact the author.
+EOT
+ }
my $method = $1;
if ( uc($method) eq $method ) {
# Do nothing
@@ -200,6 +219,7 @@
my $who = $self->_caller;
foreach my $name ( sort keys %seen ) {
+ local $^W;
*{"${who}::$name"} = sub {
${"${who}::AUTOLOAD"} = "${who}::$name";
goto &{"${who}::AUTOLOAD"};
@@ -210,12 +230,18 @@
sub new {
my ($class, %args) = @_;
+ delete $INC{'FindBin.pm'};
+ {
+ # to suppress the redefine warning
+ local $SIG{__WARN__} = sub {};
+ require FindBin;
+ }
+
# ignore the prefix on extension modules built from top level.
my $base_path = Cwd::abs_path($FindBin::Bin);
unless ( Cwd::abs_path(Cwd::cwd()) eq $base_path ) {
delete $args{prefix};
}
-
return $args{_self} if $args{_self};
$args{dispatch} ||= 'Admin';
@@ -268,8 +294,10 @@
sub load_extensions {
my ($self, $path, $top) = @_;
+ my $should_reload = 0;
unless ( grep { ! ref $_ and lc $_ eq lc $self->{prefix} } @INC ) {
unshift @INC, $self->{prefix};
+ $should_reload = 1;
}
foreach my $rv ( $self->find_extensions($path) ) {
@@ -277,12 +305,13 @@
next if $self->{pathnames}{$pkg};
local $@;
- my $new = eval { require $file; $pkg->can('new') };
+ my $new = eval { local $^W; require $file; $pkg->can('new') };
unless ( $new ) {
warn $@ if $@;
next;
}
- $self->{pathnames}{$pkg} = delete $INC{$file};
+ $self->{pathnames}{$pkg} =
+ $should_reload ? delete $INC{$file} : $INC{$file};
push @{$self->{extensions}}, &{$new}($pkg, _top => $top );
}
Modified: trunk/libclass-adapter-perl/inc/Module/Install/Base.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libclass-adapter-perl/inc/Module/Install/Base.pm?rev=72917&op=diff
==============================================================================
--- trunk/libclass-adapter-perl/inc/Module/Install/Base.pm (original)
+++ trunk/libclass-adapter-perl/inc/Module/Install/Base.pm Thu Apr 21 14:41:40 2011
@@ -4,7 +4,7 @@
use strict 'vars';
use vars qw{$VERSION};
BEGIN {
- $VERSION = '0.95';
+ $VERSION = '1.00';
}
# Suspend handler for "redefined" warnings
@@ -51,12 +51,17 @@
#line 106
sub is_admin {
- $_[0]->admin->VERSION;
+ ! $_[0]->admin->isa('Module::Install::Base::FakeAdmin');
}
sub DESTROY {}
package Module::Install::Base::FakeAdmin;
+
+use vars qw{$VERSION};
+BEGIN {
+ $VERSION = $Module::Install::Base::VERSION;
+}
my $fake;
@@ -75,4 +80,4 @@
1;
-#line 154
+#line 159
Modified: trunk/libclass-adapter-perl/inc/Module/Install/Can.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libclass-adapter-perl/inc/Module/Install/Can.pm?rev=72917&op=diff
==============================================================================
--- trunk/libclass-adapter-perl/inc/Module/Install/Can.pm (original)
+++ trunk/libclass-adapter-perl/inc/Module/Install/Can.pm Thu Apr 21 14:41:40 2011
@@ -9,7 +9,7 @@
use vars qw{$VERSION @ISA $ISCORE};
BEGIN {
- $VERSION = '0.95';
+ $VERSION = '1.00';
@ISA = 'Module::Install::Base';
$ISCORE = 1;
}
Modified: trunk/libclass-adapter-perl/inc/Module/Install/DSL.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libclass-adapter-perl/inc/Module/Install/DSL.pm?rev=72917&op=diff
==============================================================================
--- trunk/libclass-adapter-perl/inc/Module/Install/DSL.pm (original)
+++ trunk/libclass-adapter-perl/inc/Module/Install/DSL.pm Thu Apr 21 14:41:40 2011
@@ -4,7 +4,7 @@
use strict;
use vars qw{$VERSION $ISCORE};
BEGIN {
- $VERSION = '0.95';
+ $VERSION = '1.00';
$ISCORE = 1;
*inc::Module::Install::DSL::VERSION = *VERSION;
@inc::Module::Install::DSL::ISA = __PACKAGE__;
Modified: trunk/libclass-adapter-perl/inc/Module/Install/Fetch.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libclass-adapter-perl/inc/Module/Install/Fetch.pm?rev=72917&op=diff
==============================================================================
--- trunk/libclass-adapter-perl/inc/Module/Install/Fetch.pm (original)
+++ trunk/libclass-adapter-perl/inc/Module/Install/Fetch.pm Thu Apr 21 14:41:40 2011
@@ -6,7 +6,7 @@
use vars qw{$VERSION @ISA $ISCORE};
BEGIN {
- $VERSION = '0.95';
+ $VERSION = '1.00';
@ISA = 'Module::Install::Base';
$ISCORE = 1;
}
Modified: trunk/libclass-adapter-perl/inc/Module/Install/Makefile.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libclass-adapter-perl/inc/Module/Install/Makefile.pm?rev=72917&op=diff
==============================================================================
--- trunk/libclass-adapter-perl/inc/Module/Install/Makefile.pm (original)
+++ trunk/libclass-adapter-perl/inc/Module/Install/Makefile.pm Thu Apr 21 14:41:40 2011
@@ -4,10 +4,11 @@
use strict 'vars';
use ExtUtils::MakeMaker ();
use Module::Install::Base ();
+use Fcntl qw/:flock :seek/;
use vars qw{$VERSION @ISA $ISCORE};
BEGIN {
- $VERSION = '0.95';
+ $VERSION = '1.00';
@ISA = 'Module::Install::Base';
$ISCORE = 1;
}
@@ -101,24 +102,26 @@
my ($self, %new_args) = @_;
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}]
+ if ($makemaker_argtype{$key}) {
+ 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};
}
- 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 '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});
+ elsif ($makemaker_argtype{$key} eq 'APPENDABLE') {
+ $self->makemaker_append($key => $new_args{$key});
+ }
}
else {
if (defined $args->{$key}) {
@@ -178,28 +181,22 @@
$self->makemaker_args( INC => shift );
}
-my %test_dir = ();
-
sub _wanted_t {
- /\.t$/ and -f $_ and $test_dir{$File::Find::dir} = 1;
}
sub tests_recursive {
my $self = shift;
- if ( $self->tests ) {
- die "tests_recursive will not work if tests are already defined";
- }
my $dir = shift || 't';
unless ( -d $dir ) {
die "tests_recursive dir '$dir' does not exist";
}
- %test_dir = ();
+ my %tests = map { $_ => 1 } split / /, ($self->tests || '');
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 );
+ File::Find::find(
+ sub { /\.t$/ and -f $_ and $tests{"$File::Find::dir/*.t"} = 1 },
+ $dir
+ );
+ $self->tests( join ' ', sort keys %tests );
}
sub write {
@@ -251,6 +248,9 @@
$args->{test} = {
TESTS => (join ' ', grep {!$seen{$_}++} @tests),
};
+ } elsif ( $Module::Install::ExtraTests::use_extratests ) {
+ # Module::Install::ExtraTests doesn't set $self->tests and does its own tests via harness.
+ # So, just ignore our xt tests here.
} elsif ( -d 'xt' and ($Module::Install::AUTHOR or $ENV{RELEASE_TESTING}) ) {
$args->{test} = {
TESTS => join( ' ', map { "$_/*.t" } grep { -d $_ } qw{ t xt } ),
@@ -297,13 +297,22 @@
# Remove any reference to perl, BUILD_REQUIRES doesn't support it
delete $args->{BUILD_REQUIRES}->{perl};
- # Delete bundled dists from prereq_pm
- my $subdirs = ($args->{DIR} ||= []);
+ # Delete bundled dists from prereq_pm, add it to Makefile DIR
+ my $subdirs = ($args->{DIR} || []);
if ($self->bundles) {
+ my %processed;
foreach my $bundle (@{ $self->bundles }) {
- my ($file, $dir) = @$bundle;
- push @$subdirs, $dir if -d $dir;
- delete $build_prereq->{$file}; #Delete from build prereqs only
+ my ($mod_name, $dist_dir) = @$bundle;
+ delete $prereq->{$mod_name};
+ $dist_dir = File::Basename::basename($dist_dir); # dir for building this module
+ if (not exists $processed{$dist_dir}) {
+ if (-d $dist_dir) {
+ # List as sub-directory to be processed by make
+ push @$subdirs, $dist_dir;
+ }
+ # Else do nothing: the module is already present on the system
+ $processed{$dist_dir} = undef;
+ }
}
}
@@ -356,9 +365,9 @@
. ($self->postamble || '');
local *MAKEFILE;
- open MAKEFILE, "< $makefile_name" or die "fix_up_makefile: Couldn't open $makefile_name: $!";
+ open MAKEFILE, "+< $makefile_name" or die "fix_up_makefile: Couldn't open $makefile_name: $!";
+ eval { flock MAKEFILE, LOCK_EX };
my $makefile = do { local $/; <MAKEFILE> };
- close MAKEFILE or die $!;
$makefile =~ s/\b(test_harness\(\$\(TEST_VERBOSE\), )/$1'inc', /;
$makefile =~ s/( -I\$\(INST_ARCHLIB\))/ -Iinc$1/g;
@@ -378,7 +387,8 @@
# XXX - This is currently unused; not sure if it breaks other MM-users
# $makefile =~ s/^pm_to_blib\s+:\s+/pm_to_blib :: /mg;
- open MAKEFILE, "> $makefile_name" or die "fix_up_makefile: Couldn't open $makefile_name: $!";
+ seek MAKEFILE, 0, SEEK_SET;
+ truncate MAKEFILE, 0;
print MAKEFILE "$preamble$makefile$postamble" or die $!;
close MAKEFILE or die $!;
@@ -402,4 +412,4 @@
__END__
-#line 531
+#line 541
Modified: trunk/libclass-adapter-perl/inc/Module/Install/Metadata.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libclass-adapter-perl/inc/Module/Install/Metadata.pm?rev=72917&op=diff
==============================================================================
--- trunk/libclass-adapter-perl/inc/Module/Install/Metadata.pm (original)
+++ trunk/libclass-adapter-perl/inc/Module/Install/Metadata.pm Thu Apr 21 14:41:40 2011
@@ -6,7 +6,7 @@
use vars qw{$VERSION @ISA $ISCORE};
BEGIN {
- $VERSION = '0.95';
+ $VERSION = '1.00';
@ISA = 'Module::Install::Base';
$ISCORE = 1;
}
@@ -178,43 +178,6 @@
$self->{values}->{perl_version} = $version;
}
-#Stolen from M::B
-my %license_urls = (
- perl => 'http://dev.perl.org/licenses/',
- apache => 'http://apache.org/licenses/LICENSE-2.0',
- artistic => 'http://opensource.org/licenses/artistic-license.php',
- artistic_2 => 'http://opensource.org/licenses/artistic-license-2.0.php',
- lgpl => 'http://opensource.org/licenses/lgpl-license.php',
- lgpl2 => 'http://opensource.org/licenses/lgpl-2.1.php',
- lgpl3 => 'http://opensource.org/licenses/lgpl-3.0.html',
- bsd => 'http://opensource.org/licenses/bsd-license.php',
- gpl => 'http://opensource.org/licenses/gpl-license.php',
- gpl2 => 'http://opensource.org/licenses/gpl-2.0.php',
- gpl3 => 'http://opensource.org/licenses/gpl-3.0.html',
- mit => 'http://opensource.org/licenses/mit-license.php',
- mozilla => 'http://opensource.org/licenses/mozilla1.1.php',
- open_source => undef,
- unrestricted => undef,
- restrictive => undef,
- unknown => undef,
-);
-
-sub license {
- my $self = shift;
- return $self->{values}->{license} unless @_;
- my $license = shift or die(
- 'Did not provide a value to license()'
- );
- $self->{values}->{license} = $license;
-
- # Automatically fill in license URLs
- if ( $license_urls{$license} ) {
- $self->resources( license => $license_urls{$license} );
- }
-
- return 1;
-}
-
sub all_from {
my ( $self, $file ) = @_;
@@ -354,6 +317,9 @@
require ExtUtils::MM_Unix;
my ( $self, $file ) = @_;
$self->version( ExtUtils::MM_Unix->parse_version($file) );
+
+ # for version integrity check
+ $self->makemaker_args( VERSION_FROM => $file );
}
sub abstract_from {
@@ -364,7 +330,7 @@
{ DISTNAME => $self->name },
'ExtUtils::MM_Unix'
)->parse_abstract($file)
- );
+ );
}
# Add both distribution and module name
@@ -479,42 +445,89 @@
}
}
+#Stolen from M::B
+my %license_urls = (
+ perl => 'http://dev.perl.org/licenses/',
+ apache => 'http://apache.org/licenses/LICENSE-2.0',
+ apache_1_1 => 'http://apache.org/licenses/LICENSE-1.1',
+ artistic => 'http://opensource.org/licenses/artistic-license.php',
+ artistic_2 => 'http://opensource.org/licenses/artistic-license-2.0.php',
+ lgpl => 'http://opensource.org/licenses/lgpl-license.php',
+ lgpl2 => 'http://opensource.org/licenses/lgpl-2.1.php',
+ lgpl3 => 'http://opensource.org/licenses/lgpl-3.0.html',
+ bsd => 'http://opensource.org/licenses/bsd-license.php',
+ gpl => 'http://opensource.org/licenses/gpl-license.php',
+ gpl2 => 'http://opensource.org/licenses/gpl-2.0.php',
+ gpl3 => 'http://opensource.org/licenses/gpl-3.0.html',
+ mit => 'http://opensource.org/licenses/mit-license.php',
+ mozilla => 'http://opensource.org/licenses/mozilla1.1.php',
+ open_source => undef,
+ unrestricted => undef,
+ restrictive => undef,
+ unknown => undef,
+);
+
+sub license {
+ my $self = shift;
+ return $self->{values}->{license} unless @_;
+ my $license = shift or die(
+ 'Did not provide a value to license()'
+ );
+ $license = __extract_license($license) || lc $license;
+ $self->{values}->{license} = $license;
+
+ # Automatically fill in license URLs
+ if ( $license_urls{$license} ) {
+ $self->resources( license => $license_urls{$license} );
+ }
+
+ return 1;
+}
+
sub _extract_license {
my $pod = shift;
my $matched;
return __extract_license(
($matched) = $pod =~ m/
- (=head \d \s+ (?:licen[cs]e|licensing)\b.*?)
+ (=head \d \s+ L(?i:ICEN[CS]E|ICENSING)\b.*?)
(=head \d.*|=cut.*|)\z
- /ixms
+ /xms
) || __extract_license(
($matched) = $pod =~ m/
- (=head \d \s+ (?:copyrights?|legal)\b.*?)
+ (=head \d \s+ (?:C(?i:OPYRIGHTS?)|L(?i:EGAL))\b.*?)
(=head \d.*|=cut.*|)\z
- /ixms
+ /xms
);
}
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,
+ '(?:under )?the same (?:terms|license) as (?:perl|the perl (?:\d )?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,
+ 'GNU Free Documentation license' => 'unrestricted', 1,
+ 'GNU Affero General Public License' => 'open_source', 1,
+ '(?:Free)?BSD license' => 'bsd', 1,
+ 'Artistic license' => 'artistic', 1,
+ 'Apache (?:Software )?license' => 'apache', 1,
+ 'GPL' => 'gpl', 1,
+ 'LGPL' => 'lgpl', 1,
+ 'BSD' => 'bsd', 1,
+ 'Artistic' => 'artistic', 1,
+ 'MIT' => 'mit', 1,
+ 'Mozilla Public License' => 'mozilla', 1,
+ 'Q Public License' => 'open_source', 1,
+ 'OpenSSL License' => 'unrestricted', 1,
+ 'SSLeay License' => 'unrestricted', 1,
+ 'zlib License' => 'open_source', 1,
+ 'proprietary' => 'proprietary', 0,
);
while ( my ($pattern, $license, $osi) = splice(@phrases, 0, 3) ) {
$pattern =~ s#\s+#\\s+#gs;
@@ -522,6 +535,7 @@
return $license;
}
}
+ return '';
}
sub license_from {
@@ -602,8 +616,15 @@
return $v;
}
-
-
+sub add_metadata {
+ my $self = shift;
+ my %hash = @_;
+ for my $key (keys %hash) {
+ warn "add_metadata: $key is not prefixed with 'x_'.\n" .
+ "Use appopriate function to add non-private metadata.\n" unless $key =~ /^x_/;
+ $self->{values}->{$key} = $hash{$key};
+ }
+}
######################################################################
Modified: trunk/libclass-adapter-perl/inc/Module/Install/Win32.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libclass-adapter-perl/inc/Module/Install/Win32.pm?rev=72917&op=diff
==============================================================================
--- trunk/libclass-adapter-perl/inc/Module/Install/Win32.pm (original)
+++ trunk/libclass-adapter-perl/inc/Module/Install/Win32.pm Thu Apr 21 14:41:40 2011
@@ -6,7 +6,7 @@
use vars qw{$VERSION @ISA $ISCORE};
BEGIN {
- $VERSION = '0.95';
+ $VERSION = '1.00';
@ISA = 'Module::Install::Base';
$ISCORE = 1;
}
Modified: trunk/libclass-adapter-perl/inc/Module/Install/WriteAll.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libclass-adapter-perl/inc/Module/Install/WriteAll.pm?rev=72917&op=diff
==============================================================================
--- trunk/libclass-adapter-perl/inc/Module/Install/WriteAll.pm (original)
+++ trunk/libclass-adapter-perl/inc/Module/Install/WriteAll.pm Thu Apr 21 14:41:40 2011
@@ -6,7 +6,7 @@
use vars qw{$VERSION @ISA $ISCORE};
BEGIN {
- $VERSION = '0.95';;
+ $VERSION = '1.00';
@ISA = qw{Module::Install::Base};
$ISCORE = 1;
}
Modified: trunk/libclass-adapter-perl/lib/Class/Adapter.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libclass-adapter-perl/lib/Class/Adapter.pm?rev=72917&op=diff
==============================================================================
--- trunk/libclass-adapter-perl/lib/Class/Adapter.pm (original)
+++ trunk/libclass-adapter-perl/lib/Class/Adapter.pm Thu Apr 21 14:41:40 2011
@@ -64,12 +64,12 @@
use 5.005;
use strict;
-use Carp ();
-use Scalar::Util ();
+use Carp ();
+use Scalar::Util 1.10 ();
use vars qw{$VERSION};
BEGIN {
- $VERSION = '1.07';
+ $VERSION = '1.08';
}
@@ -146,7 +146,7 @@
=head1 COPYRIGHT
-Copyright 2005 - 2010 Adam Kennedy.
+Copyright 2005 - 2011 Adam Kennedy.
This program is free software; you can redistribute
it and/or modify it under the same terms as Perl itself.
Modified: trunk/libclass-adapter-perl/lib/Class/Adapter/Builder.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libclass-adapter-perl/lib/Class/Adapter/Builder.pm?rev=72917&op=diff
==============================================================================
--- trunk/libclass-adapter-perl/lib/Class/Adapter/Builder.pm (original)
+++ trunk/libclass-adapter-perl/lib/Class/Adapter/Builder.pm Thu Apr 21 14:41:40 2011
@@ -53,7 +53,7 @@
=item NEW
-Normally, you need to create your C<Class::Adapter> objects seperately:
+Normally, you need to create your C<Class::Adapter> objects separately:
# Create the object
my $query = CGI->new( 'param1', 'param2' );
@@ -457,7 +457,7 @@
=head1 COPYRIGHT
-Copyright 2005 - 2010 Adam Kennedy.
+Copyright 2005 - 2011 Adam Kennedy.
This program is free software; you can redistribute
it and/or modify it under the same terms as Perl itself.
Modified: trunk/libclass-adapter-perl/lib/Class/Adapter/Clear.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libclass-adapter-perl/lib/Class/Adapter/Clear.pm?rev=72917&op=diff
==============================================================================
--- trunk/libclass-adapter-perl/lib/Class/Adapter/Clear.pm (original)
+++ trunk/libclass-adapter-perl/lib/Class/Adapter/Clear.pm Thu Apr 21 14:41:40 2011
@@ -164,7 +164,7 @@
=head1 COPYRIGHT
-Copyright 2005 - 2010 Adam Kennedy.
+Copyright 2005 - 2011 Adam Kennedy.
This program is free software; you can redistribute
it and/or modify it under the same terms as Perl itself.
Modified: trunk/libclass-adapter-perl/xt/meta.t
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libclass-adapter-perl/xt/meta.t?rev=72917&op=diff
==============================================================================
--- trunk/libclass-adapter-perl/xt/meta.t (original)
+++ trunk/libclass-adapter-perl/xt/meta.t Thu Apr 21 14:41:40 2011
@@ -8,7 +8,7 @@
$^W = 1;
}
-my $MODULE = 'Test::CPAN::Meta 0.12';
+my $MODULE = 'Test::CPAN::Meta 0.17';
# Don't run tests for installs
use Test::More;
Modified: trunk/libclass-adapter-perl/xt/pmv.t
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libclass-adapter-perl/xt/pmv.t?rev=72917&op=diff
==============================================================================
--- trunk/libclass-adapter-perl/xt/pmv.t (original)
+++ trunk/libclass-adapter-perl/xt/pmv.t Thu Apr 21 14:41:40 2011
@@ -9,8 +9,8 @@
}
my @MODULES = (
- 'Perl::MinimumVersion 1.20',
- 'Test::MinimumVersion 0.008',
+ 'Perl::MinimumVersion 1.27',
+ 'Test::MinimumVersion 0.101080',
);
# Don't run tests for installs
Modified: trunk/libclass-adapter-perl/xt/pod.t
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libclass-adapter-perl/xt/pod.t?rev=72917&op=diff
==============================================================================
--- trunk/libclass-adapter-perl/xt/pod.t (original)
+++ trunk/libclass-adapter-perl/xt/pod.t Thu Apr 21 14:41:40 2011
@@ -9,8 +9,8 @@
}
my @MODULES = (
- 'Pod::Simple 3.07',
- 'Test::Pod 1.26',
+ 'Pod::Simple 3.14',
+ 'Test::Pod 1.44',
);
# Don't run tests for installs
More information about the Pkg-perl-cvs-commits
mailing list