Revert "Move Text::Tabs/Text::Wrap from lib to ext"

The mktables failure wasn't the only issue : ExtUtils::Constant also requires
Text::Tabs. Since that makes it effectively toolchain, it's best kept it in
lib/ for now.

This reverts commit 4f87fa576f174a31e6d8fdb08cae76e644395db0.

diff --git a/MANIFEST b/MANIFEST
index 3f0f4c6..0935005 100644 (file)
--- a/MANIFEST
+++ b/MANIFEST
@@ -1573,22 +1573,6 @@ ext/Text-Soundex/README          README for Text::Soundex
 ext/Text-Soundex/Soundex.pm    Text::Soundex extension Perl module
 ext/Text-Soundex/Soundex.xs    Text::Soundex extension external subroutines
 ext/Text-Soundex/t/Soundex.t   test for Text::Soundex
-ext/Text-Tabs/CHANGELOG                        ChangeLog for Tabs+Wrap
-ext/Text-Tabs/lib/Text/Tabs.pm         Do expand and unexpand
-ext/Text-Tabs/lib/Text/Wrap.pm         Paragraph formatter
-ext/Text-Tabs/t/37000.t                        See if Text::Tabs is working
-ext/Text-Tabs/t/39548.t                        See if Text::Tabs is working
-ext/Text-Tabs/t/belg4mit.t             See if Text::Tabs is working
-ext/Text-Tabs/t/dandv.t                        See if Text::Tabs is working
-ext/Text-Tabs/t/fill.t                 See if Text::Wrap::fill works
-ext/Text-Tabs/t/Jacobson2.t            See if Text::Tabs is working
-ext/Text-Tabs/t/Jacobson.t             See if Text::Tabs is working
-ext/Text-Tabs/t/Jochen.t               See if Text::Tabs is working
-ext/Text-Tabs/t/sep2.t                 See if Text::Tabs is working
-ext/Text-Tabs/t/sep.t                  See if Text::Tabs is working
-ext/Text-Tabs/t/tabs.t                 See if Text::Tabs works
-ext/Text-Tabs/t/wrap_separator2.t      See if Text::Wrap::wrap works
-ext/Text-Tabs/t/wrap.t                 See if Text::Wrap::wrap works
 ext/threads/hints/hpux.pl      Hint file for HPUX
 ext/threads/hints/linux.pl     Hint file for Linux
 ext/threads/Makefile.PL                ithreads
@@ -3310,6 +3294,22 @@ lib/Test/t/todo.t                See if Test works
 lib/Test/Tutorial.pod          A tutorial on writing tests
 lib/Text/Abbrev.pm             An abbreviation table builder
 lib/Text/Abbrev.t              Test Text::Abbrev
+lib/Text/Tabs.pm               Do expand and unexpand
+lib/Text/TabsWrap/CHANGELOG    ChangeLog for Tabs+Wrap
+lib/Text/TabsWrap/t/37000.t    See if Text::Tabs is working
+lib/Text/TabsWrap/t/39548.t    See if Text::Tabs is working
+lib/Text/TabsWrap/t/belg4mit.t See if Text::Tabs is working
+lib/Text/TabsWrap/t/dandv.t    See if Text::Tabs is working
+lib/Text/TabsWrap/t/fill.t     See if Text::Wrap::fill works
+lib/Text/TabsWrap/t/Jacobson2.t        See if Text::Tabs is working
+lib/Text/TabsWrap/t/Jacobson.t See if Text::Tabs is working
+lib/Text/TabsWrap/t/Jochen.t   See if Text::Tabs is working
+lib/Text/TabsWrap/t/sep2.t     See if Text::Tabs is working
+lib/Text/TabsWrap/t/sep.t      See if Text::Tabs is working
+lib/Text/TabsWrap/t/tabs.t     See if Text::Tabs works
+lib/Text/TabsWrap/t/wrap_separator2.t  See if Text::Wrap::wrap works
+lib/Text/TabsWrap/t/wrap.t     See if Text::Wrap::wrap works
+lib/Text/Wrap.pm               Paragraph formatter
 lib/Thread.pm                  Thread extensions frontend
 lib/Thread/Queue.pm            Thread-safe queues
 lib/Thread/Queue/t/01_basic.t  Thread::Queue tests

diff --git a/Porting/Maintainers.pl b/Porting/Maintainers.pl
index 802512f..c4e6dfa 100755 (executable)
--- a/Porting/Maintainers.pl
+++ b/Porting/Maintainers.pl
@@ -1750,8 +1750,12 @@ package Maintainers;
        {
        'MAINTAINER'    => 'muir',
        'DISTRIBUTION'  => 'MUIR/modules/Text-Tabs+Wrap-2009.0305.tar.gz',
-       'FILES'         => q[ext/Text-Tabs],
+       'FILES'         => q[lib/Text/{Tabs,Wrap}.pm lib/Text/TabsWrap],
        'EXCLUDED'      => [ qw( t/dnsparks.t ) ], # see af6492bf9e
+       'MAP'           => {
+                            ''    => 'lib/Text/TabsWrap/',
+                            'lib/'=> 'lib/',
+                          },
        'CPAN'          => 1,
        'UPSTREAM'      => 'cpan',
        },

diff --git a/ext/.gitignore b/ext/.gitignore
index b804c63..ead0418 100644 (file)
--- a/ext/.gitignore
+++ b/ext/.gitignore
@@ -40,7 +40,6 @@ ppport.h
 /Text-Balanced/Makefile.PL
 /Text-ParseWords/Makefile.PL
 /Text-Soundex/Makefile.PL
-/Text-Tabs/Makefile.PL
 
 # ignore all vim swap files but the one bundled in Module::Pluggable for testing
 *.swp

diff --git a/lib/.gitignore b/lib/.gitignore
index cbee855..1ee1e8c 100644 (file)
--- a/lib/.gitignore
+++ b/lib/.gitignore
@@ -81,8 +81,6 @@
 /Text/Balanced.pm
 /Text/ParseWords.pm
 /Text/Soundex.pm
-/Text/Tabs.pm
-/Text/Wrap.pm
 /Time/HiRes.pm
 /Time/Piece.pm
 /Time/Seconds.pm

diff --git a/ext/Text-Tabs/lib/Text/Tabs.pm b/lib/Text/Tabs.pm
similarity index 100%
rename from ext/Text-Tabs/lib/Text/Tabs.pm
rename to lib/Text/Tabs.pm

diff --git a/ext/Text-Tabs/CHANGELOG b/lib/Text/TabsWrap/CHANGELOG
similarity index 100%
rename from ext/Text-Tabs/CHANGELOG
rename to lib/Text/TabsWrap/CHANGELOG

diff --git a/ext/Text-Tabs/t/37000.t b/lib/Text/TabsWrap/t/37000.t
similarity index 100%
rename from ext/Text-Tabs/t/37000.t
rename to lib/Text/TabsWrap/t/37000.t

diff --git a/ext/Text-Tabs/t/39548.t b/lib/Text/TabsWrap/t/39548.t
similarity index 100%
rename from ext/Text-Tabs/t/39548.t
rename to lib/Text/TabsWrap/t/39548.t

diff --git a/ext/Text-Tabs/t/Jacobson.t b/lib/Text/TabsWrap/t/Jacobson.t
similarity index 100%
rename from ext/Text-Tabs/t/Jacobson.t
rename to lib/Text/TabsWrap/t/Jacobson.t

diff --git a/ext/Text-Tabs/t/Jacobson2.t b/lib/Text/TabsWrap/t/Jacobson2.t
similarity index 100%
rename from ext/Text-Tabs/t/Jacobson2.t
rename to lib/Text/TabsWrap/t/Jacobson2.t

diff --git a/ext/Text-Tabs/t/Jochen.t b/lib/Text/TabsWrap/t/Jochen.t
similarity index 100%
rename from ext/Text-Tabs/t/Jochen.t
rename to lib/Text/TabsWrap/t/Jochen.t

diff --git a/ext/Text-Tabs/t/belg4mit.t b/lib/Text/TabsWrap/t/belg4mit.t
similarity index 100%
rename from ext/Text-Tabs/t/belg4mit.t
rename to lib/Text/TabsWrap/t/belg4mit.t

diff --git a/ext/Text-Tabs/t/dandv.t b/lib/Text/TabsWrap/t/dandv.t
similarity index 100%
rename from ext/Text-Tabs/t/dandv.t
rename to lib/Text/TabsWrap/t/dandv.t

diff --git a/ext/Text-Tabs/t/fill.t b/lib/Text/TabsWrap/t/fill.t
similarity index 100%
rename from ext/Text-Tabs/t/fill.t
rename to lib/Text/TabsWrap/t/fill.t

diff --git a/ext/Text-Tabs/t/sep.t b/lib/Text/TabsWrap/t/sep.t
similarity index 100%
rename from ext/Text-Tabs/t/sep.t
rename to lib/Text/TabsWrap/t/sep.t

diff --git a/ext/Text-Tabs/t/sep2.t b/lib/Text/TabsWrap/t/sep2.t
similarity index 100%
rename from ext/Text-Tabs/t/sep2.t
rename to lib/Text/TabsWrap/t/sep2.t

diff --git a/ext/Text-Tabs/t/tabs.t b/lib/Text/TabsWrap/t/tabs.t
similarity index 100%
rename from ext/Text-Tabs/t/tabs.t
rename to lib/Text/TabsWrap/t/tabs.t

diff --git a/ext/Text-Tabs/t/wrap.t b/lib/Text/TabsWrap/t/wrap.t
similarity index 100%
rename from ext/Text-Tabs/t/wrap.t
rename to lib/Text/TabsWrap/t/wrap.t

diff --git a/ext/Text-Tabs/t/wrap_separator2.t b/lib/Text/TabsWrap/t/wrap_separator2.t
similarity index 100%
rename from ext/Text-Tabs/t/wrap_separator2.t
rename to lib/Text/TabsWrap/t/wrap_separator2.t

diff --git a/ext/Text-Tabs/lib/Text/Wrap.pm b/lib/Text/Wrap.pm
similarity index 100%
rename from ext/Text-Tabs/lib/Text/Wrap.pm
rename to lib/Text/Wrap.pm