r17642 - in /branches/upstream/libmodule-load-conditional-perl/current: CHANGES META.yml lib/Module/Load/Conditional.pm t/01_Module_Load_Conditional.t

[roberto at users.alioth.debian.org]

Author: roberto
Date: Sun Mar 16 06:05:34 2008
New Revision: 17642

URL: http://svn.debian.org/wsvn/?sc=1&rev=17642
Log:
[svn-upgrade] Integrating new upstream version, libmodule-load-conditional-perl (0.26)

Modified:
    branches/upstream/libmodule-load-conditional-perl/current/CHANGES
    branches/upstream/libmodule-load-conditional-perl/current/META.yml
    branches/upstream/libmodule-load-conditional-perl/current/lib/Module/Load/Conditional.pm
    branches/upstream/libmodule-load-conditional-perl/current/t/01_Module_Load_Conditional.t

Modified: branches/upstream/libmodule-load-conditional-perl/current/CHANGES
URL: http://svn.debian.org/wsvn/branches/upstream/libmodule-load-conditional-perl/current/CHANGES?rev=17642&op=diff
==============================================================================
--- branches/upstream/libmodule-load-conditional-perl/current/CHANGES (original)
+++ branches/upstream/libmodule-load-conditional-perl/current/CHANGES Sun Mar 16 06:05:34 2008
@@ -1,3 +1,11 @@
+Changes for 0.26    Fri Feb 29 16:01:15 CET 2008       
+=================================================
+* Address #32817: $INC{'Module/Load/Conditional.pm'} 
+  isn't canonicalized under Win32. This exposed an
+  issue in the test suite under ActivePerl for Win32, 
+  but not the code itself.
+  Users of 0.24 do not need to upgrade.
+
 Changes for 0.24    Wed Jan  2 16:53:19 CET 2008
 =================================================
 * Readdress #29348 to make sure version comparisons

Modified: branches/upstream/libmodule-load-conditional-perl/current/META.yml
URL: http://svn.debian.org/wsvn/branches/upstream/libmodule-load-conditional-perl/current/META.yml?rev=17642&op=diff
==============================================================================
--- branches/upstream/libmodule-load-conditional-perl/current/META.yml (original)
+++ branches/upstream/libmodule-load-conditional-perl/current/META.yml Sun Mar 16 06:05:34 2008
@@ -1,7 +1,7 @@
 # http://module-build.sourceforge.net/META-spec.html
 #XXXXXXX This is a prototype!!!  It will change in the future!!! XXXXX#
 name:         Module-Load-Conditional
-version:      0.24
+version:      0.26
 version_from: lib/Module/Load/Conditional.pm
 installdirs:  site
 requires:

Modified: branches/upstream/libmodule-load-conditional-perl/current/lib/Module/Load/Conditional.pm
URL: http://svn.debian.org/wsvn/branches/upstream/libmodule-load-conditional-perl/current/lib/Module/Load/Conditional.pm?rev=17642&op=diff
==============================================================================
--- branches/upstream/libmodule-load-conditional-perl/current/lib/Module/Load/Conditional.pm (original)
+++ branches/upstream/libmodule-load-conditional-perl/current/lib/Module/Load/Conditional.pm Sun Mar 16 06:05:34 2008
@@ -18,7 +18,7 @@
                         $FIND_VERSION $ERROR $CHECK_INC_HASH];
     use Exporter;
     @ISA            = qw[Exporter];
-    $VERSION        = '0.24';
+    $VERSION        = '0.26';
     $VERBOSE        = 0;
     $FIND_VERSION   = 1;
     $CHECK_INC_HASH = 0;

Modified: branches/upstream/libmodule-load-conditional-perl/current/t/01_Module_Load_Conditional.t
URL: http://svn.debian.org/wsvn/branches/upstream/libmodule-load-conditional-perl/current/t/01_Module_Load_Conditional.t?rev=17642&op=diff
==============================================================================
--- branches/upstream/libmodule-load-conditional-perl/current/t/01_Module_Load_Conditional.t (original)
+++ branches/upstream/libmodule-load-conditional-perl/current/t/01_Module_Load_Conditional.t Sun Mar 16 06:05:34 2008
@@ -64,8 +64,12 @@
         ### and return it    
         @path;
     };
-    
-    is( $INC{'Module/Load/Conditional.pm'},            
+    my $inc_path = $INC{'Module/Load/Conditional.pm'};
+    if ( $^O eq 'MSWin32' ) {
+        $inc_path = File::Spec->canonpath( $inc_path );
+        $inc_path =~ s{\\}{/}g; # to meet with unix path
+    }
+    is( $inc_path,
             File::Spec::Unix->catfile(@rv_path),
                             q[  Found proper file]
     );