r41809 - in /trunk/libmodule-scandeps-perl: Changes META.yml debian/changelog lib/Module/ScanDeps.pm t/11-finds-shared-lib.t t/7-check-dynaloader.t t/data/check-dynaloader/Bar.pm

ansgar-guest at users.alioth.debian.org ansgar-guest at users.alioth.debian.org
Thu Aug 13 22:54:52 UTC 2009


Author: ansgar-guest
Date: Thu Aug 13 22:54:45 2009
New Revision: 41809

URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=41809
Log:
New upstream release

Modified:
    trunk/libmodule-scandeps-perl/Changes
    trunk/libmodule-scandeps-perl/META.yml
    trunk/libmodule-scandeps-perl/debian/changelog
    trunk/libmodule-scandeps-perl/lib/Module/ScanDeps.pm
    trunk/libmodule-scandeps-perl/t/11-finds-shared-lib.t
    trunk/libmodule-scandeps-perl/t/7-check-dynaloader.t
    trunk/libmodule-scandeps-perl/t/data/check-dynaloader/Bar.pm

Modified: trunk/libmodule-scandeps-perl/Changes
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libmodule-scandeps-perl/Changes?rev=41809&op=diff
==============================================================================
--- trunk/libmodule-scandeps-perl/Changes (original)
+++ trunk/libmodule-scandeps-perl/Changes Thu Aug 13 22:54:45 2009
@@ -1,3 +1,8 @@
+[Changes for 0.94 - 2009-08-10]
+* Add tests for scan_line (Alexandr Ciornii)
+* RT#48151 fixed, "require __PACKAGE__" should not die (Alexandr Ciornii)
+* OS/2 fixes (Ilya Zakharevich)
+
 [Changes for 0.93 - 2009-07-19]
 * Implement caching of dependencies (Christoph Lamprecht)
 

Modified: trunk/libmodule-scandeps-perl/META.yml
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libmodule-scandeps-perl/META.yml?rev=41809&op=diff
==============================================================================
--- trunk/libmodule-scandeps-perl/META.yml (original)
+++ trunk/libmodule-scandeps-perl/META.yml Thu Aug 13 22:54:45 2009
@@ -27,4 +27,4 @@
 resources:
   license: http://dev.perl.org/licenses/
   repository: http://svn.openfoundry.org/par/Module-ScanDeps/trunk/
-version: 0.93
+version: 0.94

Modified: trunk/libmodule-scandeps-perl/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libmodule-scandeps-perl/debian/changelog?rev=41809&op=diff
==============================================================================
--- trunk/libmodule-scandeps-perl/debian/changelog (original)
+++ trunk/libmodule-scandeps-perl/debian/changelog Thu Aug 13 22:54:45 2009
@@ -1,3 +1,9 @@
+libmodule-scandeps-perl (0.94-1) unstable; urgency=low
+
+  * New upstream release
+
+ -- Ansgar Burchardt <ansgar at 43-1.org>  Fri, 14 Aug 2009 00:53:08 +0200
+
 libmodule-scandeps-perl (0.93-1) unstable; urgency=low
 
   * New upstream release

Modified: trunk/libmodule-scandeps-perl/lib/Module/ScanDeps.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libmodule-scandeps-perl/lib/Module/ScanDeps.pm?rev=41809&op=diff
==============================================================================
--- trunk/libmodule-scandeps-perl/lib/Module/ScanDeps.pm (original)
+++ trunk/libmodule-scandeps-perl/lib/Module/ScanDeps.pm Thu Aug 13 22:54:45 2009
@@ -4,7 +4,7 @@
 use warnings;
 use vars qw( $VERSION @EXPORT @EXPORT_OK @ISA $CurrentPackage @IncludeLibs $ScanFileRE );
 
-$VERSION   = '0.93';
+$VERSION   = '0.94';
 @EXPORT    = qw( scan_deps scan_deps_runtime );
 @EXPORT_OK = qw( scan_line scan_chunk add_deps scan_deps_runtime path_to_inc_name );
 
@@ -766,8 +766,8 @@
             return;
         }
         # use VERSION:
-        if (/^\s*(?:use|require)\s+([\d\._]+)/) {
-          # include feaure.pm if we have 5.9.5 or better
+        if (/^\s*(?:use|require)\s+v?(\d[\d\._]*)/) {
+          # include feature.pm if we have 5.9.5 or better
           if (version->new($1) >= version->new("5.9.5")) {
               # seems to catch 5.9, too (but not 5.9.4)
             return "feature.pm";

Modified: trunk/libmodule-scandeps-perl/t/11-finds-shared-lib.t
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libmodule-scandeps-perl/t/11-finds-shared-lib.t?rev=41809&op=diff
==============================================================================
--- trunk/libmodule-scandeps-perl/t/11-finds-shared-lib.t (original)
+++ trunk/libmodule-scandeps-perl/t/11-finds-shared-lib.t Thu Aug 13 22:54:45 2009
@@ -6,10 +6,15 @@
 use lib 't';
 use vars qw/%INC/;
 use File::Temp;
-use Test::More tests => 3;
+use Test::More;
 use Cwd;
 use Data::Dumper;
 use Config qw/%Config/;
+
+BEGIN {
+  plan('skip_all', 'Cwd is builtin on OS/2') if $^O eq 'os2';
+  plan(tests => 3);
+}
 
 # Tests that scan_deps finds the shared library associated
 # with an XS module (example: Cwd) both when scanned as a

Modified: trunk/libmodule-scandeps-perl/t/7-check-dynaloader.t
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libmodule-scandeps-perl/t/7-check-dynaloader.t?rev=41809&op=diff
==============================================================================
--- trunk/libmodule-scandeps-perl/t/7-check-dynaloader.t (original)
+++ trunk/libmodule-scandeps-perl/t/7-check-dynaloader.t Thu Aug 13 22:54:45 2009
@@ -5,6 +5,9 @@
 
 use Module::ScanDeps;
 use Cwd;
+
+my $extra = '';	# Cwd is builtin in perl*.dll; DLLs have checksum appended
+$extra = '\w\w|Glob\w\w' if $^O eq 'os2';  # So use a different dyna module
 
 unless( $Config::Config{usedl} ){
     plan('skip_all', 'Sorry, no dynamic loading');
@@ -19,12 +22,12 @@
          );
 
 
-my ( $entry ) =  grep { /^auto\b.*\bCwd\.$Config::Config{dlext}/ } keys %$rv;
+my ( $entry ) =  grep { /^auto\b.*\b(Cwd$extra)\.$Config::Config{dlext}/ } keys %$rv;
 
-ok( $entry, 'we have some key that looks like it pulled in the Cwd shared lib' );
+ok( $entry, 'we have some key that looks like it pulled in the Cwd or Glob shared lib' );
 
 # build a path the the Cwd library based on the entry in %INC and our Module::ScanDeps path
-( my $cwd_bundle_path = $INC{ 'Cwd.pm' } ) =~ s/Cwd\.pm$/$entry/;
+( my $cwd_bundle_path = $INC{ 'Cwd.pm' } || $INC{ 'File/Glob.pm' } ) =~ s,(Cwd|File/Glob)\.pm$,$entry,;
 
 is( $rv->{$entry}->{file}, $cwd_bundle_path, 'the full bundle path we got looks legit' );
 

Modified: trunk/libmodule-scandeps-perl/t/data/check-dynaloader/Bar.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libmodule-scandeps-perl/t/data/check-dynaloader/Bar.pm?rev=41809&op=diff
==============================================================================
--- trunk/libmodule-scandeps-perl/t/data/check-dynaloader/Bar.pm (original)
+++ trunk/libmodule-scandeps-perl/t/data/check-dynaloader/Bar.pm Thu Aug 13 22:54:45 2009
@@ -1,6 +1,7 @@
 package Bar;
 
 use Cwd;
+use File::Glob;	# Cwd is builtin in perl*.dll
 
 1;
 




More information about the Pkg-perl-cvs-commits mailing list