From 80f78a716c4ffd9e5c37ebecec28c544e3af2c3f Mon Sep 17 00:00:00 2001
From: Florian Ragwitz <rafl@debian.org>
Date: Thu, 2 Dec 2010 10:41:33 +0100
Subject: [PATCH] Dual-life Devel::SelfStubber

---
 MANIFEST                                                 |  4 ++--
 Porting/Maintainers.pl                                   |  9 ++++++++-
 {ext => dist}/Devel-SelfStubber/lib/Devel/SelfStubber.pm | 12 ++++++------
 {ext => dist}/Devel-SelfStubber/t/Devel-SelfStubber.t    |  0
 4 files changed, 16 insertions(+), 9 deletions(-)
 rename {ext => dist}/Devel-SelfStubber/lib/Devel/SelfStubber.pm (95%)
 rename {ext => dist}/Devel-SelfStubber/t/Devel-SelfStubber.t (100%)

diff --git a/MANIFEST b/MANIFEST
index 41e19be..06456d3 100644
--- a/MANIFEST
+++ b/MANIFEST
@@ -2702,6 +2702,8 @@ dist/Data-Dumper/t/overload.t	See if Data::Dumper works for overloaded data
 dist/Data-Dumper/t/pair.t	See if Data::Dumper pair separator works
 dist/Data-Dumper/t/perl-74170.t	Regression test for stack reallocation
 dist/Data-Dumper/t/terse.t	See if Data::Dumper terse option works
+dist/Devel-SelfStubber/lib/Devel/SelfStubber.pm	Generate stubs for SelfLoader.pm
+dist/Devel-SelfStubber/t/Devel-SelfStubber.t	See if Devel::SelfStubber works
 dist/ExtUtils-Command/lib/ExtUtils/Command.pm	Utilities for Make on non-UNIX platforms
 dist/ExtUtils-Command/t/cp.t			See if ExtUtils::Command works
 dist/ExtUtils-Command/t/eu_command.t		See if ExtUtils::Command works
@@ -3163,8 +3165,6 @@ ext/Devel-Peek/Makefile.PL	Data debugging tool, makefile writer
 ext/Devel-Peek/Peek.pm		Data debugging tool, module and pod
 ext/Devel-Peek/Peek.xs		Data debugging tool, externals
 ext/Devel-Peek/t/Peek.t		See if Devel::Peek works
-ext/Devel-SelfStubber/lib/Devel/SelfStubber.pm	Generate stubs for SelfLoader.pm
-ext/Devel-SelfStubber/t/Devel-SelfStubber.t	See if Devel::SelfStubber works
 ext/DynaLoader/dl_aix.xs	AIX implementation
 ext/DynaLoader/dl_beos.xs	BeOS implementation
 ext/DynaLoader/dl_dld.xs	GNU dld style implementation
diff --git a/Porting/Maintainers.pl b/Porting/Maintainers.pl
index 08f7e2b..fad0ed6 100755
--- a/Porting/Maintainers.pl
+++ b/Porting/Maintainers.pl
@@ -453,6 +453,14 @@ use File::Glob qw(:case);
 	'UPSTREAM'	=> undef,
 	},
 
+    'Devel::SelfStubber' =>
+	{
+	'MAINTAINER'	=> 'p5p',
+	'DISTRIBUTION'	=> 'FLORA/Devel-SelfStubber-1.03.tar.gz',
+	'FILES'		=> q[dist/Devel-SelfStubber],
+	'UPSTREAM'	=> 'blead',
+	},
+
     'Devel::PPPort' =>
 	{
 	'MAINTAINER'	=> 'mhx',
@@ -1643,7 +1651,6 @@ use File::Glob qw(:case);
 
 				ext/Devel-DProf/
 				ext/Devel-Peek/
-				ext/Devel-SelfStubber/
 				ext/DynaLoader/
 				ext/Errno
 				ext/Fcntl/
diff --git a/ext/Devel-SelfStubber/lib/Devel/SelfStubber.pm b/dist/Devel-SelfStubber/lib/Devel/SelfStubber.pm
similarity index 95%
rename from ext/Devel-SelfStubber/lib/Devel/SelfStubber.pm
rename to dist/Devel-SelfStubber/lib/Devel/SelfStubber.pm
index bfdb443..e55018e 100644
--- a/ext/Devel-SelfStubber/lib/Devel/SelfStubber.pm
+++ b/dist/Devel-SelfStubber/lib/Devel/SelfStubber.pm
@@ -33,7 +33,7 @@ sub stub {
     $lib ||= File::Spec->curdir();
     ($mod_file = $module) =~ s,::,/,g;
     $mod_file =~ tr|/|:| if $^O eq 'MacOS';
-    
+
     $mod_file = File::Spec->catfile($lib, "$mod_file.pm");
     $fh = "${module}::DATA";
     my (@BEFORE_DATA, @AFTER_DATA, @AFTER_END);
@@ -47,7 +47,7 @@ sub stub {
     }
     (defined ($line) && $line =~ m/^__DATA__/)
       || die "$mod_file doesn't contain a __DATA__ token";
-    $found_selfloader || 
+    $found_selfloader ||
 	print 'die "\'use SelfLoader;\' statement NOT FOUND!!\n"',"\n";
     if ($JUST_STUBS) {
         $self->_load_stubs($module);
@@ -62,13 +62,13 @@ sub stub {
     }
     close($fh);
     unless ($JUST_STUBS) {
-    	print @BEFORE_DATA;
+	print @BEFORE_DATA;
     }
     print @STUBS;
     unless ($JUST_STUBS) {
-    	print "1;\n__DATA__\n",@DATA;
-    	if($end_data) { print "__END__ DATA\n",@AFTER_DATA; }
-    	if(@AFTER_END) { print "__END__\n",@AFTER_END; }
+	print "1;\n__DATA__\n",@DATA;
+	if($end_data) { print "__END__ DATA\n",@AFTER_DATA; }
+	if(@AFTER_END) { print "__END__\n",@AFTER_END; }
     }
 }
 
diff --git a/ext/Devel-SelfStubber/t/Devel-SelfStubber.t b/dist/Devel-SelfStubber/t/Devel-SelfStubber.t
similarity index 100%
rename from ext/Devel-SelfStubber/t/Devel-SelfStubber.t
rename to dist/Devel-SelfStubber/t/Devel-SelfStubber.t
-- 
2.7.4