r35808 - in /trunk/libenv-sanctify-perl: ./ debian/ inc/Module/ inc/Module/Install/ lib/Env/
jawnsy-guest at users.alioth.debian.org
jawnsy-guest at users.alioth.debian.org
Tue May 19 05:19:01 UTC 2009
Author: jawnsy-guest
Date: Tue May 19 05:18:56 2009
New Revision: 35808
URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=35808
Log:
* New upstream release (NO RELEASE NECESSARY)
* Upgraded bundled Module::Install version
* Used some new M::I features. Does not affect functionality or close bugs.
Added:
trunk/libenv-sanctify-perl/inc/Module/Install/AutoLicense.pm
- copied unchanged from r35806, branches/upstream/libenv-sanctify-perl/current/inc/Module/Install/AutoLicense.pm
trunk/libenv-sanctify-perl/inc/Module/Install/GithubMeta.pm
- copied unchanged from r35806, branches/upstream/libenv-sanctify-perl/current/inc/Module/Install/GithubMeta.pm
Modified:
trunk/libenv-sanctify-perl/Changes
trunk/libenv-sanctify-perl/MANIFEST
trunk/libenv-sanctify-perl/META.yml
trunk/libenv-sanctify-perl/Makefile.PL
trunk/libenv-sanctify-perl/debian/changelog
trunk/libenv-sanctify-perl/debian/copyright
trunk/libenv-sanctify-perl/inc/Module/Install.pm
trunk/libenv-sanctify-perl/inc/Module/Install/Base.pm
trunk/libenv-sanctify-perl/inc/Module/Install/Can.pm
trunk/libenv-sanctify-perl/inc/Module/Install/Fetch.pm
trunk/libenv-sanctify-perl/inc/Module/Install/Makefile.pm
trunk/libenv-sanctify-perl/inc/Module/Install/Metadata.pm
trunk/libenv-sanctify-perl/inc/Module/Install/Win32.pm
trunk/libenv-sanctify-perl/inc/Module/Install/WriteAll.pm
trunk/libenv-sanctify-perl/lib/Env/Sanctify.pm
Modified: trunk/libenv-sanctify-perl/Changes
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libenv-sanctify-perl/Changes?rev=35808&op=diff
==============================================================================
--- trunk/libenv-sanctify-perl/Changes (original)
+++ trunk/libenv-sanctify-perl/Changes Tue May 19 05:18:56 2009
@@ -1,5 +1,8 @@
Env::Sanctify
=============
+
+1.04 Mon May 18 10:28:20 BST 2009
+ - Added auto_provides, auto_license and githubmeta to Makefile.PL
1.02 Tue Apr 7 21:40:42 BST 2009
- Make auto_set_repository() only run at author-time
Modified: trunk/libenv-sanctify-perl/MANIFEST
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libenv-sanctify-perl/MANIFEST?rev=35808&op=diff
==============================================================================
--- trunk/libenv-sanctify-perl/MANIFEST (original)
+++ trunk/libenv-sanctify-perl/MANIFEST Tue May 19 05:18:56 2009
@@ -1,9 +1,11 @@
Changes
examples/system.pl
inc/Module/Install.pm
+inc/Module/Install/AutoLicense.pm
inc/Module/Install/Base.pm
inc/Module/Install/Can.pm
inc/Module/Install/Fetch.pm
+inc/Module/Install/GithubMeta.pm
inc/Module/Install/Makefile.pm
inc/Module/Install/Metadata.pm
inc/Module/Install/Win32.pm
Modified: trunk/libenv-sanctify-perl/META.yml
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libenv-sanctify-perl/META.yml?rev=35808&op=diff
==============================================================================
--- trunk/libenv-sanctify-perl/META.yml (original)
+++ trunk/libenv-sanctify-perl/META.yml Tue May 19 05:18:56 2009
@@ -3,11 +3,12 @@
author:
- 'Chris Williams <chris at bingosnet.co.uk>'
build_requires:
+ ExtUtils::MakeMaker: 6.42
Test::More: 0.47
configure_requires:
- ExtUtils::MakeMaker: 6.50
+ ExtUtils::MakeMaker: 6.42
distribution_type: module
-generated_by: 'Module::Install version 0.81'
+generated_by: 'Module::Install version 0.88'
license: perl
meta-spec:
url: http://module-build.sourceforge.net/META-spec-v1.4.html
@@ -18,9 +19,14 @@
- examples
- inc
- t
+provides:
+ Env::Sanctify:
+ file: lib/Env/Sanctify.pm
+ version: 1.04
requires:
perl: 5.6.0
resources:
+ homepage: http://github.com/bingos/env-sanctify/tree
license: http://dev.perl.org/licenses/
repository: git://github.com/bingos/env-sanctify.git
-version: 1.02
+version: 1.04
Modified: trunk/libenv-sanctify-perl/Makefile.PL
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libenv-sanctify-perl/Makefile.PL?rev=35808&op=diff
==============================================================================
--- trunk/libenv-sanctify-perl/Makefile.PL (original)
+++ trunk/libenv-sanctify-perl/Makefile.PL Tue May 19 05:18:56 2009
@@ -5,7 +5,9 @@
version_from 'lib/Env/Sanctify.pm';
abstract_from 'lib/Env/Sanctify.pm';
license 'perl';
+auto_license holder => 'Chris Williams';
perl_version '5.006';
build_requires 'Test::More' => 0.47;
-eval "auto_set_repository";
+auto_provides;
+githubmeta;
WriteAll();
Modified: trunk/libenv-sanctify-perl/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libenv-sanctify-perl/debian/changelog?rev=35808&op=diff
==============================================================================
--- trunk/libenv-sanctify-perl/debian/changelog (original)
+++ trunk/libenv-sanctify-perl/debian/changelog Tue May 19 05:18:56 2009
@@ -1,3 +1,11 @@
+libenv-sanctify-perl (1.04-1) UNRELEASED; urgency=low
+
+ * New upstream release (NO RELEASE NECESSARY)
+ * Upgraded bundled Module::Install version
+ * Used some new M::I features. Does not affect functionality or close bugs.
+
+ -- Jonathan Yu <frequency at cpan.org> Tue, 19 May 2009 01:13:27 -0400
+
libenv-sanctify-perl (1.02-1) unstable; urgency=low
* Initial Release. (Closes: #526383)
Modified: trunk/libenv-sanctify-perl/debian/copyright
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libenv-sanctify-perl/debian/copyright?rev=35808&op=diff
==============================================================================
--- trunk/libenv-sanctify-perl/debian/copyright (original)
+++ trunk/libenv-sanctify-perl/debian/copyright Tue May 19 05:18:56 2009
@@ -11,10 +11,14 @@
Files: debian/*
Copyright: 2009, Jonathan Yu <frequency at cpan.org>
+License-Alias: Perl
License: Artistic | GPL-1+
Files: inc/Module/*
-Copyright: Copyright 2002-2009 Brian Ingerson, Audrey Tang and Adam Kennedy.
+Copyright: 2002-2009, Adam Kennedy <adamk at cpan.org>
+ 2002-2009, Audrey Tang <autrijus at autrijus.org>
+ 2002-2009, Brian Ingerson <ingy at cpan.org>
+License-Alias: Perl
License: Artistic | GPL-1+
License: Artistic
Modified: trunk/libenv-sanctify-perl/inc/Module/Install.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libenv-sanctify-perl/inc/Module/Install.pm?rev=35808&op=diff
==============================================================================
--- trunk/libenv-sanctify-perl/inc/Module/Install.pm (original)
+++ trunk/libenv-sanctify-perl/inc/Module/Install.pm Tue May 19 05:18:56 2009
@@ -17,12 +17,10 @@
# 3. The ./inc/ version of Module::Install loads
# }
-BEGIN {
- require 5.004;
-}
+use 5.005;
use strict 'vars';
-use vars qw{$VERSION};
+use vars qw{$VERSION $MAIN};
BEGIN {
# All Module::Install core packages now require synchronised versions.
# This will be used to ensure we don't accidentally load old or
@@ -30,7 +28,10 @@
# 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.81';
+ $VERSION = '0.88';
+
+ # Storage for the pseudo-singleton
+ $MAIN = undef;
*inc::Module::Install::VERSION = *VERSION;
@inc::Module::Install::ISA = __PACKAGE__;
@@ -93,6 +94,7 @@
+
# Build.PL was formerly supported, but no longer is due to excessive
# difficulty in implementing every single feature twice.
if ( $0 =~ /Build.PL$/i ) { die <<"END_DIE" }
@@ -131,14 +133,22 @@
$sym->{$cwd} = sub {
my $pwd = Cwd::cwd();
if ( my $code = $sym->{$pwd} ) {
- # delegate back to parent dirs
+ # Delegate back to parent dirs
goto &$code unless $cwd eq $pwd;
}
$$sym =~ /([^:]+)$/ or die "Cannot autoload $who - $sym";
- unless ( uc($1) eq $1 ) {
- unshift @_, ( $self, $1 );
- goto &{$self->can('call')};
+ my $method = $1;
+ if ( uc($method) eq $method ) {
+ # Do nothing
+ return;
+ } elsif ( $method =~ /^_/ and $self->can($method) ) {
+ # Dispatch to the root M:I class
+ return $self->$method(@_);
}
+
+ # Dispatch to the appropriate plugin
+ unshift @_, ( $self, $1 );
+ goto &{$self->can('call')};
};
}
@@ -163,6 +173,9 @@
delete $INC{"$self->{file}"};
delete $INC{"$self->{path}.pm"};
+ # Save to the singleton
+ $MAIN = $self;
+
return 1;
}
@@ -176,8 +189,7 @@
my @exts = @{$self->{extensions}};
unless ( @exts ) {
- my $admin = $self->{admin};
- @exts = $admin->load_all_extensions;
+ @exts = $self->{admin}->load_all_extensions;
}
my %seen;
@@ -260,7 +272,7 @@
sub load_extensions {
my ($self, $path, $top) = @_;
- unless ( grep { !ref $_ and lc $_ eq lc $self->{prefix} } @INC ) {
+ unless ( grep { ! ref $_ and lc $_ eq lc $self->{prefix} } @INC ) {
unshift @INC, $self->{prefix};
}
@@ -341,7 +353,7 @@
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]): $!";
@@ -372,7 +384,7 @@
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]): $!";
Modified: trunk/libenv-sanctify-perl/inc/Module/Install/Base.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libenv-sanctify-perl/inc/Module/Install/Base.pm?rev=35808&op=diff
==============================================================================
--- trunk/libenv-sanctify-perl/inc/Module/Install/Base.pm (original)
+++ trunk/libenv-sanctify-perl/inc/Module/Install/Base.pm Tue May 19 05:18:56 2009
@@ -1,7 +1,11 @@
#line 1
package Module::Install::Base;
-$VERSION = '0.81';
+use strict 'vars';
+use vars qw{$VERSION};
+BEGIN {
+ $VERSION = '0.88';
+}
# Suspend handler for "redefined" warnings
BEGIN {
@@ -12,51 +16,61 @@
### This is the ONLY module that shouldn't have strict on
# use strict;
-#line 41
+#line 45
sub new {
- my ($class, %args) = @_;
+ my ($class, %args) = @_;
- foreach my $method ( qw(call load) ) {
- *{"$class\::$method"} = sub {
- shift()->_top->$method(@_);
- } unless defined &{"$class\::$method"};
- }
+ foreach my $method ( qw(call load) ) {
+ next if defined &{"$class\::$method"};
+ *{"$class\::$method"} = sub {
+ shift()->_top->$method(@_);
+ };
+ }
- bless( \%args, $class );
+ bless( \%args, $class );
}
-#line 61
+#line 66
sub AUTOLOAD {
- my $self = shift;
- local $@;
- my $autoload = eval { $self->_top->autoload } or return;
- goto &$autoload;
+ my $self = shift;
+ local $@;
+ my $autoload = eval {
+ $self->_top->autoload
+ } or return;
+ goto &$autoload;
}
-#line 76
+#line 83
-sub _top { $_[0]->{_top} }
+sub _top {
+ $_[0]->{_top};
+}
-#line 89
+#line 98
sub admin {
- $_[0]->_top->{admin} or Module::Install::Base::FakeAdmin->new;
+ $_[0]->_top->{admin}
+ or
+ Module::Install::Base::FakeAdmin->new;
}
-#line 101
+#line 114
sub is_admin {
- $_[0]->admin->VERSION;
+ $_[0]->admin->VERSION;
}
sub DESTROY {}
package Module::Install::Base::FakeAdmin;
-my $Fake;
-sub new { $Fake ||= bless(\@_, $_[0]) }
+my $fake;
+
+sub new {
+ $fake ||= bless(\@_, $_[0]);
+}
sub AUTOLOAD {}
@@ -69,4 +83,4 @@
1;
-#line 146
+#line 162
Modified: trunk/libenv-sanctify-perl/inc/Module/Install/Can.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libenv-sanctify-perl/inc/Module/Install/Can.pm?rev=35808&op=diff
==============================================================================
--- trunk/libenv-sanctify-perl/inc/Module/Install/Can.pm (original)
+++ trunk/libenv-sanctify-perl/inc/Module/Install/Can.pm Tue May 19 05:18:56 2009
@@ -9,7 +9,7 @@
use vars qw{$VERSION $ISCORE @ISA};
BEGIN {
- $VERSION = '0.81';
+ $VERSION = '0.88';
$ISCORE = 1;
@ISA = qw{Module::Install::Base};
}
Modified: trunk/libenv-sanctify-perl/inc/Module/Install/Fetch.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libenv-sanctify-perl/inc/Module/Install/Fetch.pm?rev=35808&op=diff
==============================================================================
--- trunk/libenv-sanctify-perl/inc/Module/Install/Fetch.pm (original)
+++ trunk/libenv-sanctify-perl/inc/Module/Install/Fetch.pm Tue May 19 05:18:56 2009
@@ -6,7 +6,7 @@
use vars qw{$VERSION $ISCORE @ISA};
BEGIN {
- $VERSION = '0.81';
+ $VERSION = '0.88';
$ISCORE = 1;
@ISA = qw{Module::Install::Base};
}
Modified: trunk/libenv-sanctify-perl/inc/Module/Install/Makefile.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libenv-sanctify-perl/inc/Module/Install/Makefile.pm?rev=35808&op=diff
==============================================================================
--- trunk/libenv-sanctify-perl/inc/Module/Install/Makefile.pm (original)
+++ trunk/libenv-sanctify-perl/inc/Module/Install/Makefile.pm Tue May 19 05:18:56 2009
@@ -7,7 +7,7 @@
use vars qw{$VERSION $ISCORE @ISA};
BEGIN {
- $VERSION = '0.81';
+ $VERSION = '0.88';
$ISCORE = 1;
@ISA = qw{Module::Install::Base};
}
@@ -114,17 +114,32 @@
my $self = shift;
die "&Makefile->write() takes no arguments\n" if @_;
- # Make sure we have a new enough
+ # Check the current Perl version
+ my $perl_version = $self->perl_version;
+ if ( $perl_version ) {
+ eval "use $perl_version; 1"
+ or die "ERROR: perl: Version $] is installed, "
+ . "but we need version >= $perl_version";
+ }
+
+ # Make sure we have a new enough MakeMaker
require ExtUtils::MakeMaker;
- # MakeMaker can complain about module versions that include
- # 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->configure_requires( 'ExtUtils::MakeMaker' => $ExtUtils::MakeMaker::VERSION =~ /^(\d+\.\d+)/ );
-
- # Generate the
+ if ( $perl_version and $self->_cmp($perl_version, '5.006') >= 0 ) {
+ # MakeMaker can complain about module versions that include
+ # 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+)/ );
+ } 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 );
+ }
+
+ # Generate the MakeMaker params
my $args = $self->makemaker_args;
$args->{DISTNAME} = $self->name;
$args->{NAME} = $self->module_name || $self->name;
@@ -133,7 +148,7 @@
if ( $self->tests ) {
$args->{test} = { TESTS => $self->tests };
}
- if ($] >= 5.005) {
+ if ( $] >= 5.005 ) {
$args->{ABSTRACT} = $self->abstract;
$args->{AUTHOR} = $self->author;
}
@@ -147,7 +162,7 @@
delete $args->{SIGN};
}
- # merge both kinds of requires into prereq_pm
+ # Merge both kinds of requires into prereq_pm
my $prereq = ($args->{PREREQ_PM} ||= {});
%$prereq = ( %$prereq,
map { @$_ }
@@ -250,4 +265,4 @@
__END__
-#line 379
+#line 394
Modified: trunk/libenv-sanctify-perl/inc/Module/Install/Metadata.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libenv-sanctify-perl/inc/Module/Install/Metadata.pm?rev=35808&op=diff
==============================================================================
--- trunk/libenv-sanctify-perl/inc/Module/Install/Metadata.pm (original)
+++ trunk/libenv-sanctify-perl/inc/Module/Install/Metadata.pm Tue May 19 05:18:56 2009
@@ -6,7 +6,7 @@
use vars qw{$VERSION @ISA $ISCORE};
BEGIN {
- $VERSION = '0.81';
+ $VERSION = '0.88';
@ISA = qw{Module::Install::Base};
$ISCORE = 1;
}
@@ -511,7 +511,7 @@
# Also, convert double-part versions (eg, 5.8)
sub _perl_version {
my $v = $_[-1];
- $v =~ s/^([1-9])\.([1-9]\d?\d?)$/sprintf("%d.%03d",$1,$2)/e;
+ $v =~ s/^([1-9])\.([1-9]\d?\d?)$/sprintf("%d.%03d",$1,$2)/e;
$v =~ s/^([1-9])\.([1-9]\d?\d?)\.(0|[1-9]\d?\d?)$/sprintf("%d.%03d%03d",$1,$2,$3 || 0)/e;
$v =~ s/(\.\d\d\d)000$/$1/;
$v =~ s/_.+$//;
@@ -534,7 +534,7 @@
sub write_mymeta {
my $self = shift;
-
+
# If there's no existing META.yml there is nothing we can do
return unless -f 'META.yml';
@@ -574,7 +574,7 @@
# Save as the MYMETA.yml file
print "Writing MYMETA.yml\n";
- YAML::Tiny::DumpFile('MYMETA.yml', $meta);
+ YAML::Tiny::DumpFile('MYMETA.yml', $meta);
}
1;
Modified: trunk/libenv-sanctify-perl/inc/Module/Install/Win32.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libenv-sanctify-perl/inc/Module/Install/Win32.pm?rev=35808&op=diff
==============================================================================
--- trunk/libenv-sanctify-perl/inc/Module/Install/Win32.pm (original)
+++ trunk/libenv-sanctify-perl/inc/Module/Install/Win32.pm Tue May 19 05:18:56 2009
@@ -6,7 +6,7 @@
use vars qw{$VERSION @ISA $ISCORE};
BEGIN {
- $VERSION = '0.81';
+ $VERSION = '0.88';
@ISA = qw{Module::Install::Base};
$ISCORE = 1;
}
Modified: trunk/libenv-sanctify-perl/inc/Module/Install/WriteAll.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libenv-sanctify-perl/inc/Module/Install/WriteAll.pm?rev=35808&op=diff
==============================================================================
--- trunk/libenv-sanctify-perl/inc/Module/Install/WriteAll.pm (original)
+++ trunk/libenv-sanctify-perl/inc/Module/Install/WriteAll.pm Tue May 19 05:18:56 2009
@@ -6,7 +6,7 @@
use vars qw{$VERSION @ISA $ISCORE};
BEGIN {
- $VERSION = '0.81';
+ $VERSION = '0.88';
@ISA = qw{Module::Install::Base};
$ISCORE = 1;
}
Modified: trunk/libenv-sanctify-perl/lib/Env/Sanctify.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libenv-sanctify-perl/lib/Env/Sanctify.pm?rev=35808&op=diff
==============================================================================
--- trunk/libenv-sanctify-perl/lib/Env/Sanctify.pm (original)
+++ trunk/libenv-sanctify-perl/lib/Env/Sanctify.pm Tue May 19 05:18:56 2009
@@ -4,7 +4,7 @@
use warnings;
use vars qw($VERSION);
-$VERSION = '1.02';
+$VERSION = '1.04';
sub sanctify {
my $package = shift;
More information about the Pkg-perl-cvs-commits
mailing list