r31336 - in /trunk/libb-hooks-endofscope-perl: ./ debian/ inc/Module/ inc/Module/Install/ lib/B/Hooks/ t/
antonio-guest at users.alioth.debian.org
antonio-guest at users.alioth.debian.org
Tue Mar 3 21:32:17 UTC 2009
Author: antonio-guest
Date: Tue Mar 3 21:32:14 2009
New Revision: 31336
URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=31336
Log:
NEEDS Variable::Magic (ITP: #518057)
* New upstream release
* debian/control:
+ adding me to the Uploaders
* debian/copyright:
+ fixed some missing commas and chars
Modified:
trunk/libb-hooks-endofscope-perl/Changes
trunk/libb-hooks-endofscope-perl/META.yml
trunk/libb-hooks-endofscope-perl/Makefile.PL
trunk/libb-hooks-endofscope-perl/debian/changelog
trunk/libb-hooks-endofscope-perl/debian/control
trunk/libb-hooks-endofscope-perl/debian/copyright
trunk/libb-hooks-endofscope-perl/inc/Module/Install.pm
trunk/libb-hooks-endofscope-perl/inc/Module/Install/Base.pm
trunk/libb-hooks-endofscope-perl/inc/Module/Install/Can.pm
trunk/libb-hooks-endofscope-perl/inc/Module/Install/Fetch.pm
trunk/libb-hooks-endofscope-perl/inc/Module/Install/Makefile.pm
trunk/libb-hooks-endofscope-perl/inc/Module/Install/Metadata.pm
trunk/libb-hooks-endofscope-perl/inc/Module/Install/Win32.pm
trunk/libb-hooks-endofscope-perl/inc/Module/Install/WriteAll.pm
trunk/libb-hooks-endofscope-perl/lib/B/Hooks/EndOfScope.pm
trunk/libb-hooks-endofscope-perl/t/exception.t
Modified: trunk/libb-hooks-endofscope-perl/Changes
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libb-hooks-endofscope-perl/Changes?rev=31336&op=diff
==============================================================================
--- trunk/libb-hooks-endofscope-perl/Changes (original)
+++ trunk/libb-hooks-endofscope-perl/Changes Tue Mar 3 21:32:14 2009
@@ -1,6 +1,10 @@
+0.07 Fri, 20 Feb 2009 14:22:16 +0100
+ * Depend on Variable::Magic 0.31 so exceptions thrown in on_scope_end
+ blocks don't lose their error message.
+
0.06 Mon, 19 Jan 2009 00:51:45 +0100
- * Depend on Variable::Magic 0.27 to stop exceptions thrown in on_scope_end
- blocks from segfaulting. Also add a test for that.
+ * Depend on Variable::Magic 0.27 to stop exceptions thrown in
+ on_scope_end blocks from segfaulting. Also add a test for that.
0.05 Sun, 04 Jan 2009 20:46:07 +0100
* Use Variable::Magic and cast %^H instead Scope::Guard and relying
Modified: trunk/libb-hooks-endofscope-perl/META.yml
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libb-hooks-endofscope-perl/META.yml?rev=31336&op=diff
==============================================================================
--- trunk/libb-hooks-endofscope-perl/META.yml (original)
+++ trunk/libb-hooks-endofscope-perl/META.yml Tue Mar 3 21:32:14 2009
@@ -5,7 +5,7 @@
build_requires:
Test::More: 0
distribution_type: module
-generated_by: 'Module::Install version 0.77'
+generated_by: 'Module::Install version 0.79'
license: perl
meta-spec:
url: http://module-build.sourceforge.net/META-spec-v1.4.html
@@ -17,8 +17,8 @@
- t
requires:
Sub::Exporter: 0
- Variable::Magic: 0.27
+ Variable::Magic: 0.31
perl: 5.8.0
resources:
license: http://dev.perl.org/licenses/
-version: 0.06
+version: 0.07
Modified: trunk/libb-hooks-endofscope-perl/Makefile.PL
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libb-hooks-endofscope-perl/Makefile.PL?rev=31336&op=diff
==============================================================================
--- trunk/libb-hooks-endofscope-perl/Makefile.PL (original)
+++ trunk/libb-hooks-endofscope-perl/Makefile.PL Tue Mar 3 21:32:14 2009
@@ -5,7 +5,7 @@
name 'B-Hooks-EndOfScope';
all_from 'lib/B/Hooks/EndOfScope.pm';
-requires 'Variable::Magic' => '0.27';
+requires 'Variable::Magic' => '0.31';
requires 'Sub::Exporter';
test_requires 'Test::More';
Modified: trunk/libb-hooks-endofscope-perl/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libb-hooks-endofscope-perl/debian/changelog?rev=31336&op=diff
==============================================================================
--- trunk/libb-hooks-endofscope-perl/debian/changelog (original)
+++ trunk/libb-hooks-endofscope-perl/debian/changelog Tue Mar 3 21:32:14 2009
@@ -1,17 +1,20 @@
-libb-hooks-endofscope-perl (0.06-1) UNRELEASED; urgency=low
-
- NEEDS Variable::Magic
+libb-hooks-endofscope-perl (0.07-1) UNRELEASED; urgency=low
+
+ NEEDS Variable::Magic (ITP: #518057)
+
+ [ Antonio Radici ]
+ * New upstream release
+ * debian/control:
+ + adding me to the Uploaders
+ * debian/copyright:
+ + fixed some missing commas and chars
[ gregor herrmann ]
- * New upstream release.
* debian/control: Changed: Switched Vcs-Browser field to ViewSVN
(source stanza).
* debian/control: replace libscope-guard-perl with libvariable-magic-perl.
- [ Rene Mayorga ]
- * New upstream release
-
- -- Rene Mayorga <rmayorga at debian.org.sv> Tue, 20 Jan 2009 17:21:54 -0600
+ -- Antonio Radici <antonio at dyne.org> Tue, 03 Mar 2009 21:06:54 +0000
libb-hooks-endofscope-perl (0.04-1) unstable; urgency=low
Modified: trunk/libb-hooks-endofscope-perl/debian/control
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libb-hooks-endofscope-perl/debian/control?rev=31336&op=diff
==============================================================================
--- trunk/libb-hooks-endofscope-perl/debian/control (original)
+++ trunk/libb-hooks-endofscope-perl/debian/control Tue Mar 3 21:32:14 2009
@@ -4,7 +4,8 @@
Build-Depends: debhelper (>= 7)
Build-Depends-Indep: perl (>= 5.8.0), libvariable-magic-perl, libsub-exporter-perl
Maintainer: Debian Perl Group <pkg-perl-maintainers at lists.alioth.debian.org>
-Uploaders: Jose Luis Rivas <ghostbar38 at gmail.com>
+Uploaders: Jose Luis Rivas <ghostbar38 at gmail.com>,
+ Antonio Radici <antonio at dyne.org>
Standards-Version: 3.8.0
Homepage: http://search.cpan.org/dist/B-Hooks-EndOfScope/
Vcs-Svn: svn://svn.debian.org/pkg-perl/trunk/libb-hooks-endofscope-perl/
Modified: trunk/libb-hooks-endofscope-perl/debian/copyright
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libb-hooks-endofscope-perl/debian/copyright?rev=31336&op=diff
==============================================================================
--- trunk/libb-hooks-endofscope-perl/debian/copyright (original)
+++ trunk/libb-hooks-endofscope-perl/debian/copyright Tue Mar 3 21:32:14 2009
@@ -8,15 +8,17 @@
Original-Source-Depends: devscripts
Files: *
-Copyright © 2008 by Florian Ragwitz
+Copyright: © 2008, Florian Ragwitz
License: GPL-1+ | Artistic
Files: inc/*
-Copyright: Copyright 2002 - 2008 by Brian Ingerson, Audrey Tang and Adam Kennedy
+Copyright: © 2002-2008, Brian Ingerson, Audrey Tang and Adam Kennedy
License: GPL-1+ | Artistic
Files: debian/*
-Copyright: © 2008 Jose Luis Rivas <ghostbar38 at gmail.com>
+Copyright: © 2008, Jose Luis Rivas <ghostbar38 at gmail.com>
+ © 2009, gregor herrmann <gregoa at debian.org>
+ © 2009, Antonio Radici <antonio at dyne.org>
License: GPL-1+ | Artistic
License: Artistic
@@ -32,4 +34,3 @@
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/libb-hooks-endofscope-perl/inc/Module/Install.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libb-hooks-endofscope-perl/inc/Module/Install.pm?rev=31336&op=diff
==============================================================================
--- trunk/libb-hooks-endofscope-perl/inc/Module/Install.pm (original)
+++ trunk/libb-hooks-endofscope-perl/inc/Module/Install.pm Tue Mar 3 21:32:14 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.79';
*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: trunk/libb-hooks-endofscope-perl/inc/Module/Install/Base.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libb-hooks-endofscope-perl/inc/Module/Install/Base.pm?rev=31336&op=diff
==============================================================================
--- trunk/libb-hooks-endofscope-perl/inc/Module/Install/Base.pm (original)
+++ trunk/libb-hooks-endofscope-perl/inc/Module/Install/Base.pm Tue Mar 3 21:32:14 2009
@@ -1,7 +1,7 @@
#line 1
package Module::Install::Base;
-$VERSION = '0.77';
+$VERSION = '0.79';
# Suspend handler for "redefined" warnings
BEGIN {
Modified: trunk/libb-hooks-endofscope-perl/inc/Module/Install/Can.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libb-hooks-endofscope-perl/inc/Module/Install/Can.pm?rev=31336&op=diff
==============================================================================
--- trunk/libb-hooks-endofscope-perl/inc/Module/Install/Can.pm (original)
+++ trunk/libb-hooks-endofscope-perl/inc/Module/Install/Can.pm Tue Mar 3 21:32:14 2009
@@ -11,7 +11,7 @@
use vars qw{$VERSION $ISCORE @ISA};
BEGIN {
- $VERSION = '0.77';
+ $VERSION = '0.79';
$ISCORE = 1;
@ISA = qw{Module::Install::Base};
}
Modified: trunk/libb-hooks-endofscope-perl/inc/Module/Install/Fetch.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libb-hooks-endofscope-perl/inc/Module/Install/Fetch.pm?rev=31336&op=diff
==============================================================================
--- trunk/libb-hooks-endofscope-perl/inc/Module/Install/Fetch.pm (original)
+++ trunk/libb-hooks-endofscope-perl/inc/Module/Install/Fetch.pm Tue Mar 3 21:32:14 2009
@@ -6,20 +6,20 @@
use vars qw{$VERSION $ISCORE @ISA};
BEGIN {
- $VERSION = '0.77';
+ $VERSION = '0.79';
$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: trunk/libb-hooks-endofscope-perl/inc/Module/Install/Makefile.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libb-hooks-endofscope-perl/inc/Module/Install/Makefile.pm?rev=31336&op=diff
==============================================================================
--- trunk/libb-hooks-endofscope-perl/inc/Module/Install/Makefile.pm (original)
+++ trunk/libb-hooks-endofscope-perl/inc/Module/Install/Makefile.pm Tue Mar 3 21:32:14 2009
@@ -7,7 +7,7 @@
use vars qw{$VERSION $ISCORE @ISA};
BEGIN {
- $VERSION = '0.77';
+ $VERSION = '0.79';
$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: trunk/libb-hooks-endofscope-perl/inc/Module/Install/Metadata.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libb-hooks-endofscope-perl/inc/Module/Install/Metadata.pm?rev=31336&op=diff
==============================================================================
--- trunk/libb-hooks-endofscope-perl/inc/Module/Install/Metadata.pm (original)
+++ trunk/libb-hooks-endofscope-perl/inc/Module/Install/Metadata.pm Tue Mar 3 21:32:14 2009
@@ -6,7 +6,7 @@
use vars qw{$VERSION $ISCORE @ISA};
BEGIN {
- $VERSION = '0.77';
+ $VERSION = '0.79';
$ISCORE = 1;
@ISA = qw{Module::Install::Base};
}
@@ -176,18 +176,15 @@
"Did not provide a value to perl_version()"
);
- # 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;
-
- $version =~ s/_.+$//;
- $version = $version + 0; # Numify
+ # Normalize the version
+ $version = $self->_perl_version($version);
+
+ # We don't support the reall old versions
unless ( $version >= 5.005 ) {
die "Module::Install only supports 5.005 or newer (use ExtUtils::MakeMaker)\n";
}
+
$self->{values}{perl_version} = $version;
- return 1;
}
sub license {
@@ -451,9 +448,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 +476,70 @@
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 '$_'");
- }
- }
+# Convert triple-part versions (eg, 5.6.1 or 5.8.9) to
+# numbers (eg, 5.006001 or 5.008009).
+# 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?)\.(0|[1-9]\d?\d?)$/sprintf("%d.%03d%03d",$1,$2,$3 || 0)/e;
+ $v =~ s/(\.\d\d\d)000$/$1/;
+ $v =~ s/_.+$//;
+ if ( ref($v) ) {
+ $v = $v + 0; # Numify
+ }
+ return $v;
+}
+
+
+
+
+
+######################################################################
+# MYMETA.yml Support
+
+sub WriteMyMeta {
+ $_[0]->write_mymeta;
+}
+
+sub write_mymeta {
+ my $self = shift;
+
+ # If there's no existing META.yml there is nothing we can do
+ return unless -f 'META.yml';
+
+ # Merge the perl version into the dependencies
+ my $val = $self->Meta->{values};
+ my $perl = delete $val->{perl_version};
+ if ( $perl ) {
+ $val->{requires} ||= [];
+ my $requires = $val->{requires};
+
+ # Canonize to three-dot version after Perl 5.6
+ if ( $perl >= 5.006 ) {
+ $perl =~ s{^(\d+)\.(\d\d\d)(\d*)}{join('.', $1, int($2||0), int($3||0))}e
+ }
+ unshift @$requires, [ perl => $perl ];
+ }
+
+ # Load the advisory META.yml file
+ require YAML::Tiny;
+ my @yaml = YAML::Tiny::LoadFile('META.yml');
+ my $meta = $yaml[0];
+
+ # Overwrite the non-configure dependency hashs
+ delete $meta->{requires};
+ delete $meta->{build_requires};
+ delete $meta->{recommends};
+ if ( exists $val->{requires} ) {
+ $meta->{requires} = { map { @$_ } @{ $val->{requires} } };
+ }
+ if ( exists $val->{build_requires} ) {
+ $meta->{build_requires} = { map { @$_ } @{ $val->{build_requires} } };
+ }
+
+ # Save as the MYMETA.yml file
+ YAML::Tiny::DumpFile('MYMETA.yml', $meta);
}
1;
Modified: trunk/libb-hooks-endofscope-perl/inc/Module/Install/Win32.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libb-hooks-endofscope-perl/inc/Module/Install/Win32.pm?rev=31336&op=diff
==============================================================================
--- trunk/libb-hooks-endofscope-perl/inc/Module/Install/Win32.pm (original)
+++ trunk/libb-hooks-endofscope-perl/inc/Module/Install/Win32.pm Tue Mar 3 21:32:14 2009
@@ -6,7 +6,7 @@
use vars qw{$VERSION @ISA $ISCORE};
BEGIN {
- $VERSION = '0.77';
+ $VERSION = '0.79';
@ISA = qw{Module::Install::Base};
$ISCORE = 1;
}
Modified: trunk/libb-hooks-endofscope-perl/inc/Module/Install/WriteAll.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libb-hooks-endofscope-perl/inc/Module/Install/WriteAll.pm?rev=31336&op=diff
==============================================================================
--- trunk/libb-hooks-endofscope-perl/inc/Module/Install/WriteAll.pm (original)
+++ trunk/libb-hooks-endofscope-perl/inc/Module/Install/WriteAll.pm Tue Mar 3 21:32:14 2009
@@ -6,7 +6,7 @@
use vars qw{$VERSION @ISA $ISCORE};
BEGIN {
- $VERSION = '0.77';
+ $VERSION = '0.79';
@ISA = qw{Module::Install::Base};
$ISCORE = 1;
}
Modified: trunk/libb-hooks-endofscope-perl/lib/B/Hooks/EndOfScope.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libb-hooks-endofscope-perl/lib/B/Hooks/EndOfScope.pm?rev=31336&op=diff
==============================================================================
--- trunk/libb-hooks-endofscope-perl/lib/B/Hooks/EndOfScope.pm (original)
+++ trunk/libb-hooks-endofscope-perl/lib/B/Hooks/EndOfScope.pm Tue Mar 3 21:32:14 2009
@@ -6,7 +6,7 @@
use 5.008000;
use Variable::Magic;
-our $VERSION = '0.06';
+our $VERSION = '0.07';
use Sub::Exporter -setup => {
exports => ['on_scope_end'],
Modified: trunk/libb-hooks-endofscope-perl/t/exception.t
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libb-hooks-endofscope-perl/t/exception.t?rev=31336&op=diff
==============================================================================
--- trunk/libb-hooks-endofscope-perl/t/exception.t (original)
+++ trunk/libb-hooks-endofscope-perl/t/exception.t Tue Mar 3 21:32:14 2009
@@ -12,10 +12,5 @@
}
];
-TODO: {
- local $TODO = 'exceptions in on_scope_end not working yet';
- # that's probably a Variable::Magic issue
- is($@, 'bar');
-}
-
+like($@, qr/^bar/);
pass('no segfault');
More information about the Pkg-perl-cvs-commits
mailing list