r52614 - in /trunk/libsub-wrappackages-perl: MANIFEST META.yml lib/Sub/WrapPackages.pm t/09_5.10_use_constant.t t/lib/breakuseconstant.pm

[jawnsy-guest at users.alioth.debian.org]

Author: jawnsy-guest
Date: Fri Feb 12 01:48:41 2010
New Revision: 52614

URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=52614
Log:
integrate new upstream version

Added:
    trunk/libsub-wrappackages-perl/t/09_5.10_use_constant.t
      - copied unchanged from r52503, branches/upstream/libsub-wrappackages-perl/current/t/09_5.10_use_constant.t
    trunk/libsub-wrappackages-perl/t/lib/breakuseconstant.pm
      - copied unchanged from r52503, branches/upstream/libsub-wrappackages-perl/current/t/lib/breakuseconstant.pm
Modified:
    trunk/libsub-wrappackages-perl/MANIFEST
    trunk/libsub-wrappackages-perl/META.yml
    trunk/libsub-wrappackages-perl/lib/Sub/WrapPackages.pm

Modified: trunk/libsub-wrappackages-perl/MANIFEST
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libsub-wrappackages-perl/MANIFEST?rev=52614&op=diff
==============================================================================
--- trunk/libsub-wrappackages-perl/MANIFEST (original)
+++ trunk/libsub-wrappackages-perl/MANIFEST Fri Feb 12 01:48:41 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: trunk/libsub-wrappackages-perl/META.yml
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libsub-wrappackages-perl/META.yml?rev=52614&op=diff
==============================================================================
--- trunk/libsub-wrappackages-perl/META.yml (original)
+++ trunk/libsub-wrappackages-perl/META.yml Fri Feb 12 01:48:41 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: trunk/libsub-wrappackages-perl/lib/Sub/WrapPackages.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libsub-wrappackages-perl/lib/Sub/WrapPackages.pm?rev=52614&op=diff
==============================================================================
--- trunk/libsub-wrappackages-perl/lib/Sub/WrapPackages.pm (original)
+++ trunk/libsub-wrappackages-perl/lib/Sub/WrapPackages.pm Fri Feb 12 01:48:41 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;