Author: jawnsy-guest
Date: Thu Feb 11 01:54:46 2010
New Revision: 52502
URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=52502
Log:
[svn-upgrade] Integrating new upstream version, libsub-wrappackages-perl (1.31)
Added:
branches/upstream/libsub-wrappackages-perl/current/t/09_5.10_use_constant.t
branches/upstream/libsub-wrappackages-perl/current/t/lib/breakuseconstant.pm
Modified:
branches/upstream/libsub-wrappackages-perl/current/MANIFEST
branches/upstream/libsub-wrappackages-perl/current/META.yml
branches/upstream/libsub-wrappackages-perl/current/lib/Sub/WrapPackages.pm
Modified: branches/upstream/libsub-wrappackages-perl/current/MANIFEST
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libsub-wrappackages-perl/current/MANIFEST?rev=52502&op=diff
==============================================================================
--- branches/upstream/libsub-wrappackages-perl/current/MANIFEST (original)
+++ branches/upstream/libsub-wrappackages-perl/current/MANIFEST Thu Feb 11 01:54:46 2010
@@ -25,3 +25,5 @@
t/lib/Module/With/END/Segment.pm
t/lib/Module/With/Both/Segments.pm
META.yml Module meta-data (added by MakeMaker)
+t/09_5.10_use_constant.t
+t/lib/breakuseconstant.pm
Modified: branches/upstream/libsub-wrappackages-perl/current/META.yml
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libsub-wrappackages-perl/current/META.yml?rev=52502&op=diff
==============================================================================
--- branches/upstream/libsub-wrappackages-perl/current/META.yml (original)
+++ branches/upstream/libsub-wrappackages-perl/current/META.yml Thu Feb 11 01:54:46 2010
@@ -1,19 +1,11 @@
---- #YAML:1.0
-name: Sub-WrapPackages
-version: 1.3
-abstract: ~
-author: []
-license: unknown
-distribution_type: module
-configure_requires:
- ExtUtils::MakeMaker: 0
+# http://module-build.sourceforge.net/META-spec.html
+#XXXXXXX This is a prototype!!! It will change in the future!!! XXXXX#
+name: Sub-WrapPackages
+version: 1.31
+version_from: lib/Sub/WrapPackages.pm
+installdirs: site
requires:
- Hook::LexWrap: 0.2
-no_index:
- directory:
- - t
- - inc
-generated_by: ExtUtils::MakeMaker version 6.48
-meta-spec:
- url: http://module-build.sourceforge.net/META-spec-v1.4.html
- version: 1.4
+ Hook::LexWrap: 0.2
+
+distribution_type: module
+generated_by: ExtUtils::MakeMaker version 6.30
Modified: branches/upstream/libsub-wrappackages-perl/current/lib/Sub/WrapPackages.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libsub-wrappackages-perl/current/lib/Sub/WrapPackages.pm?rev=52502&op=diff
==============================================================================
--- branches/upstream/libsub-wrappackages-perl/current/lib/Sub/WrapPackages.pm (original)
+++ branches/upstream/libsub-wrappackages-perl/current/lib/Sub/WrapPackages.pm Thu Feb 11 01:54:46 2010
@@ -5,7 +5,7 @@
use vars qw($VERSION);
-$VERSION = '1.3';
+$VERSION = '1.31';
use Hook::LexWrap;
@@ -120,6 +120,9 @@
Thanks to Dagfinn Ilmari Mannsaker for help with the craziness for
fiddling with modules that haven't yet been loaded.
+Thanks to Lee Johnson for reporting a bug caused by perl 5.10's
+constant.pm being Far Too Clever, and providing a patch and test.
+
=cut
sub import {
@@ -134,7 +137,8 @@
foreach my $package (@targets) {
no strict;
while(my($k, $v) = each(%{$package})) {
- push @subs, $package.$k if(defined(&{$v}));
+ # 5.10 makes 'use constant' imports into scalars
+ push @subs, $package.$k if(ref($v) ne 'SCALAR' && defined(&{$v}));
}
}
return @subs;
Added: branches/upstream/libsub-wrappackages-perl/current/t/09_5.10_use_constant.t
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libsub-wrappackages-perl/current/t/09_5.10_use_constant.t?rev=52502&op=file
==============================================================================
--- branches/upstream/libsub-wrappackages-perl/current/t/09_5.10_use_constant.t (added)
+++ branches/upstream/libsub-wrappackages-perl/current/t/09_5.10_use_constant.t Thu Feb 11 01:54:46 2010
@@ -1,0 +1,39 @@
+#!/usr/bin/perl -w
+
+my $r;
+my $skip;
+
+use strict;
+
+BEGIN {
+ eval 'use 5.010';
+ $skip = $@;
+ $| = 1; print "1..1\n" unless($skip);
+}
+
+if ($skip) {
+ $skip =~ s/--.*$//xs;
+ print "1..0\n";
+ print "skip ... $skip\n";
+ exit;
+}
+
+eval '
+ use lib "t/lib"; use breakuseconstant;
+ use Sub::WrapPackages (
+ packages => [qw(breakuseconstant)],
+ pre => sub {
+ $r .= "before";
+ },
+ post => sub {
+ $r .= "after";
+ }
+ );
+
+my $test = 0;
+
+$r .= breakuseconstant::FOO;
+
+print "not " unless($r eq "i am a constant i am i am");
+print "ok ".(++$test)." use constant does not wrap\n";
+';
Added: branches/upstream/libsub-wrappackages-perl/current/t/lib/breakuseconstant.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libsub-wrappackages-perl/current/t/lib/breakuseconstant.pm?rev=52502&op=file
==============================================================================
--- branches/upstream/libsub-wrappackages-perl/current/t/lib/breakuseconstant.pm (added)
+++ branches/upstream/libsub-wrappackages-perl/current/t/lib/breakuseconstant.pm Thu Feb 11 01:54:46 2010
@@ -1,0 +1,4 @@
+package breakuseconstant;
+
+use constant FOO => 'i am a constant i am i am';
+1;