r31167 - in /branches/upstream/libpar-perl/current: ./ inc/Module/ inc/Module/Install/ lib/
antonio-guest at users.alioth.debian.org
antonio-guest at users.alioth.debian.org
Fri Feb 27 23:25:01 UTC 2009
Author: antonio-guest
Date: Fri Feb 27 23:24:58 2009
New Revision: 31167
URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=31167
Log:
[svn-upgrade] Integrating new upstream version, libpar-perl (0.986)
Modified:
branches/upstream/libpar-perl/current/ChangeLog
branches/upstream/libpar-perl/current/META.yml
branches/upstream/libpar-perl/current/Makefile.PL
branches/upstream/libpar-perl/current/inc/Module/Install.pm
branches/upstream/libpar-perl/current/inc/Module/Install/Base.pm
branches/upstream/libpar-perl/current/inc/Module/Install/Can.pm
branches/upstream/libpar-perl/current/inc/Module/Install/Fetch.pm
branches/upstream/libpar-perl/current/inc/Module/Install/Include.pm
branches/upstream/libpar-perl/current/inc/Module/Install/Makefile.pm
branches/upstream/libpar-perl/current/inc/Module/Install/Metadata.pm
branches/upstream/libpar-perl/current/inc/Module/Install/Win32.pm
branches/upstream/libpar-perl/current/inc/Module/Install/WriteAll.pm
branches/upstream/libpar-perl/current/lib/PAR.pm
Modified: branches/upstream/libpar-perl/current/ChangeLog
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libpar-perl/current/ChangeLog?rev=31167&op=diff
==============================================================================
--- branches/upstream/libpar-perl/current/ChangeLog (original)
+++ branches/upstream/libpar-perl/current/ChangeLog Fri Feb 27 23:24:58 2009
@@ -1,3 +1,16 @@
+
+[Changes for 0.986 - Feb 19, 2009]
+ - Promote to stable release.
+
+[Changes for 0.985_01 - Feb 2, 2009]
+* New features
+ - Support for the brand new static dependency resolution
+ of PAR::Repository::Client 0.23.
+
+* Bug fixes, etc.
+ - Fix issue with running scripts from repositories:
+ The INC hooks used to be set up too late for this to
+ automatically pick up dependencies.
[Changes for 0.984 - Jan 25, 2009]
* New features
Modified: branches/upstream/libpar-perl/current/META.yml
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libpar-perl/current/META.yml?rev=31167&op=diff
==============================================================================
--- branches/upstream/libpar-perl/current/META.yml (original)
+++ branches/upstream/libpar-perl/current/META.yml Fri Feb 27 23:24:58 2009
@@ -3,7 +3,7 @@
author:
- 'Audrey Tang <cpan at audreyt.org>'
distribution_type: module
-generated_by: 'Module::Install version 0.77'
+generated_by: 'Module::Install version 0.78'
license: perl
meta-spec:
url: http://module-build.sourceforge.net/META-spec-v1.4.html
@@ -11,9 +11,19 @@
name: PAR
no_index:
directory:
- - contrib
- inc
- t
+provides:
+ PAR:
+ file: lib/PAR.pm
+ version: 0.986
+ PAR::Heavy:
+ file: lib/PAR/Heavy.pm
+ version: 0.11
+ PAR::SetupProgname:
+ file: lib/PAR/SetupProgname.pm
+ PAR::SetupTemp:
+ file: lib/PAR/SetupTemp.pm
recommends:
Digest: Module::Signature
requires:
@@ -25,4 +35,4 @@
perl: 5.6.0
resources:
license: http://dev.perl.org/licenses/
-version: 0.984
+version: 0.986
Modified: branches/upstream/libpar-perl/current/Makefile.PL
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libpar-perl/current/Makefile.PL?rev=31167&op=diff
==============================================================================
--- branches/upstream/libpar-perl/current/Makefile.PL (original)
+++ branches/upstream/libpar-perl/current/Makefile.PL Fri Feb 27 23:24:58 2009
@@ -1,5 +1,6 @@
use strict;
+use 5.006;
use inc::Module::Install;
name 'PAR';
Modified: branches/upstream/libpar-perl/current/inc/Module/Install.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libpar-perl/current/inc/Module/Install.pm?rev=31167&op=diff
==============================================================================
--- branches/upstream/libpar-perl/current/inc/Module/Install.pm (original)
+++ branches/upstream/libpar-perl/current/inc/Module/Install.pm Fri Feb 27 23:24:58 2009
@@ -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.77';
+ $VERSION = '0.78';
*inc::Module::Install::VERSION = *VERSION;
@inc::Module::Install::ISA = __PACKAGE__;
@@ -250,7 +250,7 @@
sub load_extensions {
my ($self, $path, $top) = @_;
- unless ( grep { lc $_ eq lc $self->{prefix} } @INC ) {
+ unless ( grep { !ref $_ and lc $_ eq lc $self->{prefix} } @INC ) {
unshift @INC, $self->{prefix};
}
@@ -366,4 +366,4 @@
1;
-# Copyright 2008 Adam Kennedy.
+# Copyright 2008 - 2009 Adam Kennedy.
Modified: branches/upstream/libpar-perl/current/inc/Module/Install/Base.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libpar-perl/current/inc/Module/Install/Base.pm?rev=31167&op=diff
==============================================================================
--- branches/upstream/libpar-perl/current/inc/Module/Install/Base.pm (original)
+++ branches/upstream/libpar-perl/current/inc/Module/Install/Base.pm Fri Feb 27 23:24:58 2009
@@ -1,7 +1,7 @@
#line 1
package Module::Install::Base;
-$VERSION = '0.77';
+$VERSION = '0.78';
# Suspend handler for "redefined" warnings
BEGIN {
Modified: branches/upstream/libpar-perl/current/inc/Module/Install/Can.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libpar-perl/current/inc/Module/Install/Can.pm?rev=31167&op=diff
==============================================================================
--- branches/upstream/libpar-perl/current/inc/Module/Install/Can.pm (original)
+++ branches/upstream/libpar-perl/current/inc/Module/Install/Can.pm Fri Feb 27 23:24:58 2009
@@ -11,7 +11,7 @@
use vars qw{$VERSION $ISCORE @ISA};
BEGIN {
- $VERSION = '0.77';
+ $VERSION = '0.78';
$ISCORE = 1;
@ISA = qw{Module::Install::Base};
}
Modified: branches/upstream/libpar-perl/current/inc/Module/Install/Fetch.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libpar-perl/current/inc/Module/Install/Fetch.pm?rev=31167&op=diff
==============================================================================
--- branches/upstream/libpar-perl/current/inc/Module/Install/Fetch.pm (original)
+++ branches/upstream/libpar-perl/current/inc/Module/Install/Fetch.pm Fri Feb 27 23:24:58 2009
@@ -6,20 +6,20 @@
use vars qw{$VERSION $ISCORE @ISA};
BEGIN {
- $VERSION = '0.77';
+ $VERSION = '0.78';
$ISCORE = 1;
@ISA = qw{Module::Install::Base};
}
sub get_file {
my ($self, %args) = @_;
- my ($scheme, $host, $path, $file) =
+ my ($scheme, $host, $path, $file) =
$args{url} =~ m|^(\w+)://([^/]+)(.+)/(.+)| or return;
if ( $scheme eq 'http' and ! eval { require LWP::Simple; 1 } ) {
$args{url} = $args{ftp_url}
or (warn("LWP support unavailable!\n"), return);
- ($scheme, $host, $path, $file) =
+ ($scheme, $host, $path, $file) =
$args{url} =~ m|^(\w+)://([^/]+)(.+)/(.+)| or return;
}
Modified: branches/upstream/libpar-perl/current/inc/Module/Install/Include.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libpar-perl/current/inc/Module/Install/Include.pm?rev=31167&op=diff
==============================================================================
--- branches/upstream/libpar-perl/current/inc/Module/Install/Include.pm (original)
+++ branches/upstream/libpar-perl/current/inc/Module/Install/Include.pm Fri Feb 27 23:24:58 2009
@@ -6,7 +6,7 @@
use vars qw{$VERSION $ISCORE @ISA};
BEGIN {
- $VERSION = '0.77';
+ $VERSION = '0.78';
$ISCORE = 1;
@ISA = qw{Module::Install::Base};
}
Modified: branches/upstream/libpar-perl/current/inc/Module/Install/Makefile.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libpar-perl/current/inc/Module/Install/Makefile.pm?rev=31167&op=diff
==============================================================================
--- branches/upstream/libpar-perl/current/inc/Module/Install/Makefile.pm (original)
+++ branches/upstream/libpar-perl/current/inc/Module/Install/Makefile.pm Fri Feb 27 23:24:58 2009
@@ -7,7 +7,7 @@
use vars qw{$VERSION $ISCORE @ISA};
BEGIN {
- $VERSION = '0.77';
+ $VERSION = '0.78';
$ISCORE = 1;
@ISA = qw{Module::Install::Base};
}
@@ -64,7 +64,7 @@
my $self = shift;
my $clean = $self->makemaker_args->{clean} ||= {};
%$clean = (
- %$clean,
+ %$clean,
FILES => join ' ', grep { length $_ } ($clean->{FILES} || (), @_),
);
}
@@ -73,7 +73,7 @@
my $self = shift;
my $realclean = $self->makemaker_args->{realclean} ||= {};
%$realclean = (
- %$realclean,
+ %$realclean,
FILES => join ' ', grep { length $_ } ($realclean->{FILES} || (), @_),
);
}
@@ -124,7 +124,7 @@
$self->configure_requires( 'ExtUtils::MakeMaker' => $ExtUtils::MakeMaker::VERSION =~ /^(\d+\.\d+)/ );
- # Generate the
+ # Generate the
my $args = $self->makemaker_args;
$args->{DISTNAME} = $self->name;
$args->{NAME} = $self->module_name || $self->name;
@@ -196,7 +196,7 @@
my $top_class = ref($self->_top) || '';
my $top_version = $self->_top->VERSION || '';
- my $preamble = $self->preamble
+ my $preamble = $self->preamble
? "# Preamble by $top_class $top_version\n"
. $self->preamble
: '';
Modified: branches/upstream/libpar-perl/current/inc/Module/Install/Metadata.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libpar-perl/current/inc/Module/Install/Metadata.pm?rev=31167&op=diff
==============================================================================
--- branches/upstream/libpar-perl/current/inc/Module/Install/Metadata.pm (original)
+++ branches/upstream/libpar-perl/current/inc/Module/Install/Metadata.pm Fri Feb 27 23:24:58 2009
@@ -6,7 +6,7 @@
use vars qw{$VERSION $ISCORE @ISA};
BEGIN {
- $VERSION = '0.77';
+ $VERSION = '0.78';
$ISCORE = 1;
@ISA = qw{Module::Install::Base};
}
@@ -178,8 +178,9 @@
# Convert triple-part versions (eg, 5.6.1 or 5.8.9) to
# numbers (eg, 5.006001 or 5.008009).
-
- $version =~ s/^(\d+)\.(\d+)\.(\d+)$/sprintf("%d.%03d%03d",$1,$2,$3)/e;
+ # Also, convert double-part versions (eg, 5.8)
+
+ $version =~ s/^(\d+)\.(\d+)(?:\.(\d+))?$/sprintf("%d.%03d%03d",$1,$2,$3 || 0)/e;
$version =~ s/_.+$//;
$version = $version + 0; # Numify
@@ -451,9 +452,6 @@
while ( my ($pattern, $license, $osi) = splice(@phrases, 0, 3) ) {
$pattern =~ s{\s+}{\\s+}g;
if ( $license_text =~ /\b$pattern\b/i ) {
- if ( $osi and $license_text =~ /All rights reserved/i ) {
- print "WARNING: 'All rights reserved' in copyright may invalidate Open Source license.\n";
- }
$self->license($license);
return 1;
}
@@ -482,19 +480,4 @@
return 1;
}
-sub install_script {
- my $self = shift;
- my $args = $self->makemaker_args;
- my $exe = $args->{EXE_FILES} ||= [];
- foreach ( @_ ) {
- if ( -f $_ ) {
- push @$exe, $_;
- } elsif ( -d 'script' and -f "script/$_" ) {
- push @$exe, "script/$_";
- } else {
- die("Cannot find script '$_'");
- }
- }
-}
-
1;
Modified: branches/upstream/libpar-perl/current/inc/Module/Install/Win32.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libpar-perl/current/inc/Module/Install/Win32.pm?rev=31167&op=diff
==============================================================================
--- branches/upstream/libpar-perl/current/inc/Module/Install/Win32.pm (original)
+++ branches/upstream/libpar-perl/current/inc/Module/Install/Win32.pm Fri Feb 27 23:24:58 2009
@@ -6,7 +6,7 @@
use vars qw{$VERSION @ISA $ISCORE};
BEGIN {
- $VERSION = '0.77';
+ $VERSION = '0.78';
@ISA = qw{Module::Install::Base};
$ISCORE = 1;
}
Modified: branches/upstream/libpar-perl/current/inc/Module/Install/WriteAll.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libpar-perl/current/inc/Module/Install/WriteAll.pm?rev=31167&op=diff
==============================================================================
--- branches/upstream/libpar-perl/current/inc/Module/Install/WriteAll.pm (original)
+++ branches/upstream/libpar-perl/current/inc/Module/Install/WriteAll.pm Fri Feb 27 23:24:58 2009
@@ -6,7 +6,7 @@
use vars qw{$VERSION @ISA $ISCORE};
BEGIN {
- $VERSION = '0.77';
+ $VERSION = '0.78';
@ISA = qw{Module::Install::Base};
$ISCORE = 1;
}
Modified: branches/upstream/libpar-perl/current/lib/PAR.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libpar-perl/current/lib/PAR.pm?rev=31167&op=diff
==============================================================================
--- branches/upstream/libpar-perl/current/lib/PAR.pm (original)
+++ branches/upstream/libpar-perl/current/lib/PAR.pm Fri Feb 27 23:24:58 2009
@@ -1,5 +1,5 @@
package PAR;
-$PAR::VERSION = '0.984';
+$PAR::VERSION = '0.986';
use 5.006;
use strict;
@@ -35,7 +35,7 @@
=head1 VERSION
-This document describes release 0.984 of PAR, released January 25, 2008.
+This document describes release 0.986 of PAR, released February 19, 2008.
=head1 SYNOPSIS
@@ -138,6 +138,9 @@
Furthermore, there is an C<upgrade =E<gt> 1> option that checks for upgrades
in the repository in addition to installing. Please note that an upgraded
version of a module is only loaded on the next run of your application.
+
+Adding the C<dependencies =E<gt> 1> option will enable PAR::Repository::Client's
+static dependency resolution (PAR::Repository::Client 0.23 and up).
Finally, you can combine the C<run> and C<repository>
options to run an application directly from a repository! (And you can add
@@ -339,6 +342,10 @@
my @args = @_;
+ # Insert PAR hook in @INC.
+ unshift @INC, \&find_par unless grep { $_ eq \&find_par } @INC;
+ push @INC, \&find_par_last unless grep { $_ eq \&find_par_last } @INC;
+
# process args to use PAR 'foo.par', { opts }, ...;
foreach my $par (@args) {
if (ref($par) eq 'HASH') {
@@ -360,10 +367,6 @@
return if $PAR::__import;
local $PAR::__import = 1;
-
- # Insert PAR hook in @INC.
- unshift @INC, \&find_par unless grep { $_ eq \&find_par } @INC;
- push @INC, \&find_par_last unless grep { $_ eq \&find_par_last } @INC;
require PAR::Heavy;
PAR::Heavy::_init_dynaloader();
@@ -516,6 +519,10 @@
croak "In order to use the 'upgrade' option, you need to install the PAR::Repository::Client module (version 0.22 or later) from CPAN";
}
+ if ($opt->{dependencies} and not eval PAR::Repository::Client->VERSION >= 0.23) {
+ croak "In order to use the 'dependencies' option, you need to install the PAR::Repository::Client module (version 0.23 or later) from CPAN";
+ }
+
my $obj;
# Support existing clients passed in as objects.
@@ -524,9 +531,10 @@
}
else {
$obj = PAR::Repository::Client->new(
- uri => $url,
- auto_install => $opt->{install},
- auto_upgrade => $opt->{upgrade},
+ uri => $url,
+ auto_install => $opt->{install},
+ auto_upgrade => $opt->{upgrade},
+ static_dependencies => $opt->{dependencies},
);
}
More information about the Pkg-perl-cvs-commits
mailing list