Redo move Text::Tabs/Text::Wrap from lib to ext.

This reverts commit a1095a4f24eae80e3fe213e9767581fedc24e3ac,
which reverted commit 4f87fa576f174a31e6d8fdb08cae76e644395db0.

Conflicts:

	MANIFEST
	ext/.gitignore
	lib/.gitignore

diff --git a/MANIFEST b/MANIFEST
index a4fe424..a358f54 100644 (file)
--- a/MANIFEST
+++ b/MANIFEST
@@ -2061,6 +2061,22 @@ 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/Thread-Queue/lib/Thread/Queue.pm   Thread-safe queues
 ext/Thread-Queue/t/01_basic.t          Thread::Queue tests
 ext/Thread-Queue/t/02_refs.t           Thread::Queue tests
@@ -3364,25 +3380,6 @@ 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/ParseWords.pm         Perl module to split words on arbitrary delimiter
-lib/Text/ParseWords.t          See if Text::ParseWords works
-lib/Text/ParseWords/taint.t    See if Text::ParseWords works with tainting
-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.t                   Thread extensions frontend tests
 lib/Tie/Array.pm               Base class for tied arrays

diff --git a/Porting/Maintainers.pl b/Porting/Maintainers.pl
index 2a05539..9e1ad3f 100755 (executable)
--- a/Porting/Maintainers.pl
+++ b/Porting/Maintainers.pl
@@ -1690,12 +1690,8 @@ use File::Glob qw(:case);
        {
        'MAINTAINER'    => 'muir',
        'DISTRIBUTION'  => 'MUIR/modules/Text-Tabs+Wrap-2009.0305.tar.gz',
-       'FILES'         => q[lib/Text/{Tabs,Wrap}.pm lib/Text/TabsWrap],
+       'FILES'         => q[ext/Text-Tabs],
        '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 d737ff4..df7d738 100644 (file)
--- a/ext/.gitignore
+++ b/ext/.gitignore
@@ -65,6 +65,7 @@ ppport.h
 /Test-Harness/Makefile.PL
 /Text-Balanced/Makefile.PL
 /Text-Soundex/Makefile.PL
+/Text-Tabs/Makefile.PL
 /Thread-Queue/Makefile.PL
 /Thread-Semaphore/Makefile.PL
 /Tie-File/Makefile.PL

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

diff --git a/lib/.gitignore b/lib/.gitignore
index 93be609..956f44b 100644 (file)
--- a/lib/.gitignore
+++ b/lib/.gitignore
@@ -234,6 +234,8 @@
 /Term/UI.pm
 /Text/Balanced.pm
 /Text/Soundex.pm
+/Text/Tabs.pm
+/Text/Wrap.pm
 /Thread
 /Tie/File.pm
 /Tie/Memoize.pm