Dual-life Text::Abbrev

diff --git a/MANIFEST b/MANIFEST
index 3cefe28..d64ad09 100644 (file)
--- a/MANIFEST
+++ b/MANIFEST
@@ -3264,6 +3264,8 @@ dist/Storable/t/tied.t                    See if Storable works
 dist/Storable/t/utf8hash.t             See if Storable works
 dist/Storable/t/utf8.t                 See if Storable works
 dist/Storable/t/weak.t                 Can Storable store weakrefs
+dist/Text-Abbrev/lib/Text/Abbrev.pm            An abbreviation table builder
+dist/Text-Abbrev/t/Abbrev.t            Test Text::Abbrev
 dist/Thread-Queue/lib/Thread/Queue.pm  Thread-safe queues
 dist/Thread-Queue/t/01_basic.t         Thread::Queue tests
 dist/Thread-Queue/t/02_refs.t          Thread::Queue tests
@@ -4023,8 +4025,6 @@ lib/Term/Complete.pm              A command completion subroutine
 lib/Term/Complete.t            See if Term::Complete works
 lib/Term/ReadLine.pm           Stub readline library
 lib/Term/ReadLine.t            See if Term::ReadLine works
-lib/Text/Abbrev.pm             An abbreviation table builder
-lib/Text/Abbrev.t              Test Text::Abbrev
 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/META.yml b/META.yml
index 5ca4e98..4c999d3 100644 (file)
--- a/META.yml
+++ b/META.yml
@@ -46,6 +46,7 @@ no_index:
     - dist/Safe
     - dist/SelfLoader
     - dist/Storable
+    - dist/Text-Abbrev
     - dist/Thread-Queue
     - dist/Thread-Semaphore
     - dist/threads

diff --git a/Porting/Maintainers.pl b/Porting/Maintainers.pl
index 476fcde..d3f3d79 100755 (executable)
--- a/Porting/Maintainers.pl
+++ b/Porting/Maintainers.pl
@@ -1779,6 +1779,15 @@ use File::Glob qw(:case);
        'UPSTREAM'      => 'cpan',
        },
 
+    'Text::Abbrev' =>
+       {
+       'MAINTAINER'    => 'p5p',
+       'DISTRIBUTION'  => 'FLORA/Text-Abbrev-1.01.tar.gz',
+       'FILES'         => q[dist/Text-Abbrev],
+       'UPSTREAM'      => 'blead',
+       },
+
+
     'Text::Balanced' =>
        {
        'MAINTAINER'    => 'dmanura',
@@ -2123,7 +2132,6 @@ use File::Glob qw(:case);
                                lib/Symbol.{pm,t}
                                lib/Term/Complete.{pm,t}
                                lib/Term/ReadLine.{pm,t}
-                               lib/Text/Abbrev.{pm,t}
                                lib/Thread.{pm,t}
                                lib/Tie/Array.pm
                                lib/Tie/Array/

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

diff --git a/lib/Text/Abbrev.t b/dist/Text-Abbrev/t/Abbrev.t
similarity index 95%
rename from lib/Text/Abbrev.t
rename to dist/Text-Abbrev/t/Abbrev.t
index 38d4a39..7b297cf 100644 (file)
--- a/lib/Text/Abbrev.t
+++ b/dist/Text-Abbrev/t/Abbrev.t
@@ -2,11 +2,6 @@
 
 print "1..8\n";
 
-BEGIN {
-    chdir 't' if -d 't';
-    @INC = '../lib';
-}
-
 use Text::Abbrev;
 
 print "ok 1\n";

diff --git a/lib/.gitignore b/lib/.gitignore
index d49572d..96884a3 100644 (file)
--- a/lib/.gitignore
+++ b/lib/.gitignore
@@ -357,6 +357,7 @@
 /Text/Soundex.pm
 /Text/Tabs.pm
 /Text/Wrap.pm
+/Text/Abbrev.pm
 /Thread
 /Tie/File.pm
 /Tie/Hash/NamedCapture.pm