[SCM] Debian packaging of libfile-find-rule-perl-perl branch, master, updated. 0a5b5fc0eb95473351832afffbe98b6fb8b04740
Salvatore Bonaccorso
carnil at debian.org
Sat Nov 5 08:56:21 UTC 2011
The following commit has been merged in the master branch:
commit a0dd7a7044c5e0196ccd4ea4264a3ea4640c4fe4
Author: Salvatore Bonaccorso <carnil at debian.org>
Date: Sat Nov 5 09:38:53 2011 +0100
Imported Upstream version 1.12
diff --git a/Changes b/Changes
index fdc4223..890e531 100644
--- a/Changes
+++ b/Changes
@@ -1,8 +1,17 @@
Revision history for Perl extension File-Find-Rule-Perl
+1.12 Mon 31 Oct 2011
+ - Ignore debian directory in tests (ADAMK)
+ - Ignore all dot dirs in tests (ADAMK)
+
+1.11 Mon 31 Oct 2011
+ - Updating to Module::Install::DSL 1.04 (ADAMK)
+ - Skip MYMETA.json too (CHORNY)
+ - Do not import from Params::Util (ADAMK)
+
1.10 Wed 6 Sep 2010
- - Upgrading to Module::Install::DSL 1.00
- - Removing nasty evil use UNIVERSAL;
+ - Upgrading to Module::Install::DSL 1.00 (ADAMK)
+ - Removing nasty evil use UNIVERSAL (ADAMK)
- Fix 03_noindex.t to ignore MYMETA.yml (MIYAGAWA)
1.09 Thu 30 Jul 2009
diff --git a/META.yml b/META.yml
index 41a1836..88f2d00 100644
--- a/META.yml
+++ b/META.yml
@@ -3,12 +3,13 @@ abstract: 'Common rules for searching for Perl things'
author:
- 'Adam Kennedy <adamk at cpan.org>'
build_requires:
- ExtUtils::MakeMaker: 6.42
+ ExtUtils::MakeMaker: 6.36
Test::More: 0.47
configure_requires:
- ExtUtils::MakeMaker: 6.42
+ ExtUtils::MakeMaker: 6.36
distribution_type: module
-generated_by: 'Module::Install version 1.00'
+dynamic_config: 0
+generated_by: 'Module::Install version 1.04'
license: perl
meta-spec:
url: http://module-build.sourceforge.net/META-spec-v1.4.html
@@ -30,4 +31,4 @@ resources:
ChangeLog: http://fisheye2.atlassian.com/changelog/cpan/trunk/File-Find-Rule-Perl
license: http://dev.perl.org/licenses/
repository: http://svn.ali.as/cpan/trunk/File-Find-Rule-Perl
-version: 1.10
+version: 1.12
diff --git a/README b/README
index 0b4d1cb..5bb7a3a 100644
--- a/README
+++ b/README
@@ -88,7 +88,7 @@ SEE ALSO
<http://ali.as/>, File::Find::Rule, File::Find::Rule::PPI
COPYRIGHT
- Copyright 2006 - 2010 Adam Kennedy.
+ Copyright 2006 - 2011 Adam Kennedy.
This program is free software; you can redistribute it and/or modify it
under the same terms as Perl itself.
diff --git a/inc/Module/Install.pm b/inc/Module/Install.pm
index 8ee839d..c685ca4 100644
--- a/inc/Module/Install.pm
+++ b/inc/Module/Install.pm
@@ -31,7 +31,7 @@ BEGIN {
# 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 = '1.00';
+ $VERSION = '1.04';
# Storage for the pseudo-singleton
$MAIN = undef;
@@ -451,7 +451,7 @@ sub _version ($) {
}
sub _cmp ($$) {
- _version($_[0]) <=> _version($_[1]);
+ _version($_[1]) <=> _version($_[2]);
}
# Cloned from Params::Util::_CLASS
@@ -467,4 +467,4 @@ sub _CLASS ($) {
1;
-# Copyright 2008 - 2010 Adam Kennedy.
+# Copyright 2008 - 2011 Adam Kennedy.
diff --git a/inc/Module/Install/Base.pm b/inc/Module/Install/Base.pm
index b55bda3..b520616 100644
--- a/inc/Module/Install/Base.pm
+++ b/inc/Module/Install/Base.pm
@@ -4,7 +4,7 @@ package Module::Install::Base;
use strict 'vars';
use vars qw{$VERSION};
BEGIN {
- $VERSION = '1.00';
+ $VERSION = '1.04';
}
# Suspend handler for "redefined" warnings
diff --git a/inc/Module/Install/Can.pm b/inc/Module/Install/Can.pm
index 71ccc27..a162ad4 100644
--- a/inc/Module/Install/Can.pm
+++ b/inc/Module/Install/Can.pm
@@ -9,7 +9,7 @@ use Module::Install::Base ();
use vars qw{$VERSION @ISA $ISCORE};
BEGIN {
- $VERSION = '1.00';
+ $VERSION = '1.04';
@ISA = 'Module::Install::Base';
$ISCORE = 1;
}
diff --git a/inc/Module/Install/DSL.pm b/inc/Module/Install/DSL.pm
index 615772f..1061aa6 100644
--- a/inc/Module/Install/DSL.pm
+++ b/inc/Module/Install/DSL.pm
@@ -4,7 +4,7 @@ package Module::Install::DSL;
use strict;
use vars qw{$VERSION $ISCORE};
BEGIN {
- $VERSION = '1.00';
+ $VERSION = '1.04';
$ISCORE = 1;
*inc::Module::Install::DSL::VERSION = *VERSION;
@inc::Module::Install::DSL::ISA = __PACKAGE__;
@@ -59,7 +59,8 @@ sub dsl2code {
my @lines = grep { /\S/ } split /[\012\015]+/, $dsl;
# Each line represents one command
- my @code = ();
+ my @code = ();
+ my $static = 1;
foreach my $line ( @lines ) {
# Split the lines into tokens
my @tokens = split /\s+/, $line;
@@ -74,6 +75,10 @@ sub dsl2code {
# This is the beginning of a suffix
push @suffix, $token;
push @suffix, @tokens;
+
+ # The conditional means this distribution
+ # can no longer be considered fully static.
+ $static = 0;
last;
} else {
# Convert to a string
@@ -87,6 +92,9 @@ sub dsl2code {
push @code, join( ' ', @tokens ) . ";\n";
}
+ # Is our configuration static?
+ push @code, "static_config;\n" if $static;
+
# Join into the complete code block
return join( '', @code );
}
diff --git a/inc/Module/Install/Fetch.pm b/inc/Module/Install/Fetch.pm
index ec1f106..a412576 100644
--- a/inc/Module/Install/Fetch.pm
+++ b/inc/Module/Install/Fetch.pm
@@ -6,7 +6,7 @@ use Module::Install::Base ();
use vars qw{$VERSION @ISA $ISCORE};
BEGIN {
- $VERSION = '1.00';
+ $VERSION = '1.04';
@ISA = 'Module::Install::Base';
$ISCORE = 1;
}
diff --git a/inc/Module/Install/Makefile.pm b/inc/Module/Install/Makefile.pm
index 5dfd0e9..035cef2 100644
--- a/inc/Module/Install/Makefile.pm
+++ b/inc/Module/Install/Makefile.pm
@@ -8,7 +8,7 @@ use Fcntl qw/:flock :seek/;
use vars qw{$VERSION @ISA $ISCORE};
BEGIN {
- $VERSION = '1.00';
+ $VERSION = '1.04';
@ISA = 'Module::Install::Base';
$ISCORE = 1;
}
@@ -219,14 +219,14 @@ sub write {
# an underscore, even though its own version may contain one!
# Hence the funny regexp to get rid of it. See RT #35800
# for details.
- my $v = $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->configure_requires( 'ExtUtils::MakeMaker' => 6.42 );
+ $self->build_requires( 'ExtUtils::MakeMaker' => 6.36 );
+ $self->configure_requires( 'ExtUtils::MakeMaker' => 6.36 );
}
# Generate the MakeMaker params
@@ -241,7 +241,6 @@ 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;
@@ -412,4 +411,4 @@ sub postamble {
__END__
-#line 541
+#line 540
diff --git a/inc/Module/Install/Metadata.pm b/inc/Module/Install/Metadata.pm
index cfe45b3..31c953e 100644
--- a/inc/Module/Install/Metadata.pm
+++ b/inc/Module/Install/Metadata.pm
@@ -6,7 +6,7 @@ use Module::Install::Base ();
use vars qw{$VERSION @ISA $ISCORE};
BEGIN {
- $VERSION = '1.00';
+ $VERSION = '1.04';
@ISA = 'Module::Install::Base';
$ISCORE = 1;
}
@@ -151,15 +151,21 @@ sub install_as_site { $_[0]->installdirs('site') }
sub install_as_vendor { $_[0]->installdirs('vendor') }
sub dynamic_config {
- my $self = shift;
- unless ( @_ ) {
- warn "You MUST provide an explicit true/false value to dynamic_config\n";
- return $self;
+ my $self = shift;
+ my $value = @_ ? shift : 1;
+ if ( $self->{values}->{dynamic_config} ) {
+ # Once dynamic we never change to static, for safety
+ return 0;
}
- $self->{values}->{dynamic_config} = $_[0] ? 1 : 0;
+ $self->{values}->{dynamic_config} = $value ? 1 : 0;
return 1;
}
+# Convenience command
+sub static_config {
+ shift->dynamic_config(0);
+}
+
sub perl_version {
my $self = shift;
return $self->{values}->{perl_version} unless @_;
@@ -170,7 +176,7 @@ sub perl_version {
# Normalize the version
$version = $self->_perl_version($version);
- # We don't support the reall old versions
+ # We don't support the really old versions
unless ( $version >= 5.005 ) {
die "Module::Install only supports 5.005 or newer (use ExtUtils::MakeMaker)\n";
}
@@ -515,6 +521,7 @@ sub __extract_license {
'GNU Free Documentation license' => 'unrestricted', 1,
'GNU Affero General Public License' => 'open_source', 1,
'(?:Free)?BSD license' => 'bsd', 1,
+ 'Artistic license 2\.0' => 'artistic_2', 1,
'Artistic license' => 'artistic', 1,
'Apache (?:Software )?license' => 'apache', 1,
'GPL' => 'gpl', 1,
@@ -550,9 +557,9 @@ sub license_from {
sub _extract_bugtracker {
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
+ https?\Q://rt.cpan.org/\E[^>]+|
+ https?\Q://github.com/\E[\w_]+/[\w_]+/issues|
+ https?\Q://code.google.com/p/\E[\w_\-]+/issues/list
)>#gx;
my %links;
@links{@links}=();
@@ -581,7 +588,7 @@ sub bugtracker_from {
sub requires_from {
my $self = shift;
my $content = Module::Install::_readperl($_[0]);
- my @requires = $content =~ m/^use\s+([^\W\d]\w*(?:::\w+)*)\s+([\d\.]+)/mg;
+ my @requires = $content =~ m/^use\s+([^\W\d]\w*(?:::\w+)*)\s+(v?[\d\.]+)/mg;
while ( @requires ) {
my $module = shift @requires;
my $version = shift @requires;
diff --git a/inc/Module/Install/Win32.pm b/inc/Module/Install/Win32.pm
index edc18b4..99d9631 100644
--- a/inc/Module/Install/Win32.pm
+++ b/inc/Module/Install/Win32.pm
@@ -6,7 +6,7 @@ use Module::Install::Base ();
use vars qw{$VERSION @ISA $ISCORE};
BEGIN {
- $VERSION = '1.00';
+ $VERSION = '1.04';
@ISA = 'Module::Install::Base';
$ISCORE = 1;
}
diff --git a/inc/Module/Install/WriteAll.pm b/inc/Module/Install/WriteAll.pm
index d0f6599..86bb25e 100644
--- a/inc/Module/Install/WriteAll.pm
+++ b/inc/Module/Install/WriteAll.pm
@@ -6,7 +6,7 @@ use Module::Install::Base ();
use vars qw{$VERSION @ISA $ISCORE};
BEGIN {
- $VERSION = '1.00';
+ $VERSION = '1.04';
@ISA = qw{Module::Install::Base};
$ISCORE = 1;
}
diff --git a/lib/File/Find/Rule/Perl.pm b/lib/File/Find/Rule/Perl.pm
index 636746e..54532cf 100644
--- a/lib/File/Find/Rule/Perl.pm
+++ b/lib/File/Find/Rule/Perl.pm
@@ -40,13 +40,13 @@ use strict;
use Carp;
use File::Spec 0.82 ();
use File::Spec::Unix ();
-use Params::Util 0.38 qw{ _STRING _HASHLIKE };
use File::Find::Rule 0.20 ();
+use Params::Util 0.38 ();
use Parse::CPAN::Meta 1.38 ();
use vars qw{$VERSION @ISA @EXPORT};
BEGIN {
- $VERSION = '1.10';
+ $VERSION = '1.12';
@ISA = 'File::Find::Rule';
@EXPORT = @File::Find::Rule::EXPORT;
}
@@ -194,10 +194,10 @@ sub File::Find::Rule::no_index {
# No params means we auto-calculate
$rule = undef;
- } elsif ( _HASHLIKE($_[0]) ) {
+ } elsif ( Params::Util::_HASHLIKE($_[0]) ) {
$rule = _no_index($_[0]);
- } elsif ( defined _STRING($_[0]) ) {
+ } elsif ( defined Params::Util::_STRING($_[0]) ) {
my $path = shift;
if ( -d $path ) {
# This is probably a dist directory
@@ -310,7 +310,7 @@ L<http://ali.as/>, L<File::Find::Rule>, L<File::Find::Rule::PPI>
=head1 COPYRIGHT
-Copyright 2006 - 2010 Adam Kennedy.
+Copyright 2006 - 2011 Adam Kennedy.
This program is free software; you can redistribute
it and/or modify it under the same terms as Perl itself.
diff --git a/t/03_no_index.t b/t/03_no_index.t
index 1bef5c5..cd8b96c 100644
--- a/t/03_no_index.t
+++ b/t/03_no_index.t
@@ -39,13 +39,12 @@ SCOPE: {
README
pm_to_blib
MYMETA.yml
+ MYMETA.json
};
my @files = sort grep {
! /^debian\b/
and
- ! /\.svn\b/
- and
- ! /\.sw[op]\b/
+ ! /(?:^|\W)\.\w/
and
! /\bblib\b/
and
diff --git a/xt/pmv.t b/xt/pmv.t
index 84d6f6f..f285be3 100644
--- a/xt/pmv.t
+++ b/xt/pmv.t
@@ -9,7 +9,7 @@ BEGIN {
}
my @MODULES = (
- 'Perl::MinimumVersion 1.25',
+ 'Perl::MinimumVersion 1.27',
'Test::MinimumVersion 0.101080',
);
--
Debian packaging of libfile-find-rule-perl-perl
More information about the Pkg-perl-cvs-commits
mailing list