r17759 - in /branches/upstream/libmodule-pluggable-perl/current: Changes META.yml Makefile.PL lib/Module/Pluggable.pm

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

Author: gregoa-guest
Date: Mon Mar 17 19:46:26 2008
New Revision: 17759

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

Modified:
    branches/upstream/libmodule-pluggable-perl/current/Changes
    branches/upstream/libmodule-pluggable-perl/current/META.yml
    branches/upstream/libmodule-pluggable-perl/current/Makefile.PL
    branches/upstream/libmodule-pluggable-perl/current/lib/Module/Pluggable.pm

Modified: branches/upstream/libmodule-pluggable-perl/current/Changes
URL: http://svn.debian.org/wsvn/branches/upstream/libmodule-pluggable-perl/current/Changes?rev=17759&op=diff
==============================================================================
--- branches/upstream/libmodule-pluggable-perl/current/Changes (original)
+++ branches/upstream/libmodule-pluggable-perl/current/Changes Mon Mar 17 19:46:26 2008
@@ -1,4 +1,8 @@
-2008-01-31 - 3.7 
+2008-03-16 - 3.8
+    Set INSTALLDIRS correctly in Makefile.PL
+    A couple of other fixups to play nicely in Core
+
+2008-03-12 - 3.7 
     Ignore editor cruft by default (Dave Rolsky and Matt Trout)
     Doc patches (Matt Trout)
     Prevent prototype mismatch warnings under Error.pm (Christopher H. Laco)

Modified: branches/upstream/libmodule-pluggable-perl/current/META.yml
URL: http://svn.debian.org/wsvn/branches/upstream/libmodule-pluggable-perl/current/META.yml?rev=17759&op=diff
==============================================================================
--- branches/upstream/libmodule-pluggable-perl/current/META.yml (original)
+++ branches/upstream/libmodule-pluggable-perl/current/META.yml Mon Mar 17 19:46:26 2008
@@ -1,6 +1,6 @@
 --- #YAML:1.0
 name:                Module-Pluggable
-version:             3.7
+version:             3.8
 abstract:            ~
 license:             ~
 author:              ~

Modified: branches/upstream/libmodule-pluggable-perl/current/Makefile.PL
URL: http://svn.debian.org/wsvn/branches/upstream/libmodule-pluggable-perl/current/Makefile.PL?rev=17759&op=diff
==============================================================================
--- branches/upstream/libmodule-pluggable-perl/current/Makefile.PL (original)
+++ branches/upstream/libmodule-pluggable-perl/current/Makefile.PL Mon Mar 17 19:46:26 2008
@@ -7,35 +7,43 @@
 # and VOS can't even unpack them so we create them on the
 # fly and only run the tests if they're present
 my %dodgy_files = (
-	catfile(qw(OddTest Plugin -Dodgy.pm))   => 'OddTest::Plugin::-Dodgy',
+    catfile(qw(OddTest Plugin -Dodgy.pm))   => 'OddTest::Plugin::-Dodgy',
     catfile(qw(EditorJunk Plugin #Bar.pm#)) => 'EditorJunk::Bar',
     catfile(qw(EditorJunk Plugin .#Bar.pm)) => 'EditorJunk::Bar',
 );
 
+my $core = grep { $_ eq 'PERL_CORE=1' } @ARGV;
+my @path = $core ? (File::Spec->updir, File::Spec->updir, File::Spec->updir,
+                   "t", "Module_Pluggable") : ($FindBin::Bin,"t");
+
+my @files;
 if ($^O ne 'VMS' && $^O ne 'VOS') {
-
-	foreach my $test (keys %dodgy_files) {
-	    my ($file) = (catfile($FindBin::Bin,"t","lib", $test)=~/^(.*)$/);
-	    if (open(my $fh, ">", $file)) {
-			my $name = $dodgy_files{$test};
-	        print $fh "package $name;\nsub new {}\n1;";
-	        close($fh);
-    	}
+    foreach my $test (keys %dodgy_files) {
+        my ($file) = (catfile($FindBin::Bin,"t","lib", $test)=~/^(.*)$/);
+        if (open(my $fh, ">", $file)) {
+            my $name = $dodgy_files{$test};
+            print $fh "package $name;\nsub new {}\n1;";
+            close($fh);
+            push @files, $file;
+        }
     }
 }
 
 
 WriteMakefile
 (
-          'NAME' => 'Module::Pluggable',
+          'NAME'         => 'Module::Pluggable',
           'VERSION_FROM' => 'lib/Module/Pluggable.pm',
-          'PREREQ_PM' => {
+          'PREREQ_PM'    => {
                            'File::Basename' => '0',
                            'File::Spec' => '3.00',
                            'Test::More' => '0.62'
                          },
-          'INSTALLDIRS' => 'site',
-          'EXE_FILES' => [],
-          'PL_FILES' => {}
+          'EXE_FILES'    => [],
+          'INSTALLDIRS'  => ($] >= 5.008009) ? "perl" : "site",
+          'PL_FILES'     => {},
+          'realclean'    => {FILES=> join ' ', @files},
+          # In the core pods will be built by installman.
+          $core ? (MAN3PODS => {}) : (),
         )
 ;

Modified: branches/upstream/libmodule-pluggable-perl/current/lib/Module/Pluggable.pm
URL: http://svn.debian.org/wsvn/branches/upstream/libmodule-pluggable-perl/current/lib/Module/Pluggable.pm?rev=17759&op=diff
==============================================================================
--- branches/upstream/libmodule-pluggable-perl/current/lib/Module/Pluggable.pm (original)
+++ branches/upstream/libmodule-pluggable-perl/current/lib/Module/Pluggable.pm Mon Mar 17 19:46:26 2008
@@ -9,7 +9,7 @@
 # Peter Gibbons: I wouldn't say I've been missing it, Bob! 
 
 
-$VERSION = '3.7';
+$VERSION = '3.8';
 
 sub import {
     my $class        = shift;