11 files changed, 29 insertions, 13 deletions
diff --git a/ext/Cwd/Changes b/ext/Cwd/Changes
index b462af0d3b..747d5f5763 100644
--- a/ext/Cwd/Changes
+++ b/ext/Cwd/Changes
@@ -1,5 +1,17 @@
 Revision history for Perl distribution PathTools.
 
+3.28_03 - Mon Oct 27 22:12:11 2008
+
+- In Cwd.pm, pass the un-munged $VERSION to XSLoader/DynaLoader,
+  otherwise development releases fail tests on Win32.
+
+3.28_02 - Mon Oct 27 20:13:11 2008
+
+ - Fixed some issues on QNX/NTO related to paths with double
+   slashes. [Matt Kraai & Nicholas Clark]
+
+3.28_01 - Fri Jul 25 21:18:11 2008
+
  - Fixed and clarified the behavior of splitpath() with a $no_file
    argument on VMS.  [Craig A. Berry, Peter Edwards]
 
diff --git a/lib/Cwd.pm b/lib/Cwd.pm
index f00072b5c8..2497b6a6b3 100644
--- a/lib/Cwd.pm
+++ b/lib/Cwd.pm
@@ -171,7 +171,8 @@ use strict;
 use Exporter;
 use vars qw(@ISA @EXPORT @EXPORT_OK $VERSION);
 
-$VERSION = '3.28_01';
+$VERSION = '3.28_03';
+my $xs_version = $VERSION;
 $VERSION = eval $VERSION;
 
 @ISA = qw/ Exporter /;
@@ -205,11 +206,11 @@ if ($^O eq 'os2') {
 eval {
   if ( $] >= 5.006 ) {
     require XSLoader;
-    XSLoader::load( __PACKAGE__, $VERSION );
+    XSLoader::load( __PACKAGE__, $xs_version);
   } else {
     require DynaLoader;
     push @ISA, 'DynaLoader';
-    __PACKAGE__->bootstrap( $VERSION );
+    __PACKAGE__->bootstrap( $xs_version );
   }
 };
 
diff --git a/lib/File/Spec.pm b/lib/File/Spec.pm
index b4bcaeb4c1..9be1a82378 100644
--- a/lib/File/Spec.pm
+++ b/lib/File/Spec.pm
@@ -3,7 +3,7 @@ package File::Spec;
 use strict;
 use vars qw(@ISA $VERSION);
 
-$VERSION = '3.28_01';
+$VERSION = '3.28_03';
 $VERSION = eval $VERSION;
 
 my %module = (MacOS   => 'Mac',
diff --git a/lib/File/Spec/Cygwin.pm b/lib/File/Spec/Cygwin.pm
index 89444f9bcb..b58302b78a 100644
--- a/lib/File/Spec/Cygwin.pm
+++ b/lib/File/Spec/Cygwin.pm
@@ -4,7 +4,7 @@ use strict;
 use vars qw(@ISA $VERSION);
 require File::Spec::Unix;
 
-$VERSION = '3.28_01';
+$VERSION = '3.28_03';
 $VERSION = eval $VERSION;
 
 @ISA = qw(File::Spec::Unix);
diff --git a/lib/File/Spec/Epoc.pm b/lib/File/Spec/Epoc.pm
index 57d2ec2d95..03ae9000ea 100644
--- a/lib/File/Spec/Epoc.pm
+++ b/lib/File/Spec/Epoc.pm
@@ -3,7 +3,7 @@ package File::Spec::Epoc;
 use strict;
 use vars qw($VERSION @ISA);
 
-$VERSION = '3.28_01';
+$VERSION = '3.28_03';
 $VERSION = eval $VERSION;
 
 require File::Spec::Unix;
diff --git a/lib/File/Spec/Functions.pm b/lib/File/Spec/Functions.pm
index a6957632f5..7bcbddf21f 100644
--- a/lib/File/Spec/Functions.pm
+++ b/lib/File/Spec/Functions.pm
@@ -5,7 +5,7 @@ use strict;
 
 use vars qw(@ISA @EXPORT @EXPORT_OK %EXPORT_TAGS $VERSION);
 
-$VERSION = '3.28_01';
+$VERSION = '3.28_03';
 $VERSION = eval $VERSION;
 
 require Exporter;
diff --git a/lib/File/Spec/Mac.pm b/lib/File/Spec/Mac.pm
index fdf35284f6..32d5319663 100644
--- a/lib/File/Spec/Mac.pm
+++ b/lib/File/Spec/Mac.pm
@@ -4,7 +4,7 @@ use strict;
 use vars qw(@ISA $VERSION);
 require File::Spec::Unix;
 
-$VERSION = '3.28_01';
+$VERSION = '3.28_03';
 $VERSION = eval $VERSION;
 
 @ISA = qw(File::Spec::Unix);
diff --git a/lib/File/Spec/OS2.pm b/lib/File/Spec/OS2.pm
index 54dda3d050..6cecbaab6f 100644
--- a/lib/File/Spec/OS2.pm
+++ b/lib/File/Spec/OS2.pm
@@ -4,7 +4,7 @@ use strict;
 use vars qw(@ISA $VERSION);
 require File::Spec::Unix;
 
-$VERSION = '3.28_01';
+$VERSION = '3.28_03';
 $VERSION = eval $VERSION;
 
 @ISA = qw(File::Spec::Unix);
diff --git a/lib/File/Spec/Unix.pm b/lib/File/Spec/Unix.pm
index 57b83c6cb4..a4f4c1dcb9 100644
--- a/lib/File/Spec/Unix.pm
+++ b/lib/File/Spec/Unix.pm
@@ -3,7 +3,7 @@ package File::Spec::Unix;
 use strict;
 use vars qw($VERSION);
 
-$VERSION = '3.28_01';
+$VERSION = '3.28_03';
 $VERSION = eval $VERSION;
 
 =head1 NAME
@@ -50,7 +50,10 @@ sub canonpath {
     # more than two leading slashes shall be treated as a single slash.")
     my $node = '';
     my $double_slashes_special = $^O eq 'qnx' || $^O eq 'nto';
-    if ( $double_slashes_special && $path =~ s{^(//[^/]+)(?:/|\z)}{/}s ) {
+
+
+    if ( $double_slashes_special
+         && ( $path =~ s{^(//[^/]+)/?\z}{}s || $path =~ s{^(//[^/]+)/}{/}s ) ) {
       $node = $1;
     }
     # This used to be
diff --git a/lib/File/Spec/VMS.pm b/lib/File/Spec/VMS.pm
index f68927d84e..571c6e5e22 100644
--- a/lib/File/Spec/VMS.pm
+++ b/lib/File/Spec/VMS.pm
@@ -4,7 +4,7 @@ use strict;
 use vars qw(@ISA $VERSION);
 require File::Spec::Unix;
 
-$VERSION = '3.28_01';
+$VERSION = '3.28_03';
 $VERSION = eval $VERSION;
 
 @ISA = qw(File::Spec::Unix);
diff --git a/lib/File/Spec/Win32.pm b/lib/File/Spec/Win32.pm
index 4df45f686e..7868afd4b0 100644
--- a/lib/File/Spec/Win32.pm
+++ b/lib/File/Spec/Win32.pm
@@ -5,7 +5,7 @@ use strict;
 use vars qw(@ISA $VERSION);
 require File::Spec::Unix;
 
-$VERSION = '3.28_01';
+$VERSION = '3.28_03';
 $VERSION = eval $VERSION;
 
 @ISA = qw(File::Spec::Unix);