r52803 - in /trunk/libdata-optlist-perl: ./ debian/ inc/Module/ inc/Module/Install/ lib/Data/
jawnsy-guest at users.alioth.debian.org
jawnsy-guest at users.alioth.debian.org
Mon Feb 15 15:36:54 UTC 2010
Author: jawnsy-guest
Date: Mon Feb 15 15:36:47 2010
New Revision: 52803
URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=52803
Log:
* Standards-Version 3.8.4 (drop perl version dep)
* Add myself to Uploaders and Copyright
* Rewrite control description
* No longer perform Perl::Critic tests
* Use new short debhelper 7 rules format
* Update copyright to new DEP5 format
Modified:
trunk/libdata-optlist-perl/Changes
trunk/libdata-optlist-perl/META.yml
trunk/libdata-optlist-perl/Makefile.PL
trunk/libdata-optlist-perl/debian/changelog
trunk/libdata-optlist-perl/debian/control
trunk/libdata-optlist-perl/debian/copyright
trunk/libdata-optlist-perl/debian/rules
trunk/libdata-optlist-perl/inc/Module/Install.pm
trunk/libdata-optlist-perl/inc/Module/Install/Base.pm
trunk/libdata-optlist-perl/inc/Module/Install/Can.pm
trunk/libdata-optlist-perl/inc/Module/Install/Fetch.pm
trunk/libdata-optlist-perl/inc/Module/Install/Makefile.pm
trunk/libdata-optlist-perl/inc/Module/Install/Metadata.pm
trunk/libdata-optlist-perl/inc/Module/Install/Win32.pm
trunk/libdata-optlist-perl/inc/Module/Install/WriteAll.pm
trunk/libdata-optlist-perl/lib/Data/OptList.pm
Modified: trunk/libdata-optlist-perl/Changes
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libdata-optlist-perl/Changes?rev=52803&op=diff
==============================================================================
--- trunk/libdata-optlist-perl/Changes (original)
+++ trunk/libdata-optlist-perl/Changes Mon Feb 15 15:36:47 2010
@@ -1,4 +1,7 @@
Revision history for Sub-Exporter
+
+0.106 2010-02-14
+ correct version style mismatch for Sub::Install (thanks, brian d foy)
0.105 2010-01-14
fix a typo in documenation (thanks, Florian Ragwitz)
Modified: trunk/libdata-optlist-perl/META.yml
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libdata-optlist-perl/META.yml?rev=52803&op=diff
==============================================================================
--- trunk/libdata-optlist-perl/META.yml (original)
+++ trunk/libdata-optlist-perl/META.yml Mon Feb 15 15:36:47 2010
@@ -6,7 +6,7 @@
configure_requires:
ExtUtils::MakeMaker: 6.42
distribution_type: module
-generated_by: 'Module::Install version 0.91'
+generated_by: 'Module::Install version 0.92'
license: perl
meta-spec:
url: http://module-build.sourceforge.net/META-spec-v1.4.html
@@ -19,8 +19,8 @@
requires:
List::Util: 0
Params::Util: 0.14
- Sub::Install: 0.92
+ Sub::Install: 0.921
resources:
license: http://dev.perl.org/licenses/
repository: http://github.com/rjbs/data-optlist
-version: 0.105
+version: 0.106
Modified: trunk/libdata-optlist-perl/Makefile.PL
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libdata-optlist-perl/Makefile.PL?rev=52803&op=diff
==============================================================================
--- trunk/libdata-optlist-perl/Makefile.PL (original)
+++ trunk/libdata-optlist-perl/Makefile.PL Mon Feb 15 15:36:47 2010
@@ -8,7 +8,7 @@
license ('perl');
version_from ('lib/Data/OptList.pm');
-requires('Sub::Install' => 0.92); # exporter, needed by Data::OptList
+requires('Sub::Install' => 0.921); # exporter, needed by Data::OptList
requires('List::Util' => 0.00); # unknown minimum; used for "first"
requires('Params::Util' => 0.14); # _HASHLIKE, _ARRAYLIKE, _CODELIKE
Modified: trunk/libdata-optlist-perl/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libdata-optlist-perl/debian/changelog?rev=52803&op=diff
==============================================================================
--- trunk/libdata-optlist-perl/debian/changelog (original)
+++ trunk/libdata-optlist-perl/debian/changelog Mon Feb 15 15:36:47 2010
@@ -1,15 +1,18 @@
-libdata-optlist-perl (0.105-1) UNRELEASED; urgency=low
-
- Small documentation fix
- IGNORE-VERSION: 0.105-1
+libdata-optlist-perl (0.106-1) UNRELEASED; urgency=low
[ Jonathan Yu ]
* New upstream release
+ * Standards-Version 3.8.4 (drop perl version dep)
+ * Add myself to Uploaders and Copyright
+ * Rewrite control description
+ * No longer perform Perl::Critic tests
+ * Use new short debhelper 7 rules format
+ * Update copyright to new DEP5 format
[ Nathan Handler ]
* debian/watch: Update to ignore development releases.
- -- Jonathan Yu <jawnsy at cpan.org> Sun, 17 Jan 2010 13:45:04 -0500
+ -- Jonathan Yu <jawnsy at cpan.org> Mon, 15 Feb 2010 10:55:36 -0500
libdata-optlist-perl (0.104-1) unstable; urgency=low
Modified: trunk/libdata-optlist-perl/debian/control
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libdata-optlist-perl/debian/control?rev=52803&op=diff
==============================================================================
--- trunk/libdata-optlist-perl/debian/control (original)
+++ trunk/libdata-optlist-perl/debian/control Mon Feb 15 15:36:47 2010
@@ -2,24 +2,22 @@
Section: perl
Priority: optional
Build-Depends: debhelper (>= 7)
-Build-Depends-Indep: perl (>= 5.8.0-7), libparams-util-perl (>= 0.14),
- libsub-install-perl, libtest-pod-perl, libtest-pod-coverage-perl,
- libtest-perl-critic-perl
+Build-Depends-Indep: perl, libparams-util-perl, libtest-pod-coverage-perl,
+ libsub-install-perl, libtest-pod-perl
Maintainer: Debian Perl Group <pkg-perl-maintainers at lists.alioth.debian.org>
Uploaders: Krzysztof Krzyzaniak (eloy) <eloy at debian.org>,
- gregor herrmann <gregoa at debian.org>,
+ gregor herrmann <gregoa at debian.org>, Jonathan Yu <jawnsy at cpan.org>,
Antonio Radici <antonio at dyne.org>
-Standards-Version: 3.8.0
+Standards-Version: 3.8.4
Homepage: http://search.cpan.org/dist/Data-OptList/
Vcs-Svn: svn://svn.debian.org/pkg-perl/trunk/libdata-optlist-perl/
Vcs-Browser: http://svn.debian.org/viewsvn/pkg-perl/trunk/libdata-optlist-perl/
Package: libdata-optlist-perl
Architecture: all
-Depends: ${perl:Depends}, ${misc:Depends}, libparams-util-perl (>= 0.14), libsub-install-perl
-Description: Parse and validate simple name/value option pairs
- Hashes are great for storing named data, but if you want more than one entry
- for a name, you have to use a list of pairs.
- .
- Data::OptList make it easy by assuming that any defined scalar is a name and
- any reference following a name is its value.
+Depends: ${perl:Depends}, ${misc:Depends}, libparams-util-perl,
+ libsub-install-perl
+Description: module to parse and validate simple name/value option pairs
+ Data::OptList is a Perl module useful for working with simple name-and-value
+ option pairs. It assumes any defined scalar is a name and any reference after
+ it is its value.
Modified: trunk/libdata-optlist-perl/debian/copyright
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libdata-optlist-perl/debian/copyright?rev=52803&op=diff
==============================================================================
--- trunk/libdata-optlist-perl/debian/copyright (original)
+++ trunk/libdata-optlist-perl/debian/copyright Mon Feb 15 15:36:47 2010
@@ -1,37 +1,37 @@
-Format-Specification:
- http://wiki.debian.org/Proposals/CopyrightFormat?action=recall&rev=196
-Upstream-Maintainer: Ricardo SIGNES <rjbs at cpan.org>
-Upstream-Source: http://search.cpan.org/dist/Data-OptList/
-Upstream-Name: Data-OptList
+Format-Specification: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?op=file&rev=135
+Maintainer: Ricardo SIGNES <rjbs at cpan.org>
+Source: http://search.cpan.org/dist/Data-OptList/
+Name: Data-OptList
Files: *
-Copyright:
- (c) 2006, 2007 Ricardo SIGNES <rjbs at cpan.org>
-License-Alias: Perl
-License: Artistic | GPL-1+
+Copyright: 2006-2007, Ricardo SIGNES <rjbs at cpan.org>
+License: Artistic or GPL-1+
-Files: inc/*
-Copyright: Copyright 2002 - 2009 by Brian Ingerson, Audrey Tang and Adam Kennedy
-License-Alias: Perl
-License: Artistic | GPL-1+
+Files: inc/Module/*
+Copyright: 2002-2010, Adam Kennedy <adamk at cpan.org>
+ 2002-2010, Audrey Tang <autrijus at autrijus.org>
+ 2002-2010, Brian Ingerson <ingy at cpan.org>
+License: Artistic or GPL-1+
Files: debian/*
-Copyright:
- (c) 2006, 2007 Krzysztof Krzyzaniak (eloy) <eloy at debian.org>
- (c) 2008, 2009 gregor herrmann <gregoa at debian.org>
- (c) 2009, Antonio Radici <antonio at dyne.org>
-License: Artistic | GPL-1+
+Copyright: 2010, Jonathan Yu <jawnsy at cpan.org>
+ 2009, Antonio Radici <antonio at dyne.org>
+ 2007-2008, gregor herrmann <gregoa at debian.org>
+ 2006-2007, Krzysztof Krzyzaniak (eloy) <eloy at debian.org>
+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 GNU/Linux 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 GNU/Linux systems, the complete text of the GNU General
+ Public License can be found in `/usr/share/common-licenses/GPL'
Modified: trunk/libdata-optlist-perl/debian/rules
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libdata-optlist-perl/debian/rules?rev=52803&op=diff
==============================================================================
--- trunk/libdata-optlist-perl/debian/rules (original)
+++ trunk/libdata-optlist-perl/debian/rules Mon Feb 15 15:36:47 2010
@@ -1,23 +1,4 @@
#!/usr/bin/make -f
-build: build-stamp
-build-stamp:
- PERL_TEST_CRITIC=1 dh build
- touch $@
-
-clean:
+%:
dh $@
-
-install: install-stamp
-install-stamp: build-stamp
- dh install
- touch $@
-
-binary-arch:
-
-binary-indep: install
- dh $@
-
-binary: binary-arch binary-indep
-
-.PHONY: binary binary-arch binary-indep install clean build
Modified: trunk/libdata-optlist-perl/inc/Module/Install.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libdata-optlist-perl/inc/Module/Install.pm?rev=52803&op=diff
==============================================================================
--- trunk/libdata-optlist-perl/inc/Module/Install.pm (original)
+++ trunk/libdata-optlist-perl/inc/Module/Install.pm Mon Feb 15 15:36:47 2010
@@ -28,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.91';
+ $VERSION = '0.92';
# Storage for the pseudo-singleton
$MAIN = undef;
@@ -348,17 +348,24 @@
return $call;
}
+# Done in evals to avoid confusing Perl::MinimumVersion
+eval( $] >= 5.006 ? <<'END_NEW' : <<'END_OLD' ); die $@ if $@;
sub _read {
local *FH;
- if ( $] >= 5.006 ) {
- open( FH, '<', $_[0] ) or die "open($_[0]): $!";
- } else {
- open( FH, "< $_[0]" ) or die "open($_[0]): $!";
- }
+ open( FH, '<', $_[0] ) or die "open($_[0]): $!";
my $string = do { local $/; <FH> };
close FH or die "close($_[0]): $!";
return $string;
}
+END_NEW
+sub _read {
+ local *FH;
+ open( FH, "< $_[0]" ) or die "open($_[0]): $!";
+ my $string = do { local $/; <FH> };
+ close FH or die "close($_[0]): $!";
+ return $string;
+}
+END_OLD
sub _readperl {
my $string = Module::Install::_read($_[0]);
@@ -379,18 +386,26 @@
return $string;
}
+# Done in evals to avoid confusing Perl::MinimumVersion
+eval( $] >= 5.006 ? <<'END_NEW' : <<'END_OLD' ); die $@ if $@;
sub _write {
local *FH;
- if ( $] >= 5.006 ) {
- open( FH, '>', $_[0] ) or die "open($_[0]): $!";
- } else {
- open( FH, "> $_[0]" ) or die "open($_[0]): $!";
- }
+ open( FH, '>', $_[0] ) or die "open($_[0]): $!";
foreach ( 1 .. $#_ ) {
print FH $_[$_] or die "print($_[0]): $!";
}
close FH or die "close($_[0]): $!";
}
+END_NEW
+sub _write {
+ local *FH;
+ open( FH, "> $_[0]" ) or die "open($_[0]): $!";
+ foreach ( 1 .. $#_ ) {
+ print FH $_[$_] or die "print($_[0]): $!";
+ }
+ close FH or die "close($_[0]): $!";
+}
+END_OLD
# _version is for processing module versions (eg, 1.03_05) not
# Perl versions (eg, 5.8.1).
@@ -427,4 +442,4 @@
1;
-# Copyright 2008 - 2009 Adam Kennedy.
+# Copyright 2008 - 2010 Adam Kennedy.
Modified: trunk/libdata-optlist-perl/inc/Module/Install/Base.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libdata-optlist-perl/inc/Module/Install/Base.pm?rev=52803&op=diff
==============================================================================
--- trunk/libdata-optlist-perl/inc/Module/Install/Base.pm (original)
+++ trunk/libdata-optlist-perl/inc/Module/Install/Base.pm Mon Feb 15 15:36:47 2010
@@ -4,7 +4,7 @@
use strict 'vars';
use vars qw{$VERSION};
BEGIN {
- $VERSION = '0.91';
+ $VERSION = '0.92';
}
# Suspend handler for "redefined" warnings
Modified: trunk/libdata-optlist-perl/inc/Module/Install/Can.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libdata-optlist-perl/inc/Module/Install/Can.pm?rev=52803&op=diff
==============================================================================
--- trunk/libdata-optlist-perl/inc/Module/Install/Can.pm (original)
+++ trunk/libdata-optlist-perl/inc/Module/Install/Can.pm Mon Feb 15 15:36:47 2010
@@ -9,7 +9,7 @@
use vars qw{$VERSION @ISA $ISCORE};
BEGIN {
- $VERSION = '0.91';
+ $VERSION = '0.92';
@ISA = 'Module::Install::Base';
$ISCORE = 1;
}
Modified: trunk/libdata-optlist-perl/inc/Module/Install/Fetch.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libdata-optlist-perl/inc/Module/Install/Fetch.pm?rev=52803&op=diff
==============================================================================
--- trunk/libdata-optlist-perl/inc/Module/Install/Fetch.pm (original)
+++ trunk/libdata-optlist-perl/inc/Module/Install/Fetch.pm Mon Feb 15 15:36:47 2010
@@ -6,7 +6,7 @@
use vars qw{$VERSION @ISA $ISCORE};
BEGIN {
- $VERSION = '0.91';
+ $VERSION = '0.92';
@ISA = 'Module::Install::Base';
$ISCORE = 1;
}
Modified: trunk/libdata-optlist-perl/inc/Module/Install/Makefile.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libdata-optlist-perl/inc/Module/Install/Makefile.pm?rev=52803&op=diff
==============================================================================
--- trunk/libdata-optlist-perl/inc/Module/Install/Makefile.pm (original)
+++ trunk/libdata-optlist-perl/inc/Module/Install/Makefile.pm Mon Feb 15 15:36:47 2010
@@ -7,7 +7,7 @@
use vars qw{$VERSION @ISA $ISCORE};
BEGIN {
- $VERSION = '0.91';
+ $VERSION = '0.92';
@ISA = 'Module::Install::Base';
$ISCORE = 1;
}
@@ -34,6 +34,17 @@
}
}
+# Store a cleaned up version of the MakeMaker version,
+# since we need to behave differently in a variety of
+# ways based on the MM version.
+my $makemaker = eval $ExtUtils::MakeMaker::VERSION;
+
+# If we are passed a param, do a "newer than" comparison.
+# Otherwise, just return the MakeMaker version.
+sub makemaker {
+ ( @_ < 2 or $makemaker >= eval($_[1]) ) ? $makemaker : 0
+}
+
sub makemaker_args {
my $self = shift;
my $args = ( $self->{makemaker_args} ||= {} );
@@ -44,7 +55,7 @@
# For mm args that take multiple space-seperated args,
# append an argument to the current list.
sub makemaker_append {
- my $self = sShift;
+ my $self = shift;
my $name = shift;
my $args = $self->makemaker_args;
$args->{name} = defined $args->{$name}
@@ -130,12 +141,13 @@
# an underscore, even though its own version may contain one!
# Hence the funny regexp to get rid of it. See RT #35800
# for details.
- $self->build_requires( 'ExtUtils::MakeMaker' => $ExtUtils::MakeMaker::VERSION =~ /^(\d+\.\d+)/ );
- $self->configure_requires( 'ExtUtils::MakeMaker' => $ExtUtils::MakeMaker::VERSION =~ /^(\d+\.\d+)/ );
+ my $v = $ExtUtils::MakeMaker::VERSION =~ /^(\d+\.\d+)/;
+ $self->build_requires( 'ExtUtils::MakeMaker' => $v );
+ $self->configure_requires( 'ExtUtils::MakeMaker' => $v );
} else {
# Allow legacy-compatibility with 5.005 by depending on the
# most recent EU:MM that supported 5.005.
- $self->build_requires( 'ExtUtils::MakeMaker' => 6.42 );
+ $self->build_requires( 'ExtUtils::MakeMaker' => 6.42 );
$self->configure_requires( 'ExtUtils::MakeMaker' => 6.42 );
}
@@ -152,42 +164,62 @@
$args->{ABSTRACT} = $self->abstract;
$args->{AUTHOR} = $self->author;
}
- if ( eval($ExtUtils::MakeMaker::VERSION) >= 6.10 ) {
+ if ( $self->makemaker(6.10) ) {
$args->{NO_META} = 1;
}
- if ( eval($ExtUtils::MakeMaker::VERSION) > 6.17 and $self->sign ) {
+ if ( $self->makemaker(6.17) and $self->sign ) {
$args->{SIGN} = 1;
}
unless ( $self->is_admin ) {
delete $args->{SIGN};
}
- # Merge both kinds of requires into prereq_pm
my $prereq = ($args->{PREREQ_PM} ||= {});
%$prereq = ( %$prereq,
- map { @$_ }
+ map { @$_ } # flatten [module => version]
map { @$_ }
grep $_,
- ($self->configure_requires, $self->build_requires, $self->requires)
+ ($self->requires)
);
# Remove any reference to perl, PREREQ_PM doesn't support it
delete $args->{PREREQ_PM}->{perl};
- # merge both kinds of requires into prereq_pm
+ # Merge both kinds of requires into BUILD_REQUIRES
+ my $build_prereq = ($args->{BUILD_REQUIRES} ||= {});
+ %$build_prereq = ( %$build_prereq,
+ map { @$_ } # flatten [module => version]
+ map { @$_ }
+ grep $_,
+ ($self->configure_requires, $self->build_requires)
+ );
+
+ # 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} ||= []);
if ($self->bundles) {
foreach my $bundle (@{ $self->bundles }) {
my ($file, $dir) = @$bundle;
push @$subdirs, $dir if -d $dir;
- delete $prereq->{$file};
+ delete $build_prereq->{$file}; #Delete from build prereqs only
}
+ }
+
+ unless ( $self->makemaker('6.55_03') ) {
+ %$prereq = (%$prereq,%$build_prereq);
+ delete $args->{BUILD_REQUIRES};
}
if ( my $perl_version = $self->perl_version ) {
eval "use $perl_version; 1"
or die "ERROR: perl: Version $] is installed, "
. "but we need version >= $perl_version";
+
+ if ( $self->makemaker(6.48) ) {
+ $args->{MIN_PERL_VERSION} = $perl_version;
+ }
}
$args->{INSTALLDIRS} = $self->installdirs;
@@ -265,4 +297,4 @@
__END__
-#line 394
+#line 426
Modified: trunk/libdata-optlist-perl/inc/Module/Install/Metadata.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libdata-optlist-perl/inc/Module/Install/Metadata.pm?rev=52803&op=diff
==============================================================================
--- trunk/libdata-optlist-perl/inc/Module/Install/Metadata.pm (original)
+++ trunk/libdata-optlist-perl/inc/Module/Install/Metadata.pm Mon Feb 15 15:36:47 2010
@@ -6,7 +6,7 @@
use vars qw{$VERSION @ISA $ISCORE};
BEGIN {
- $VERSION = '0.91';
+ $VERSION = '0.92';
@ISA = 'Module::Install::Base';
$ISCORE = 1;
}
@@ -230,6 +230,8 @@
die("The path '$file' does not exist, or is not a file");
}
+ $self->{values}{all_from} = $file;
+
# Some methods pull from POD instead of code.
# If there is a matching .pod, use that instead
my $pod = $file;
@@ -385,11 +387,10 @@
}
}
-sub perl_version_from {
- my $self = shift;
+sub _extract_perl_version {
if (
- Module::Install::_read($_[0]) =~ m/
- ^
+ $_[0] =~ m/
+ ^\s*
(?:use|require) \s*
v?
([\d_\.]+)
@@ -398,6 +399,16 @@
) {
my $perl_version = $1;
$perl_version =~ s{_}{}g;
+ return $perl_version;
+ } else {
+ return;
+ }
+}
+
+sub perl_version_from {
+ my $self = shift;
+ my $perl_version=_extract_perl_version(Module::Install::_read($_[0]));
+ if ($perl_version) {
$self->perl_version($perl_version);
} else {
warn "Cannot determine perl version info from $_[0]\n";
@@ -425,13 +436,12 @@
}
}
-sub license_from {
- my $self = shift;
+sub _extract_license {
if (
- Module::Install::_read($_[0]) =~ m/
+ $_[0] =~ m/
(
=head \d \s+
- (?:licen[cs]e|licensing|copyright|legal)\b
+ (?:licen[cs]e|licensing|copyrights?|legal)\b
.*?
)
(=head\\d.*|=cut.*|)
@@ -439,7 +449,8 @@
/ixms ) {
my $license_text = $1;
my @phrases = (
- 'under the same (?:terms|license) as (?:perl|the perl programming language) itself' => 'perl', 1,
+ '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,
@@ -456,20 +467,32 @@
'proprietary' => 'proprietary', 0,
);
while ( my ($pattern, $license, $osi) = splice(@phrases, 0, 3) ) {
- $pattern =~ s{\s+}{\\s+}g;
+ $pattern =~ s#\s+#\\s+#gs;
if ( $license_text =~ /\b$pattern\b/i ) {
- $self->license($license);
- return 1;
+ return $license;
}
}
- }
-
- warn "Cannot determine license info from $_[0]\n";
- return 'unknown';
+ } else {
+ return;
+ }
+}
+
+sub license_from {
+ my $self = shift;
+ if (my $license=_extract_license(Module::Install::_read($_[0]))) {
+ $self->license($license);
+ } else {
+ warn "Cannot determine license info from $_[0]\n";
+ return 'unknown';
+ }
}
sub _extract_bugtracker {
- my @links = $_[0] =~ m#L<(\Qhttp://rt.cpan.org/\E[^>]+)>#g;
+ my @links = $_[0] =~ m#L<(
+ \Qhttp://rt.cpan.org/\E[^>]+|
+ \Qhttp://github.com/\E[\w_]+/[\w_]+/issues|
+ \Qhttp://code.google.com/p/\E[\w_\-]+/issues/list
+ )>#gx;
my %links;
@links{@links}=();
@links=keys %links;
@@ -485,7 +508,7 @@
return 0;
}
if ( @links > 1 ) {
- warn "Found more than on rt.cpan.org link in $_[0]\n";
+ warn "Found more than one bugtracker link in $_[0]\n";
return 0;
}
Modified: trunk/libdata-optlist-perl/inc/Module/Install/Win32.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libdata-optlist-perl/inc/Module/Install/Win32.pm?rev=52803&op=diff
==============================================================================
--- trunk/libdata-optlist-perl/inc/Module/Install/Win32.pm (original)
+++ trunk/libdata-optlist-perl/inc/Module/Install/Win32.pm Mon Feb 15 15:36:47 2010
@@ -6,7 +6,7 @@
use vars qw{$VERSION @ISA $ISCORE};
BEGIN {
- $VERSION = '0.91';
+ $VERSION = '0.92';
@ISA = 'Module::Install::Base';
$ISCORE = 1;
}
Modified: trunk/libdata-optlist-perl/inc/Module/Install/WriteAll.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libdata-optlist-perl/inc/Module/Install/WriteAll.pm?rev=52803&op=diff
==============================================================================
--- trunk/libdata-optlist-perl/inc/Module/Install/WriteAll.pm (original)
+++ trunk/libdata-optlist-perl/inc/Module/Install/WriteAll.pm Mon Feb 15 15:36:47 2010
@@ -6,7 +6,7 @@
use vars qw{$VERSION @ISA $ISCORE};
BEGIN {
- $VERSION = '0.91';;
+ $VERSION = '0.92';;
@ISA = qw{Module::Install::Base};
$ISCORE = 1;
}
Modified: trunk/libdata-optlist-perl/lib/Data/OptList.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libdata-optlist-perl/lib/Data/OptList.pm?rev=52803&op=diff
==============================================================================
--- trunk/libdata-optlist-perl/lib/Data/OptList.pm (original)
+++ trunk/libdata-optlist-perl/lib/Data/OptList.pm Mon Feb 15 15:36:47 2010
@@ -5,7 +5,7 @@
use List::Util ();
use Params::Util ();
-use Sub::Install 0.92 ();
+use Sub::Install 0.921 ();
=head1 NAME
@@ -13,11 +13,11 @@
=head1 VERSION
-version 0.105
-
-=cut
-
-our $VERSION = '0.105';
+version 0.106
+
+=cut
+
+our $VERSION = '0.106';
=head1 SYNOPSIS
More information about the Pkg-perl-cvs-commits
mailing list