r19965 - in /branches/upstream/libmodule-install-perl/current: ./ inc/Module/ inc/Module/Install/ lib/Module/ lib/Module/Install/ lib/Module/Install/Admin/ lib/inc/Module/ t/ t/lib/
gregoa at users.alioth.debian.org
gregoa at users.alioth.debian.org
Wed May 14 18:53:46 UTC 2008
Author: gregoa
Date: Wed May 14 18:53:45 2008
New Revision: 19965
URL: http://svn.debian.org/wsvn/?sc=1&rev=19965
Log:
[svn-upgrade] Integrating new upstream version, libmodule-install-perl (0.73)
Modified:
branches/upstream/libmodule-install-perl/current/Changes
branches/upstream/libmodule-install-perl/current/META.yml
branches/upstream/libmodule-install-perl/current/Makefile.PL
branches/upstream/libmodule-install-perl/current/inc/Module/Install.pm
branches/upstream/libmodule-install-perl/current/inc/Module/Install/Base.pm
branches/upstream/libmodule-install-perl/current/inc/Module/Install/Can.pm
branches/upstream/libmodule-install-perl/current/inc/Module/Install/Fetch.pm
branches/upstream/libmodule-install-perl/current/inc/Module/Install/Makefile.pm
branches/upstream/libmodule-install-perl/current/inc/Module/Install/Metadata.pm
branches/upstream/libmodule-install-perl/current/inc/Module/Install/Win32.pm
branches/upstream/libmodule-install-perl/current/inc/Module/Install/WriteAll.pm
branches/upstream/libmodule-install-perl/current/lib/Module/Install.pm
branches/upstream/libmodule-install-perl/current/lib/Module/Install/Admin.pm
branches/upstream/libmodule-install-perl/current/lib/Module/Install/Admin/Bundle.pm
branches/upstream/libmodule-install-perl/current/lib/Module/Install/Admin/Find.pm
branches/upstream/libmodule-install-perl/current/lib/Module/Install/Admin/Include.pm
branches/upstream/libmodule-install-perl/current/lib/Module/Install/Admin/Makefile.pm
branches/upstream/libmodule-install-perl/current/lib/Module/Install/Admin/Manifest.pm
branches/upstream/libmodule-install-perl/current/lib/Module/Install/Admin/Metadata.pm
branches/upstream/libmodule-install-perl/current/lib/Module/Install/Admin/ScanDeps.pm
branches/upstream/libmodule-install-perl/current/lib/Module/Install/Admin/WriteAll.pm
branches/upstream/libmodule-install-perl/current/lib/Module/Install/AutoInstall.pm
branches/upstream/libmodule-install-perl/current/lib/Module/Install/Base.pm
branches/upstream/libmodule-install-perl/current/lib/Module/Install/Bundle.pm
branches/upstream/libmodule-install-perl/current/lib/Module/Install/Can.pm
branches/upstream/libmodule-install-perl/current/lib/Module/Install/Compiler.pm
branches/upstream/libmodule-install-perl/current/lib/Module/Install/Deprecated.pm
branches/upstream/libmodule-install-perl/current/lib/Module/Install/External.pm
branches/upstream/libmodule-install-perl/current/lib/Module/Install/Fetch.pm
branches/upstream/libmodule-install-perl/current/lib/Module/Install/Include.pm
branches/upstream/libmodule-install-perl/current/lib/Module/Install/Inline.pm
branches/upstream/libmodule-install-perl/current/lib/Module/Install/MakeMaker.pm
branches/upstream/libmodule-install-perl/current/lib/Module/Install/Makefile.pm
branches/upstream/libmodule-install-perl/current/lib/Module/Install/Metadata.pm
branches/upstream/libmodule-install-perl/current/lib/Module/Install/PAR.pm
branches/upstream/libmodule-install-perl/current/lib/Module/Install/Run.pm
branches/upstream/libmodule-install-perl/current/lib/Module/Install/Share.pm
branches/upstream/libmodule-install-perl/current/lib/Module/Install/Win32.pm
branches/upstream/libmodule-install-perl/current/lib/Module/Install/With.pm
branches/upstream/libmodule-install-perl/current/lib/Module/Install/WriteAll.pm
branches/upstream/libmodule-install-perl/current/lib/inc/Module/Install.pm
branches/upstream/libmodule-install-perl/current/t/01_compile.t
branches/upstream/libmodule-install-perl/current/t/lib/Test.pm
Modified: branches/upstream/libmodule-install-perl/current/Changes
URL: http://svn.debian.org/wsvn/branches/upstream/libmodule-install-perl/current/Changes?rev=19965&op=diff
==============================================================================
--- branches/upstream/libmodule-install-perl/current/Changes (original)
+++ branches/upstream/libmodule-install-perl/current/Changes Wed May 14 18:53:45 2008
@@ -1,7 +1,16 @@
Changes for Perl extension Module-Install
+0.73 Wed 14 May 2008 - Adam Kennedy
+ - Aggressively increase dependencies for authors to make sure
+ all the latest release-time tricks will work properly. (ADAMK)
+ - When generating META.yml where there is an overall Perl version
+ dependency, add a test for unversioned core dependencies that
+ MUST already be satified by the Perl dependency. (ADAMK)
+ - Merged Module::Install MANIFEST.SKIP into the repository
+ default MANIFEST.SKIP file, and deleted the M:I one (ADAMK)
+
0.72 Tue 15 Apr 2008 - Adam Kennedy
- - exit(0) on requires_external_bin to make it a real NA
+ - exit(0) on requires_external_bin to make it a real NA (ADAMK)
- Change docs to recommend the use of test_requires instead
of build_requires. They do the same thing now, but this may
change in the future and in that case better people use
Modified: branches/upstream/libmodule-install-perl/current/META.yml
URL: http://svn.debian.org/wsvn/branches/upstream/libmodule-install-perl/current/META.yml?rev=19965&op=diff
==============================================================================
--- branches/upstream/libmodule-install-perl/current/META.yml (original)
+++ branches/upstream/libmodule-install-perl/current/META.yml Wed May 14 18:53:45 2008
@@ -4,11 +4,11 @@
- 'Adam Kennedy <adamk at cpan.org>'
build_requires:
File::Remove: 1.40
- File::Spec: 0
+ File::Spec: 0.80
Test::Harness: 2.03
Test::More: 0.42
distribution_type: module
-generated_by: 'Module::Install version 0.72'
+generated_by: 'Module::Install version 0.73'
installdirs: site
license: perl
meta-spec:
@@ -20,14 +20,14 @@
- inc
- t
requires:
- Archive::Tar: 0.23
- ExtUtils::Install: 0.3
- ExtUtils::ParseXS: 0
- Module::Build: 0
- Module::CoreList: 0
- Module::ScanDeps: 0.28
- PAR::Dist: 0.03
- YAML::Tiny: 1.26
+ Archive::Tar: 1.38
+ ExtUtils::Install: 1.50
+ ExtUtils::ParseXS: 2.19
+ Module::Build: 0.2808
+ Module::CoreList: 2.15
+ Module::ScanDeps: 0.83
+ PAR::Dist: 0.29
+ YAML::Tiny: 1.30
perl: 5.004
tests: 't/*.t t/recursive/*.t'
-version: 0.72
+version: 0.73
Modified: branches/upstream/libmodule-install-perl/current/Makefile.PL
URL: http://svn.debian.org/wsvn/branches/upstream/libmodule-install-perl/current/Makefile.PL?rev=19965&op=diff
==============================================================================
--- branches/upstream/libmodule-install-perl/current/Makefile.PL (original)
+++ branches/upstream/libmodule-install-perl/current/Makefile.PL Wed May 14 18:53:45 2008
@@ -21,22 +21,21 @@
author 'Adam Kennedy <adamk at cpan.org>';
perl_version '5.004';
all_from 'lib/Module/Install.pm';
-requires 'YAML::Tiny' => '1.26';
-requires 'Module::ScanDeps' => '0.28';
-requires 'Module::CoreList' => 0;
-requires 'PAR::Dist' => '0.03';
-requires 'Archive::Tar' => '0.23';
-requires 'ExtUtils::Install' => '0.3';
-requires 'ExtUtils::ParseXS' => 0;
-requires 'Module::Build' => 0;
+requires 'YAML::Tiny' => '1.30';
+requires 'Module::ScanDeps' => '0.83';
+requires 'Module::CoreList' => '2.15';
+requires 'PAR::Dist' => '0.29';
+requires 'Archive::Tar' => '1.38';
+requires 'ExtUtils::Install' => '1.50';
+requires 'ExtUtils::ParseXS' => '2.19';
+requires 'Module::Build' => '0.2808';
+test_requires 'Test::Harness' => '2.03';
+test_requires 'Test::More' => '0.42';
+test_requires 'File::Remove' => '1.40';
# Should be a "requires", but we have to solve the
# "auto-include File::Spec if version < 5.005" problem first.
-test_requires 'File::Spec' => 0;
-
-test_requires 'Test::Harness' => '2.03';
-test_requires 'Test::More' => '0.42';
-test_requires 'File::Remove' => '1.40';
+test_requires 'File::Spec' => '0.80';
# Makes the recursive test script run
# (to test recursive test support)
Modified: branches/upstream/libmodule-install-perl/current/inc/Module/Install.pm
URL: http://svn.debian.org/wsvn/branches/upstream/libmodule-install-perl/current/inc/Module/Install.pm?rev=19965&op=diff
==============================================================================
--- branches/upstream/libmodule-install-perl/current/inc/Module/Install.pm (original)
+++ branches/upstream/libmodule-install-perl/current/inc/Module/Install.pm Wed May 14 18:53:45 2008
@@ -30,7 +30,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.72';
+ $VERSION = '0.73';
*inc::Module::Install::VERSION = *VERSION;
@inc::Module::Install::ISA = __PACKAGE__;
Modified: branches/upstream/libmodule-install-perl/current/inc/Module/Install/Base.pm
URL: http://svn.debian.org/wsvn/branches/upstream/libmodule-install-perl/current/inc/Module/Install/Base.pm?rev=19965&op=diff
==============================================================================
--- branches/upstream/libmodule-install-perl/current/inc/Module/Install/Base.pm (original)
+++ branches/upstream/libmodule-install-perl/current/inc/Module/Install/Base.pm Wed May 14 18:53:45 2008
@@ -1,7 +1,7 @@
#line 1
package Module::Install::Base;
-$VERSION = '0.72';
+$VERSION = '0.73';
# Suspend handler for "redefined" warnings
BEGIN {
Modified: branches/upstream/libmodule-install-perl/current/inc/Module/Install/Can.pm
URL: http://svn.debian.org/wsvn/branches/upstream/libmodule-install-perl/current/inc/Module/Install/Can.pm?rev=19965&op=diff
==============================================================================
--- branches/upstream/libmodule-install-perl/current/inc/Module/Install/Can.pm (original)
+++ branches/upstream/libmodule-install-perl/current/inc/Module/Install/Can.pm Wed May 14 18:53:45 2008
@@ -11,7 +11,7 @@
use vars qw{$VERSION $ISCORE @ISA};
BEGIN {
- $VERSION = '0.72';
+ $VERSION = '0.73';
$ISCORE = 1;
@ISA = qw{Module::Install::Base};
}
Modified: branches/upstream/libmodule-install-perl/current/inc/Module/Install/Fetch.pm
URL: http://svn.debian.org/wsvn/branches/upstream/libmodule-install-perl/current/inc/Module/Install/Fetch.pm?rev=19965&op=diff
==============================================================================
--- branches/upstream/libmodule-install-perl/current/inc/Module/Install/Fetch.pm (original)
+++ branches/upstream/libmodule-install-perl/current/inc/Module/Install/Fetch.pm Wed May 14 18:53:45 2008
@@ -6,7 +6,7 @@
use vars qw{$VERSION $ISCORE @ISA};
BEGIN {
- $VERSION = '0.72';
+ $VERSION = '0.73';
$ISCORE = 1;
@ISA = qw{Module::Install::Base};
}
Modified: branches/upstream/libmodule-install-perl/current/inc/Module/Install/Makefile.pm
URL: http://svn.debian.org/wsvn/branches/upstream/libmodule-install-perl/current/inc/Module/Install/Makefile.pm?rev=19965&op=diff
==============================================================================
--- branches/upstream/libmodule-install-perl/current/inc/Module/Install/Makefile.pm (original)
+++ branches/upstream/libmodule-install-perl/current/inc/Module/Install/Makefile.pm Wed May 14 18:53:45 2008
@@ -7,7 +7,7 @@
use vars qw{$VERSION $ISCORE @ISA};
BEGIN {
- $VERSION = '0.72';
+ $VERSION = '0.73';
$ISCORE = 1;
@ISA = qw{Module::Install::Base};
}
Modified: branches/upstream/libmodule-install-perl/current/inc/Module/Install/Metadata.pm
URL: http://svn.debian.org/wsvn/branches/upstream/libmodule-install-perl/current/inc/Module/Install/Metadata.pm?rev=19965&op=diff
==============================================================================
--- branches/upstream/libmodule-install-perl/current/inc/Module/Install/Metadata.pm (original)
+++ branches/upstream/libmodule-install-perl/current/inc/Module/Install/Metadata.pm Wed May 14 18:53:45 2008
@@ -6,7 +6,7 @@
use vars qw{$VERSION $ISCORE @ISA};
BEGIN {
- $VERSION = '0.72';
+ $VERSION = '0.73';
$ISCORE = 1;
@ISA = qw{Module::Install::Base};
}
@@ -267,22 +267,25 @@
);
}
+# Add both distribution and module name
sub name_from {
- my $self = shift;
+ my ($self, $file) = @_;
if (
- Module::Install::_read($_[0]) =~ m/
+ Module::Install::_read($file) =~ m/
^ \s*
package \s*
([\w:]+)
\s* ;
/ixms
) {
- my $name = $1;
+ my ($name, $module_name) = ($1, $1);
$name =~ s{::}{-}g;
$self->name($name);
+ unless ( $self->module_name ) {
+ $self->module_name($module_name);
+ }
} else {
- die "Cannot determine name from $_[0]\n";
- return;
+ die "Cannot determine name from $file\n";
}
}
@@ -356,7 +359,7 @@
$pattern =~ s{\s+}{\\s+}g;
if ( $license_text =~ /\b$pattern\b/i ) {
if ( $osi and $license_text =~ /All rights reserved/i ) {
- warn "LEGAL WARNING: 'All rights reserved' may invalidate Open Source licenses. Consider removing it.";
+ print "WARNING: 'All rights reserved' in copyright may invalidate Open Source license.\n";
}
$self->license($license);
return 1;
Modified: branches/upstream/libmodule-install-perl/current/inc/Module/Install/Win32.pm
URL: http://svn.debian.org/wsvn/branches/upstream/libmodule-install-perl/current/inc/Module/Install/Win32.pm?rev=19965&op=diff
==============================================================================
--- branches/upstream/libmodule-install-perl/current/inc/Module/Install/Win32.pm (original)
+++ branches/upstream/libmodule-install-perl/current/inc/Module/Install/Win32.pm Wed May 14 18:53:45 2008
@@ -6,7 +6,7 @@
use vars qw{$VERSION @ISA $ISCORE};
BEGIN {
- $VERSION = '0.72';
+ $VERSION = '0.73';
@ISA = qw{Module::Install::Base};
$ISCORE = 1;
}
Modified: branches/upstream/libmodule-install-perl/current/inc/Module/Install/WriteAll.pm
URL: http://svn.debian.org/wsvn/branches/upstream/libmodule-install-perl/current/inc/Module/Install/WriteAll.pm?rev=19965&op=diff
==============================================================================
--- branches/upstream/libmodule-install-perl/current/inc/Module/Install/WriteAll.pm (original)
+++ branches/upstream/libmodule-install-perl/current/inc/Module/Install/WriteAll.pm Wed May 14 18:53:45 2008
@@ -6,7 +6,7 @@
use vars qw{$VERSION @ISA $ISCORE};
BEGIN {
- $VERSION = '0.72';
+ $VERSION = '0.73';
@ISA = qw{Module::Install::Base};
$ISCORE = 1;
}
Modified: branches/upstream/libmodule-install-perl/current/lib/Module/Install.pm
URL: http://svn.debian.org/wsvn/branches/upstream/libmodule-install-perl/current/lib/Module/Install.pm?rev=19965&op=diff
==============================================================================
--- branches/upstream/libmodule-install-perl/current/lib/Module/Install.pm (original)
+++ branches/upstream/libmodule-install-perl/current/lib/Module/Install.pm Wed May 14 18:53:45 2008
@@ -29,7 +29,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.72';
+ $VERSION = '0.73';
*inc::Module::Install::VERSION = *VERSION;
@inc::Module::Install::ISA = __PACKAGE__;
Modified: branches/upstream/libmodule-install-perl/current/lib/Module/Install/Admin.pm
URL: http://svn.debian.org/wsvn/branches/upstream/libmodule-install-perl/current/lib/Module/Install/Admin.pm?rev=19965&op=diff
==============================================================================
--- branches/upstream/libmodule-install-perl/current/lib/Module/Install/Admin.pm (original)
+++ branches/upstream/libmodule-install-perl/current/lib/Module/Install/Admin.pm Wed May 14 18:53:45 2008
@@ -6,7 +6,7 @@
use vars qw{$VERSION @ISA};
BEGIN {
- $VERSION = '0.72';
+ $VERSION = '0.73';
@ISA = qw{Module::Install};
}
Modified: branches/upstream/libmodule-install-perl/current/lib/Module/Install/Admin/Bundle.pm
URL: http://svn.debian.org/wsvn/branches/upstream/libmodule-install-perl/current/lib/Module/Install/Admin/Bundle.pm?rev=19965&op=diff
==============================================================================
--- branches/upstream/libmodule-install-perl/current/lib/Module/Install/Admin/Bundle.pm (original)
+++ branches/upstream/libmodule-install-perl/current/lib/Module/Install/Admin/Bundle.pm Wed May 14 18:53:45 2008
@@ -5,7 +5,7 @@
use vars qw{$VERSION @ISA};
BEGIN {
- $VERSION = '0.72';
+ $VERSION = '0.73';
@ISA = qw{Module::Install::Base};
}
Modified: branches/upstream/libmodule-install-perl/current/lib/Module/Install/Admin/Find.pm
URL: http://svn.debian.org/wsvn/branches/upstream/libmodule-install-perl/current/lib/Module/Install/Admin/Find.pm?rev=19965&op=diff
==============================================================================
--- branches/upstream/libmodule-install-perl/current/lib/Module/Install/Admin/Find.pm (original)
+++ branches/upstream/libmodule-install-perl/current/lib/Module/Install/Admin/Find.pm Wed May 14 18:53:45 2008
@@ -3,7 +3,7 @@
use Module::Install::Base;
@ISA = qw(Module::Install::Base);
-$VERSION = '0.72';
+$VERSION = '0.73';
use strict;
use File::Find ();
Modified: branches/upstream/libmodule-install-perl/current/lib/Module/Install/Admin/Include.pm
URL: http://svn.debian.org/wsvn/branches/upstream/libmodule-install-perl/current/lib/Module/Install/Admin/Include.pm?rev=19965&op=diff
==============================================================================
--- branches/upstream/libmodule-install-perl/current/lib/Module/Install/Admin/Include.pm (original)
+++ branches/upstream/libmodule-install-perl/current/lib/Module/Install/Admin/Include.pm Wed May 14 18:53:45 2008
@@ -5,7 +5,7 @@
use vars qw{$VERSION @ISA};
BEGIN {
- $VERSION = '0.72';
+ $VERSION = '0.73';
@ISA = qw{Module::Install::Base};
}
Modified: branches/upstream/libmodule-install-perl/current/lib/Module/Install/Admin/Makefile.pm
URL: http://svn.debian.org/wsvn/branches/upstream/libmodule-install-perl/current/lib/Module/Install/Admin/Makefile.pm?rev=19965&op=diff
==============================================================================
--- branches/upstream/libmodule-install-perl/current/lib/Module/Install/Admin/Makefile.pm (original)
+++ branches/upstream/libmodule-install-perl/current/lib/Module/Install/Admin/Makefile.pm Wed May 14 18:53:45 2008
@@ -6,7 +6,7 @@
use vars qw{$VERSION @ISA};
BEGIN {
- $VERSION = '0.72';
+ $VERSION = '0.73';
@ISA = qw{Module::Install::Base};
}
Modified: branches/upstream/libmodule-install-perl/current/lib/Module/Install/Admin/Manifest.pm
URL: http://svn.debian.org/wsvn/branches/upstream/libmodule-install-perl/current/lib/Module/Install/Admin/Manifest.pm?rev=19965&op=diff
==============================================================================
--- branches/upstream/libmodule-install-perl/current/lib/Module/Install/Admin/Manifest.pm (original)
+++ branches/upstream/libmodule-install-perl/current/lib/Module/Install/Admin/Manifest.pm Wed May 14 18:53:45 2008
@@ -5,7 +5,7 @@
use vars qw{$VERSION @ISA};
BEGIN {
- $VERSION = '0.72';
+ $VERSION = '0.73';
@ISA = qw{Module::Install::Base};
}
Modified: branches/upstream/libmodule-install-perl/current/lib/Module/Install/Admin/Metadata.pm
URL: http://svn.debian.org/wsvn/branches/upstream/libmodule-install-perl/current/lib/Module/Install/Admin/Metadata.pm?rev=19965&op=diff
==============================================================================
--- branches/upstream/libmodule-install-perl/current/lib/Module/Install/Admin/Metadata.pm (original)
+++ branches/upstream/libmodule-install-perl/current/lib/Module/Install/Admin/Metadata.pm Wed May 14 18:53:45 2008
@@ -6,7 +6,7 @@
use vars qw{$VERSION @ISA};
BEGIN {
- $VERSION = '0.72';
+ $VERSION = '0.73';
@ISA = 'Module::Install::Base';
}
@@ -52,15 +52,30 @@
delete $val->{sign};
- if ( my $perl_version = delete $val->{perl_version} ) {
- # Always canonical to three-dot version
+ my $perl_version = delete $val->{perl_version};
+ if ( $perl_version ) {
+ $val->{requires} ||= [];
+ my $requires = $val->{requires};
+
+ # Issue warnings for unversioned core modules that are
+ # already satisfied by the Perl version dependency.
+ require Module::CoreList;
+ my $corelist = $Module::CoreList::version{$perl_version};
+ if ( $corelist ) {
+ my @bad = grep { exists $corelist->{$_} }
+ map { $_->[0] }
+ grep { ! $_->[1] }
+ @$requires;
+ foreach ( @bad ) {
+ print "WARNING: Unversioned dependency on '$_' is pointless when Perl minimum version is $perl_version\n";
+ }
+ }
+
+ # Canonicalize to three-dot version after Perl 5.6
if ( $perl_version >= 5.006 ) {
$perl_version =~ s{^(\d+)\.(\d\d\d)(\d*)}{join('.', $1, int($2||0), int($3||0))}e
}
- $val->{requires} = [
- [ perl => $perl_version ],
- @{ $val->{requires} || [] },
- ];
+ unshift @$requires, [ perl => $perl_version ];
}
# Set a default 'unknown' license
@@ -84,9 +99,9 @@
}
# Apply default no_index entries
- $val->{no_index} ||= {};
+ $val->{no_index} ||= {};
$val->{no_index}->{directory} ||= [];
- foreach my $dir ( qw{ share inc t } ) {
+ foreach my $dir ( qw{ share inc t examples examples demo } ) {
next unless -d $dir;
push @{ $val->{no_index}->{directory} }, $dir;
}
Modified: branches/upstream/libmodule-install-perl/current/lib/Module/Install/Admin/ScanDeps.pm
URL: http://svn.debian.org/wsvn/branches/upstream/libmodule-install-perl/current/lib/Module/Install/Admin/ScanDeps.pm?rev=19965&op=diff
==============================================================================
--- branches/upstream/libmodule-install-perl/current/lib/Module/Install/Admin/ScanDeps.pm (original)
+++ branches/upstream/libmodule-install-perl/current/lib/Module/Install/Admin/ScanDeps.pm Wed May 14 18:53:45 2008
@@ -3,7 +3,7 @@
use Module::Install::Base;
@ISA = qw(Module::Install::Base);
-$VERSION = '0.72';
+$VERSION = '0.73';
use strict;
Modified: branches/upstream/libmodule-install-perl/current/lib/Module/Install/Admin/WriteAll.pm
URL: http://svn.debian.org/wsvn/branches/upstream/libmodule-install-perl/current/lib/Module/Install/Admin/WriteAll.pm?rev=19965&op=diff
==============================================================================
--- branches/upstream/libmodule-install-perl/current/lib/Module/Install/Admin/WriteAll.pm (original)
+++ branches/upstream/libmodule-install-perl/current/lib/Module/Install/Admin/WriteAll.pm Wed May 14 18:53:45 2008
@@ -5,7 +5,7 @@
use vars qw{$VERSION @ISA};
BEGIN {
- $VERSION = '0.72';
+ $VERSION = '0.73';
@ISA = qw{Module::Install::Base};
}
Modified: branches/upstream/libmodule-install-perl/current/lib/Module/Install/AutoInstall.pm
URL: http://svn.debian.org/wsvn/branches/upstream/libmodule-install-perl/current/lib/Module/Install/AutoInstall.pm?rev=19965&op=diff
==============================================================================
--- branches/upstream/libmodule-install-perl/current/lib/Module/Install/AutoInstall.pm (original)
+++ branches/upstream/libmodule-install-perl/current/lib/Module/Install/AutoInstall.pm Wed May 14 18:53:45 2008
@@ -5,7 +5,7 @@
use vars qw{$VERSION $ISCORE @ISA};
BEGIN {
- $VERSION = '0.72';
+ $VERSION = '0.73';
$ISCORE = 1;
@ISA = qw{Module::Install::Base};
}
Modified: branches/upstream/libmodule-install-perl/current/lib/Module/Install/Base.pm
URL: http://svn.debian.org/wsvn/branches/upstream/libmodule-install-perl/current/lib/Module/Install/Base.pm?rev=19965&op=diff
==============================================================================
--- branches/upstream/libmodule-install-perl/current/lib/Module/Install/Base.pm (original)
+++ branches/upstream/libmodule-install-perl/current/lib/Module/Install/Base.pm Wed May 14 18:53:45 2008
@@ -1,6 +1,6 @@
package Module::Install::Base;
-$VERSION = '0.72';
+$VERSION = '0.73';
# Suspend handler for "redefined" warnings
BEGIN {
Modified: branches/upstream/libmodule-install-perl/current/lib/Module/Install/Bundle.pm
URL: http://svn.debian.org/wsvn/branches/upstream/libmodule-install-perl/current/lib/Module/Install/Bundle.pm?rev=19965&op=diff
==============================================================================
--- branches/upstream/libmodule-install-perl/current/lib/Module/Install/Bundle.pm (original)
+++ branches/upstream/libmodule-install-perl/current/lib/Module/Install/Bundle.pm Wed May 14 18:53:45 2008
@@ -9,7 +9,7 @@
use vars qw{$VERSION $ISCORE @ISA};
BEGIN {
- $VERSION = '0.72';
+ $VERSION = '0.73';
$ISCORE = 1;
@ISA = qw{Module::Install::Base};
}
Modified: branches/upstream/libmodule-install-perl/current/lib/Module/Install/Can.pm
URL: http://svn.debian.org/wsvn/branches/upstream/libmodule-install-perl/current/lib/Module/Install/Can.pm?rev=19965&op=diff
==============================================================================
--- branches/upstream/libmodule-install-perl/current/lib/Module/Install/Can.pm (original)
+++ branches/upstream/libmodule-install-perl/current/lib/Module/Install/Can.pm Wed May 14 18:53:45 2008
@@ -10,7 +10,7 @@
use vars qw{$VERSION $ISCORE @ISA};
BEGIN {
- $VERSION = '0.72';
+ $VERSION = '0.73';
$ISCORE = 1;
@ISA = qw{Module::Install::Base};
}
Modified: branches/upstream/libmodule-install-perl/current/lib/Module/Install/Compiler.pm
URL: http://svn.debian.org/wsvn/branches/upstream/libmodule-install-perl/current/lib/Module/Install/Compiler.pm?rev=19965&op=diff
==============================================================================
--- branches/upstream/libmodule-install-perl/current/lib/Module/Install/Compiler.pm (original)
+++ branches/upstream/libmodule-install-perl/current/lib/Module/Install/Compiler.pm Wed May 14 18:53:45 2008
@@ -6,7 +6,7 @@
use vars qw{$VERSION $ISCORE @ISA};
BEGIN {
- $VERSION = '0.72';
+ $VERSION = '0.73';
$ISCORE = 1;
@ISA = qw{Module::Install::Base};
}
Modified: branches/upstream/libmodule-install-perl/current/lib/Module/Install/Deprecated.pm
URL: http://svn.debian.org/wsvn/branches/upstream/libmodule-install-perl/current/lib/Module/Install/Deprecated.pm?rev=19965&op=diff
==============================================================================
--- branches/upstream/libmodule-install-perl/current/lib/Module/Install/Deprecated.pm (original)
+++ branches/upstream/libmodule-install-perl/current/lib/Module/Install/Deprecated.pm Wed May 14 18:53:45 2008
@@ -5,7 +5,7 @@
use vars qw{$VERSION $ISCORE @ISA};
BEGIN {
- $VERSION = '0.72';
+ $VERSION = '0.73';
$ISCORE = 1;
@ISA = qw{Module::Install::Base};
}
Modified: branches/upstream/libmodule-install-perl/current/lib/Module/Install/External.pm
URL: http://svn.debian.org/wsvn/branches/upstream/libmodule-install-perl/current/lib/Module/Install/External.pm?rev=19965&op=diff
==============================================================================
--- branches/upstream/libmodule-install-perl/current/lib/Module/Install/External.pm (original)
+++ branches/upstream/libmodule-install-perl/current/lib/Module/Install/External.pm Wed May 14 18:53:45 2008
@@ -7,7 +7,7 @@
use vars qw{$VERSION $ISCORE @ISA};
BEGIN {
- $VERSION = '0.72';
+ $VERSION = '0.73';
$ISCORE = 1;
@ISA = qw{Module::Install::Base};
}
Modified: branches/upstream/libmodule-install-perl/current/lib/Module/Install/Fetch.pm
URL: http://svn.debian.org/wsvn/branches/upstream/libmodule-install-perl/current/lib/Module/Install/Fetch.pm?rev=19965&op=diff
==============================================================================
--- branches/upstream/libmodule-install-perl/current/lib/Module/Install/Fetch.pm (original)
+++ branches/upstream/libmodule-install-perl/current/lib/Module/Install/Fetch.pm Wed May 14 18:53:45 2008
@@ -5,7 +5,7 @@
use vars qw{$VERSION $ISCORE @ISA};
BEGIN {
- $VERSION = '0.72';
+ $VERSION = '0.73';
$ISCORE = 1;
@ISA = qw{Module::Install::Base};
}
Modified: branches/upstream/libmodule-install-perl/current/lib/Module/Install/Include.pm
URL: http://svn.debian.org/wsvn/branches/upstream/libmodule-install-perl/current/lib/Module/Install/Include.pm?rev=19965&op=diff
==============================================================================
--- branches/upstream/libmodule-install-perl/current/lib/Module/Install/Include.pm (original)
+++ branches/upstream/libmodule-install-perl/current/lib/Module/Install/Include.pm Wed May 14 18:53:45 2008
@@ -5,7 +5,7 @@
use vars qw{$VERSION $ISCORE @ISA};
BEGIN {
- $VERSION = '0.72';
+ $VERSION = '0.73';
$ISCORE = 1;
@ISA = qw{Module::Install::Base};
}
Modified: branches/upstream/libmodule-install-perl/current/lib/Module/Install/Inline.pm
URL: http://svn.debian.org/wsvn/branches/upstream/libmodule-install-perl/current/lib/Module/Install/Inline.pm?rev=19965&op=diff
==============================================================================
--- branches/upstream/libmodule-install-perl/current/lib/Module/Install/Inline.pm (original)
+++ branches/upstream/libmodule-install-perl/current/lib/Module/Install/Inline.pm Wed May 14 18:53:45 2008
@@ -5,7 +5,7 @@
use vars qw{$VERSION $ISCORE @ISA};
BEGIN {
- $VERSION = '0.72';
+ $VERSION = '0.73';
$ISCORE = 1;
@ISA = qw{Module::Install::Base};
}
Modified: branches/upstream/libmodule-install-perl/current/lib/Module/Install/MakeMaker.pm
URL: http://svn.debian.org/wsvn/branches/upstream/libmodule-install-perl/current/lib/Module/Install/MakeMaker.pm?rev=19965&op=diff
==============================================================================
--- branches/upstream/libmodule-install-perl/current/lib/Module/Install/MakeMaker.pm (original)
+++ branches/upstream/libmodule-install-perl/current/lib/Module/Install/MakeMaker.pm Wed May 14 18:53:45 2008
@@ -6,7 +6,7 @@
use vars qw{$VERSION $ISCORE @ISA};
BEGIN {
- $VERSION = '0.72';
+ $VERSION = '0.73';
$ISCORE = 1;
@ISA = qw{Module::Install::Base};
}
Modified: branches/upstream/libmodule-install-perl/current/lib/Module/Install/Makefile.pm
URL: http://svn.debian.org/wsvn/branches/upstream/libmodule-install-perl/current/lib/Module/Install/Makefile.pm?rev=19965&op=diff
==============================================================================
--- branches/upstream/libmodule-install-perl/current/lib/Module/Install/Makefile.pm (original)
+++ branches/upstream/libmodule-install-perl/current/lib/Module/Install/Makefile.pm Wed May 14 18:53:45 2008
@@ -6,7 +6,7 @@
use vars qw{$VERSION $ISCORE @ISA};
BEGIN {
- $VERSION = '0.72';
+ $VERSION = '0.73';
$ISCORE = 1;
@ISA = qw{Module::Install::Base};
}
Modified: branches/upstream/libmodule-install-perl/current/lib/Module/Install/Metadata.pm
URL: http://svn.debian.org/wsvn/branches/upstream/libmodule-install-perl/current/lib/Module/Install/Metadata.pm?rev=19965&op=diff
==============================================================================
--- branches/upstream/libmodule-install-perl/current/lib/Module/Install/Metadata.pm (original)
+++ branches/upstream/libmodule-install-perl/current/lib/Module/Install/Metadata.pm Wed May 14 18:53:45 2008
@@ -5,7 +5,7 @@
use vars qw{$VERSION $ISCORE @ISA};
BEGIN {
- $VERSION = '0.72';
+ $VERSION = '0.73';
$ISCORE = 1;
@ISA = qw{Module::Install::Base};
}
@@ -266,22 +266,25 @@
);
}
+# Add both distribution and module name
sub name_from {
- my $self = shift;
+ my ($self, $file) = @_;
if (
- Module::Install::_read($_[0]) =~ m/
+ Module::Install::_read($file) =~ m/
^ \s*
package \s*
([\w:]+)
\s* ;
/ixms
) {
- my $name = $1;
+ my ($name, $module_name) = ($1, $1);
$name =~ s{::}{-}g;
$self->name($name);
+ unless ( $self->module_name ) {
+ $self->module_name($module_name);
+ }
} else {
- die "Cannot determine name from $_[0]\n";
- return;
+ die "Cannot determine name from $file\n";
}
}
@@ -355,7 +358,7 @@
$pattern =~ s{\s+}{\\s+}g;
if ( $license_text =~ /\b$pattern\b/i ) {
if ( $osi and $license_text =~ /All rights reserved/i ) {
- warn "LEGAL WARNING: 'All rights reserved' may invalidate Open Source licenses. Consider removing it.";
+ print "WARNING: 'All rights reserved' in copyright may invalidate Open Source license.\n";
}
$self->license($license);
return 1;
Modified: branches/upstream/libmodule-install-perl/current/lib/Module/Install/PAR.pm
URL: http://svn.debian.org/wsvn/branches/upstream/libmodule-install-perl/current/lib/Module/Install/PAR.pm?rev=19965&op=diff
==============================================================================
--- branches/upstream/libmodule-install-perl/current/lib/Module/Install/PAR.pm (original)
+++ branches/upstream/libmodule-install-perl/current/lib/Module/Install/PAR.pm Wed May 14 18:53:45 2008
@@ -5,7 +5,7 @@
use vars qw{$VERSION $ISCORE @ISA};
BEGIN {
- $VERSION = '0.72';
+ $VERSION = '0.73';
$ISCORE = 1;
@ISA = qw{Module::Install::Base};
}
Modified: branches/upstream/libmodule-install-perl/current/lib/Module/Install/Run.pm
URL: http://svn.debian.org/wsvn/branches/upstream/libmodule-install-perl/current/lib/Module/Install/Run.pm?rev=19965&op=diff
==============================================================================
--- branches/upstream/libmodule-install-perl/current/lib/Module/Install/Run.pm (original)
+++ branches/upstream/libmodule-install-perl/current/lib/Module/Install/Run.pm Wed May 14 18:53:45 2008
@@ -5,7 +5,7 @@
use vars qw{$VERSION $ISCORE @ISA};
BEGIN {
- $VERSION = '0.72';
+ $VERSION = '0.73';
$ISCORE = 1;
@ISA = qw{Module::Install::Base};
}
Modified: branches/upstream/libmodule-install-perl/current/lib/Module/Install/Share.pm
URL: http://svn.debian.org/wsvn/branches/upstream/libmodule-install-perl/current/lib/Module/Install/Share.pm?rev=19965&op=diff
==============================================================================
--- branches/upstream/libmodule-install-perl/current/lib/Module/Install/Share.pm (original)
+++ branches/upstream/libmodule-install-perl/current/lib/Module/Install/Share.pm Wed May 14 18:53:45 2008
@@ -5,7 +5,7 @@
use vars qw{$VERSION $ISCORE @ISA};
BEGIN {
- $VERSION = '0.72';
+ $VERSION = '0.73';
$ISCORE = 1;
@ISA = qw{Module::Install::Base};
}
@@ -16,6 +16,14 @@
if ( ! defined $dir ) {
die "Cannot find the 'share' directory" unless -d 'share';
$dir = 'share';
+ }
+
+ # If the module name and dist name don't math,
+ # the dist_dir won't subsequently work.
+ my $module_name = $self->name;
+ $module_name =~ s/-/::/;
+ unless ( $module_name eq $self->module_name ) {
+ die "For File::ShareDir::dist_dir to work, the module and distribution names much match";
}
$self->postamble(<<"END_MAKEFILE");
Modified: branches/upstream/libmodule-install-perl/current/lib/Module/Install/Win32.pm
URL: http://svn.debian.org/wsvn/branches/upstream/libmodule-install-perl/current/lib/Module/Install/Win32.pm?rev=19965&op=diff
==============================================================================
--- branches/upstream/libmodule-install-perl/current/lib/Module/Install/Win32.pm (original)
+++ branches/upstream/libmodule-install-perl/current/lib/Module/Install/Win32.pm Wed May 14 18:53:45 2008
@@ -5,7 +5,7 @@
use vars qw{$VERSION @ISA $ISCORE};
BEGIN {
- $VERSION = '0.72';
+ $VERSION = '0.73';
@ISA = qw{Module::Install::Base};
$ISCORE = 1;
}
Modified: branches/upstream/libmodule-install-perl/current/lib/Module/Install/With.pm
URL: http://svn.debian.org/wsvn/branches/upstream/libmodule-install-perl/current/lib/Module/Install/With.pm?rev=19965&op=diff
==============================================================================
--- branches/upstream/libmodule-install-perl/current/lib/Module/Install/With.pm (original)
+++ branches/upstream/libmodule-install-perl/current/lib/Module/Install/With.pm Wed May 14 18:53:45 2008
@@ -13,7 +13,7 @@
use vars qw{$VERSION $ISCORE @ISA};
BEGIN {
- $VERSION = '0.72';
+ $VERSION = '0.73';
$ISCORE = 1;
@ISA = qw{Module::Install::Base};
}
Modified: branches/upstream/libmodule-install-perl/current/lib/Module/Install/WriteAll.pm
URL: http://svn.debian.org/wsvn/branches/upstream/libmodule-install-perl/current/lib/Module/Install/WriteAll.pm?rev=19965&op=diff
==============================================================================
--- branches/upstream/libmodule-install-perl/current/lib/Module/Install/WriteAll.pm (original)
+++ branches/upstream/libmodule-install-perl/current/lib/Module/Install/WriteAll.pm Wed May 14 18:53:45 2008
@@ -5,7 +5,7 @@
use vars qw{$VERSION @ISA $ISCORE};
BEGIN {
- $VERSION = '0.72';
+ $VERSION = '0.73';
@ISA = qw{Module::Install::Base};
$ISCORE = 1;
}
Modified: branches/upstream/libmodule-install-perl/current/lib/inc/Module/Install.pm
URL: http://svn.debian.org/wsvn/branches/upstream/libmodule-install-perl/current/lib/inc/Module/Install.pm?rev=19965&op=diff
==============================================================================
--- branches/upstream/libmodule-install-perl/current/lib/inc/Module/Install.pm (original)
+++ branches/upstream/libmodule-install-perl/current/lib/inc/Module/Install.pm Wed May 14 18:53:45 2008
@@ -18,7 +18,7 @@
# version an author currently has installed.
# This allows it to implement any back-compatibility features
# it may want or need to.
- $VERSION = '0.72';
+ $VERSION = '0.73';
}
if ( -d './inc' ) {
Modified: branches/upstream/libmodule-install-perl/current/t/01_compile.t
URL: http://svn.debian.org/wsvn/branches/upstream/libmodule-install-perl/current/t/01_compile.t?rev=19965&op=diff
==============================================================================
--- branches/upstream/libmodule-install-perl/current/t/01_compile.t (original)
+++ branches/upstream/libmodule-install-perl/current/t/01_compile.t Wed May 14 18:53:45 2008
@@ -7,7 +7,7 @@
BEGIN {
$| = 1;
$^W = 1;
- $VERSION = '0.72';
+ $VERSION = '0.73';
}
use Test::More tests => 62;
Modified: branches/upstream/libmodule-install-perl/current/t/lib/Test.pm
URL: http://svn.debian.org/wsvn/branches/upstream/libmodule-install-perl/current/t/lib/Test.pm?rev=19965&op=diff
==============================================================================
--- branches/upstream/libmodule-install-perl/current/t/lib/Test.pm (original)
+++ branches/upstream/libmodule-install-perl/current/t/lib/Test.pm Wed May 14 18:53:45 2008
@@ -8,7 +8,7 @@
use vars qw{$VERSION @ISA @EXPORT};
BEGIN {
- $VERSION = '0.72';
+ $VERSION = '0.73';
@ISA = 'Exporter';
@EXPORT = qw{
create_dist
More information about the Pkg-perl-cvs-commits
mailing list