Tidy up comments.
[p5sagit/p5-mst-13.2.git] / Porting / Maintainers.pl
old mode 100644 (file)
new mode 100755 (executable)
index 02e299f..72b72d3
@@ -36,9 +36,10 @@ package Maintainers;
     'ilyaz'    => 'Ilya Zakharevich <ilyaz@cpan.org>',
     'jand'     => 'Jan Dubois <jand@activestate.com>',
     'jdhedden' => 'Jerry D. Hedden <jdhedden@cpan.org>',
+    'jesse'    => 'Jesse Vincent <jesse@bestpractical.com>',
     'jhi'      => 'Jarkko Hietaniemi <jhi@cpan.org>',
     'jjore'    => 'Joshua ben Jore <jjore@cpan.org>',
-    'jpeacock' => 'John Peacock <jpeacock@rowman.com>',
+    'jpeacock' => 'John Peacock <jpeacock@cpan.org>',
     'jstowe'   => 'Jonathan Stowe <jstowe@cpan.org>',
     'jv'       => 'Johan Vromans <jv@cpan.org>',
     'kane'     => 'Jos Boumans <kane@cpan.org>',
@@ -87,6 +88,21 @@ package Maintainers;
     'zefram'   => 'Andrew Main <zefram@cpan.org>',
     );
 
+
+# IGNORABLE: files which, if they appear in the root of a CPAN
+# distribution, need not appear in core (i.e. core-cpan-diff won't
+# complain if it can't find them)
+
+@IGNORABLE = qw(
+    .cvsignore .dualLivedDiffConfig .gitignore
+    ANNOUNCE Announce Artistic AUTHORS BENCHMARK BUGS Build.PL
+    CHANGELOG ChangeLog CHANGES Changes COPYING Copying CREDITS
+    GOALS HISTORY INSTALL INSTALL.SKIP LICENSE Makefile.PL
+    MANIFEST MANIFEST.SKIP META.yml NEW NOTES ppport.h README
+    SIGNATURE THANKS TODO Todo VERSION WHATSNEW
+);
+
 # Each entry in the  %Modules hash roughly represents a distribution,
 # except in the case of CPAN=1, where it *exactly* represents a single
 # CPAN distribution.
@@ -114,34 +130,73 @@ package Maintainers;
 # that blead can be patched freely if it is in sync with the
 # latest release on CPAN.
 
+# BUGS is an email or url to post bug reports.  For modules with
+# UPSTREAM => 'blead', use perl5-porters@perl.org.  rt.cpan.org
+# appears to automatically provide a URL for CPAN modules; any value
+# given here overrides the default:
+# http://rt.cpan.org/Public/Dist/Display.html?Name=$ModuleName
+
 # DISTRIBUTION names the tarball on CPAN which (allegedly) the files
 # included in core are derived from. Note that the file's version may not
 # necessarily match the newest version on CPAN.
 
+# EXCLUDED is a list of files to be excluded from a CPAN tarball before
+# comparing the remaining contents with core. Each item can either be a
+# full pathname (eg 't/foo.t') or a pattern (e.g. qr{^t/}).
+# It defaults to the empty list.
+
+# MAP is a hash that maps CPAN paths to their core equivalents.
+# Each key reprepresents a string prefix, with longest prefixes checked
+# first. The first match causes that prefix to be replaced with the
+# corresponding key. For example, with the following MAP:
+#   { 
+#     'lib/'    => 'lib/',
+#     ''        => 'lib/Foo/',
+#   },
+#
+# these files are mapped as shown:
+#
+#    README     becomes lib/Foo/README
+#    lib/Foo.pm becomes lib/Foo.pm 
+#
+# The default is dependent on the type of module.
+# For distributions which appear to be stored under ext/, it defaults to:
+#
+#   { '' => 'ext/Foo-Bar/' }
+#
+# otherwise, it's
+#
+#   { 
+#     'lib/'    => 'lib/',
+#     ''        => 'lib/Foo/Bar/',
+#   }
+
 %Modules = (
 
     'Archive::Extract' =>
        {
        'MAINTAINER'    => 'kane',
-       'DISTRIBUTION'  => 'KANE/Archive-Extract-0.30.tar.gz',
+       'DISTRIBUTION'  => 'KANE/Archive-Extract-0.34.tar.gz',
        'FILES'         => q[lib/Archive/Extract.pm lib/Archive/Extract],
        'CPAN'          => 1,
        'UPSTREAM'      => 'cpan',
+       'BUGS'          => 'bug-archive-extract@rt.cpan.org',
        },
 
     'Archive::Tar' =>
        {
        'MAINTAINER'    => 'kane',
-       'DISTRIBUTION'  => 'KANE/Archive-Tar-1.48.tar.gz',
+       'DISTRIBUTION'  => 'KANE/Archive-Tar-1.52.tar.gz',
        'FILES'         => q[lib/Archive/Tar.pm lib/Archive/Tar],
        'CPAN'          => 1,
        'UPSTREAM'      => 'cpan',
+       'BUGS'          => 'bug-archive-tar@rt.cpan.org',
        },
 
     'Attribute::Handlers' =>
        {
        'MAINTAINER'    => 'rgarcia',
-       'DISTRIBUTION'  => 'SMUELLER/Attribute-Handlers-0.83.tar.gz',
+       'DISTRIBUTION'  => 'SMUELLER/Attribute-Handlers-0.86.tar.gz',
        'FILES'         => q[ext/Attribute-Handlers],
        'CPAN'          => 1,
        'UPSTREAM'      => "blead",
@@ -150,8 +205,27 @@ package Maintainers;
     'autodie' =>
        {
        'MAINTAINER'    => 'pjf',
-       'DISTRIBUTION'  => 'PJF/autodie-1.999.tar.gz',
+       'DISTRIBUTION'  => 'PJF/autodie-2.06_01.tar.gz',
        'FILES'         => q[lib/Fatal.pm lib/autodie.pm lib/autodie],
+       'EXCLUDED'      => [ qr{^inc/Module/},
+
+                             # All these tests depend upon external
+                             # modules that don't exist when we're
+                             # building the core.  Hence, they can
+                             # never run, and should not be merged.
+
+                            qw(
+                               t/boilerplate.t
+                               t/critic.t
+                               t/fork.t
+                               t/kwalitee.t
+                               t/lex58.t
+                               t/pod-coverage.t
+                               t/pod.t
+                               t/socket.t
+                               t/system.t
+                             )
+                          ],
        'CPAN'          => 1,
        'UPSTREAM'      => 'cpan',
        },
@@ -159,8 +233,9 @@ package Maintainers;
     'AutoLoader' =>
        {
        'MAINTAINER'    => 'smueller',
-       'DISTRIBUTION'  => 'SMUELLER/AutoLoader-5.68.tar.gz',
+       'DISTRIBUTION'  => 'SMUELLER/AutoLoader-5.69.tar.gz',
        'FILES'         => q[lib/AutoLoader.pm lib/AutoSplit.pm lib/AutoLoader],
+       'EXCLUDED'      => [ qw( t/00pod.t ) ],
        'CPAN'          => 1,
        'UPSTREAM'      => "cpan",
        },
@@ -170,7 +245,7 @@ package Maintainers;
        'MAINTAINER'    => 'smccam',
        'FILES'         => q[ext/B/B/Concise.pm ext/B/t/concise.t],
        'CPAN'          => 0,
-       'UPSTREAM'      => undef,
+       'UPSTREAM'      => 'blead',
        },
 
     'B::Debug' =>
@@ -178,8 +253,13 @@ package Maintainers;
        'MAINTAINER'    => 'rurban',
        'DISTRIBUTION'  => 'RURBAN/B-Debug-1.11.tar.gz',
        'FILES'         => q[ext/B/B/Debug.pm ext/B/t/debug.t],
+       'EXCLUDED'      => [ qw( t/coverage.html t/pod.t ) ],
+       'MAP'           => { 'Debug.pm' => 'ext/B/B/Debug.pm',
+                            't/debug.t'=> 'ext/B/t/debug.t',
+                          },
        'CPAN'          => 1,
        'UPSTREAM'      => undef,
+       'UPSTREAM'      => 'blead',
        },
 
     'B::Deparse' =>
@@ -194,9 +274,15 @@ package Maintainers;
        {
        'MAINTAINER'    => 'jjore',
        'DISTRIBUTION'  => 'JJORE/B-Lint-1.11.tar.gz',
-       'FILES'         => q[ext/B/B/Lint.pm ext/B/t/lint.t
-                           ext/B/B/Lint/Debug.pm
-                           ext/B/t/pluglib/B/Lint/Plugin/Test.pm],
+       'FILES'         => q[ext/B/B/Lint.pm
+                            ext/B/t/lint.t
+                            ext/B/B/Lint/Debug.pm
+                            ext/B/t/pluglib/B/Lint/Plugin/Test.pm
+                           ],
+       'EXCLUDED'      => [ qw( t/test.pl ) ],
+       'MAP'           => { 'lib/B/'   => 'ext/B/B/',
+                            't/'       => 'ext/B/t/',
+                          },
        'CPAN'          => 1,
        'UPSTREAM'      => undef,
        },
@@ -204,8 +290,9 @@ package Maintainers;
     'base' =>
        {
        'MAINTAINER'    => 'rgarcia',
-       'DISTRIBUTION'  => 'RGARCIA/base-2.12.tar.gz',
+       'DISTRIBUTION'  => 'RGARCIA/base-2.14.tar.gz',
        'FILES'         => q[lib/base.pm lib/fields.pm lib/base],
+       'EXCLUDED'      => [ qw( t/Dummy.pm ) ],
        'CPAN'          => 1,
        'UPSTREAM'      => "blead",
        },
@@ -214,7 +301,12 @@ package Maintainers;
        {
        'MAINTAINER'    => 'tels',
        'DISTRIBUTION'  => 'TELS/math/bignum-0.23.tar.gz',
-       'FILES'         => q[lib/big{int,num,rat}.pm lib/bignum],
+       'FILES'         => q[lib/big{int,num,rat}.pm
+                            lib/bignum
+                            lib/Math/BigInt/Trace.pm
+                            lib/Math/BigFloat/Trace.pm
+                           ],
+       'EXCLUDED'      => [ qr{^inc/Module/}, qw(t/pod.t t/pod_cov.t) ],
        'CPAN'          => 1,
        'UPSTREAM'      => undef,
        },
@@ -222,8 +314,19 @@ package Maintainers;
     'CGI' =>
        {
        'MAINTAINER'    => 'lstein',
-       'DISTRIBUTION'  => 'LDS/CGI.pm-3.43.tar.gz',
+       'DISTRIBUTION'  => 'LDS/CGI.pm-3.45.tar.gz',
        'FILES'         => q[lib/CGI.pm lib/CGI],
+       'EXCLUDED'      => [ qr{^t/lib/Test},
+                               qw( cgi-lib_porting.html
+                                   cgi_docs.html
+                                   examples/WORLD_WRITABLE/18.157.1.253.sav
+                                   t/gen-tests/gen-start-end-tags.pl
+                               )
+                          ],
+       'MAP'           => { 'examples/' => 'lib/CGI/eg/',
+                            'lib/'      => 'lib/',
+                            ''          => 'lib/CGI/',
+                          },
        'CPAN'          => 1,
        'UPSTREAM'      => undef,
        },
@@ -240,8 +343,14 @@ package Maintainers;
     'Compress::Raw::Bzip2' =>
        {
        'MAINTAINER'    => 'pmqs',
-       'DISTRIBUTION'  => 'PMQS/Compress-Raw-Bzip2-2.019.tar.gz',
+       'DISTRIBUTION'  => 'PMQS/Compress-Raw-Bzip2-2.020.tar.gz',
        'FILES'         => q[ext/Compress-Raw-Bzip2],
+       'EXCLUDED'      => [ qr{^t/Test/},
+                            # NB: we use the CompTestUtils.pm
+                            # from IO-Compress instead
+                            qw( bzip2-src/bzip2-cpp.patch
+                            )
+                          ],
        'CPAN'          => 1,
        'UPSTREAM'      => undef,
        },
@@ -249,8 +358,18 @@ package Maintainers;
     'Compress::Raw::Zlib' =>
        {
        'MAINTAINER'    => 'pmqs',
-       'DISTRIBUTION'  => 'PMQS/Compress-Raw-Zlib-2.019.tar.gz',
+       'DISTRIBUTION'  => 'PMQS/Compress-Raw-Zlib-2.020.tar.gz',
+
        'FILES'         => q[ext/Compress-Raw-Zlib],
+                            # NB: we use the CompTestUtils.pm
+                            # from IO-Compress instead
+       'EXCLUDED'      => [ qr{^t/Test/},
+                            qw( t/000prereq.t
+                                t/99pod.t
+                              )
+                          ],
+       'MAP'           => { '' => 'ext/Compress-Raw-Zlib/',
+                          },
        'CPAN'          => 1,
        'UPSTREAM'      => undef,
        },
@@ -260,15 +379,64 @@ package Maintainers;
        'MAINTAINER'    => 'saper',
        'DISTRIBUTION'  => 'SAPER/constant-1.17.tar.gz',
        'FILES'         => q[lib/constant.{pm,t}],
+       'EXCLUDED'      => [ qw( t/00-load.t
+                                t/more-tests.t
+                                t/pod-coverage.t
+                                t/pod.t
+                                eg/synopsis.pl
+                              )
+                          ],
+       'MAP'           => { 'lib/' => 'lib/',
+                            't/'   => 'lib/',
+                          },
        'CPAN'          => 1,
-       'UPSTREAM'      => undef,
+       'UPSTREAM'      => 'blead',
        },
 
     'CPAN' =>
        {
        'MAINTAINER'    => 'andk',
-       'DISTRIBUTION'  => 'ANDK/CPAN-1.94.tar.gz',
+       'DISTRIBUTION'  => 'ANDK/CPAN-1.9402.tar.gz',
        'FILES'         => q[lib/CPAN.pm lib/CPAN],
+       'EXCLUDED'      => [ qr{^distroprefs/},
+                            qr{^inc/Test/},
+                            qr{^t/CPAN/authors/},
+                            qw{
+                               lib/CPAN/Admin.pm
+                               SlayMakefile
+                               t/00signature.t
+                               t/04clean_load.t
+                               t/12cpan.t
+                               t/13tarzip.t
+                               t/14forkbomb.t
+                               t/30shell.coverage
+                               t/30shell.t
+                               t/31sessions.t
+                               t/41distribution.t
+                               t/42distroprefs.t
+                               t/43distroprefspref.t
+                               t/50pod.t
+                               t/51pod.t
+                               t/52podcover.t
+                               t/60credentials.t
+                               t/70_critic.t
+                               t/CPAN/CpanTestDummies-1.55.pm
+                               t/CPAN/TestConfig.pm
+                               t/CPAN/TestMirroredBy
+                               t/CPAN/TestPatch.txt
+                               t/CPAN/modules/02packages.details.txt
+                               t/CPAN/modules/03modlist.data
+                               t/data/META-dynamic.yml
+                               t/data/META-static.yml
+                               t/local_utils.pm
+                               t/perlcriticrc
+                               t/yaml_code.yml
+                              },
+                          ],
+       'MAP'           => { 'lib/'     => 'lib/',
+                            ''         => 'lib/CPAN/',
+                            'scripts/' => 'lib/CPAN/bin/',
+                          },
        'CPAN'          => 1,
        'UPSTREAM'      => 'CPAN',
        },
@@ -276,34 +444,59 @@ package Maintainers;
     'CPANPLUS' =>
        {
        'MAINTAINER'    => 'kane',
-       'DISTRIBUTION'  => 'KANE/CPANPLUS-0.8601.tar.gz',
+       'DISTRIBUTION'  => 'KANE/CPANPLUS-0.88.tar.gz',
        'FILES'         => q[lib/CPANPLUS.pm
-                            lib/CPANPLUS/Backend lib/CPANPLUS/Backend.pm
+                            lib/CPANPLUS/Backend
+                            lib/CPANPLUS/Backend.pm
                             lib/CPANPLUS/bin
                             lib/CPANPLUS/Config.pm
-                            lib/CPANPLUS/Configure lib/CPANPLUS/Configure.pm
+                            lib/CPANPLUS/Configure
+                            lib/CPANPLUS/Configure.pm
                             lib/CPANPLUS/Error.pm
                             lib/CPANPLUS/FAQ.pod
                             lib/CPANPLUS/Hacking.pod
                             lib/CPANPLUS/inc.pm
-                            lib/CPANPLUS/Internals lib/CPANPLUS/Internals.pm
-                            lib/CPANPLUS/Module lib/CPANPLUS/Module.pm
+                            lib/CPANPLUS/Internals
+                            lib/CPANPLUS/Internals.pm
+                            lib/CPANPLUS/Module
+                            lib/CPANPLUS/Module.pm
                             lib/CPANPLUS/Selfupdate.pm
-                            lib/CPANPLUS/Shell lib/CPANPLUS/Shell.pm
-                            lib/CPANPLUS/Dist.pm lib/CPANPLUS/Dist/Base.pm
+                            lib/CPANPLUS/Shell
+                            lib/CPANPLUS/Shell.pm
+                            lib/CPANPLUS/Dist.pm
+                            lib/CPANPLUS/Dist/Base.pm
                             lib/CPANPLUS/Dist/Autobundle.pm
-                            lib/CPANPLUS/Dist/MM.pm lib/CPANPLUS/Dist/Sample.pm
+                            lib/CPANPLUS/Dist/MM.pm
+                            lib/CPANPLUS/Dist/Sample.pm
                             lib/CPANPLUS/t
                            ],
+       'EXCLUDED'      => [ qr{^inc/},
+                            qr{^t/dummy-.*\.hidden$},
+                            qw{ bin/cpanp-boxed },
+                            # SQLite tests would be skipped in core, and
+                            # the filenames are too long for VMS!
+                            qw{
+                                t/031_CPANPLUS-Internals-Source-SQLite.t
+                                t/032_CPANPLUS-Internals-Source-via-sqlite.t
+                              },
+                          ],
        'CPAN'          => 1,
        'UPSTREAM'      => 'cpan',
+       'BUGS'          => 'bug-cpanplus@rt.cpan.org',
        },
 
     'CPANPLUS::Dist::Build' =>
        {
        'MAINTAINER'    => 'bingos',
-       'DISTRIBUTION'  => 'BINGOS/CPANPLUS-Dist-Build-0.30.tar.gz',
-       'FILES'         => q[lib/CPANPLUS/Dist/Build.pm lib/CPANPLUS/Dist/Build],
+       'DISTRIBUTION'  => 'BINGOS/CPANPLUS-Dist-Build-0.38.tar.gz',
+       'FILES'         => q[lib/CPANPLUS/Dist/Build.pm
+                            lib/CPANPLUS/Dist/Build
+                           ],
+       'EXCLUDED'      => [ qr{^inc/},
+                            qw{ t/99_pod.t
+                                t/99_pod_coverage.t
+                              },
+                          ],
        'CPAN'          => 1,
        'UPSTREAM'      => 'cpan',
        },
@@ -311,7 +504,7 @@ package Maintainers;
     'Data::Dumper' =>
        {
        'MAINTAINER'    => 'p5p', # Not gsar. Not ilyam
-       'DISTRIBUTION'  => 'ILYAM/Data-Dumper-2.121.tar.gz',
+       'DISTRIBUTION'  => 'SMUELLER/Data-Dumper-2.125.tar.gz',
        'FILES'         => q[ext/Data-Dumper],
        'CPAN'          => 1,
        'UPSTREAM'      => 'blead',
@@ -322,6 +515,12 @@ package Maintainers;
        'MAINTAINER'    => 'pmqs',
        'DISTRIBUTION'  => 'PMQS/DB_File-1.820.tar.gz',
        'FILES'         => q[ext/DB_File],
+       'EXCLUDED'      => [ qr{^patches/},
+                            qw{ t/pod.t
+                                fallback.h
+                                fallback.xs
+                              },
+                          ],
        'CPAN'          => 1,
        'UPSTREAM'      => undef,
        },
@@ -329,8 +528,9 @@ package Maintainers;
     'Devel::PPPort' =>
        {
        'MAINTAINER'    => 'mhx',
-       'DISTRIBUTION'  => 'MHX/Devel-PPPort-3.17.tar.gz',
+       'DISTRIBUTION'  => 'MHX/Devel-PPPort-3.19.tar.gz',
        'FILES'         => q[ext/Devel-PPPort],
+       'EXCLUDED'      => [ qw{PPPort.pm} ], # we use PPPort_pm.PL instead
        'CPAN'          => 1,
        'UPSTREAM'      => 'cpan',
        },
@@ -338,8 +538,13 @@ package Maintainers;
     'Digest' =>
        {
        'MAINTAINER'    => 'gaas',
-       'DISTRIBUTION'  => 'GAAS/Digest-1.15.tar.gz',
+       'DISTRIBUTION'  => 'GAAS/Digest-1.16.tar.gz',
        'FILES'         => q[lib/Digest.pm lib/Digest],
+       'EXCLUDED'      => [ qw{digest-bench} ],
+       'MAP'           => { 'Digest/'  => 'lib/Digest/',
+                            'Digest.pm'=> 'lib/Digest.pm',
+                            ''         => 'lib/Digest/',
+                          },
        'CPAN'          => 1,
        'UPSTREAM'      => undef,
        },
@@ -347,8 +552,9 @@ package Maintainers;
     'Digest::MD5' =>
        {
        'MAINTAINER'    => 'gaas',
-       'DISTRIBUTION'  => 'GAAS/Digest-MD5-2.38.tar.gz',
+       'DISTRIBUTION'  => 'GAAS/Digest-MD5-2.39.tar.gz',
        'FILES'         => q[ext/Digest-MD5],
+       'EXCLUDED'      => [ qw{rfc1321.txt} ],
        'CPAN'          => 1,
        'UPSTREAM'      => undef,
        },
@@ -358,6 +564,10 @@ package Maintainers;
        'MAINTAINER'    => 'mshelor',
        'DISTRIBUTION'  => 'MSHELOR/Digest-SHA-5.47.tar.gz',
        'FILES'         => q[ext/Digest-SHA],
+       'EXCLUDED'      => [ qw{t/pod.t t/podcover.t examples/dups} ],
+       'MAP'           => { 'shasum'   => 'ext/Digest-SHA/bin/shasum',
+                            ''         => 'ext/Digest-SHA/',
+                          },
        'CPAN'          => 1,
        'UPSTREAM'      => undef,
        },
@@ -365,8 +575,9 @@ package Maintainers;
     'Encode' =>
        {
        'MAINTAINER'    => 'dankogai',
-       'DISTRIBUTION'  => 'DANKOGAI/Encode-2.33.tar.gz',
+       'DISTRIBUTION'  => 'DANKOGAI/Encode-2.35.tar.gz',
        'FILES'         => q[ext/Encode],
+       'EXCLUDED'      => [ qw{t/piconv.t} ], # FIXME
        'CPAN'          => 1,
        'UPSTREAM'      => undef,
        },
@@ -376,23 +587,25 @@ package Maintainers;
        'MAINTAINER'    => 'audreyt',
        'DISTRIBUTION'  => 'AUDREYT/encoding-warnings-0.11.tar.gz',
        'FILES'         => q[lib/encoding/warnings.pm lib/encoding/warnings],
+       'EXCLUDED'      => [ qr{^inc/Module/},
+                            qw{t/0-signature.t},
+                          ],
        'CPAN'          => 1,
        'UPSTREAM'      => undef,
        },
 
-    'Errno' =>
-       {
-       'MAINTAINER'    => 'p5p', # Not gbarr.
-       'FILES'         => q[ext/Errno],
-       'CPAN'          => 0,
-       'UPSTREAM'      => undef,
-       },
-
     'Exporter' =>
        {
        'MAINTAINER'    => 'ferreira',
        'DISTRIBUTION'  => 'FERREIRA/Exporter-5.63.tar.gz',
-       'FILES'         => q[lib/Exporter.pm lib/Exporter.t lib/Exporter/Heavy.pm],
+       'FILES'         => q[lib/Exporter.pm
+                            lib/Exporter.t
+                            lib/Exporter/Heavy.pm
+                           ],
+       'EXCLUDED'      => [ qw{t/pod.t t/use.t}, ],
+       'MAP'           => { 't/'       => 'lib/',
+                            'lib/'     => 'lib/',
+                          },
        'CPAN'          => 1,
        'UPSTREAM'      => undef,
        },
@@ -400,10 +613,11 @@ package Maintainers;
     'ExtUtils::CBuilder' =>
        {
        'MAINTAINER'    => 'kwilliams',
-       'DISTRIBUTION'  => 'KWILLIAMS/ExtUtils-CBuilder-0.24.tar.gz',
+       'DISTRIBUTION'  => 'DAGOLDEN/ExtUtils-CBuilder-0.2602.tar.gz',
        'FILES'         => q[lib/ExtUtils/CBuilder.pm lib/ExtUtils/CBuilder],
+       'EXCLUDED'      => [ qw{devtools} ],
        'CPAN'          => 1,
-       'UPSTREAM'      => undef,
+       'UPSTREAM'      => 'cpan',
        },
 
     'ExtUtils::Command' =>
@@ -411,7 +625,17 @@ package Maintainers;
        'MAINTAINER'    => 'rkobes',
        'DISTRIBUTION'  => 'RKOBES/ExtUtils-Command-1.16.tar.gz',
        'FILES'         => q[lib/ExtUtils/Command.pm
-                            lib/ExtUtils/t/{cp,eu_command}.t],
+                            lib/ExtUtils/t/{cp,eu_command}.t
+                           ],
+       'EXCLUDED'      => [ qw{ t/shell_command.t
+                                t/shell_exit.t
+                                t/lib/TieOut.pm
+                                lib/Shell/Command.pm
+                              },
+                          ],
+       'MAP'           => { 't/'       => 'lib/ExtUtils/t/',
+                            'lib/'     => 'lib/',
+                          },
        'CPAN'          => 1,
        'UPSTREAM'      => undef,
        },
@@ -420,8 +644,18 @@ package Maintainers;
        {
        'MAINTAINER'    => 'nwclark',
        'DISTRIBUTION'  => 'NWCLARK/ExtUtils-Constant-0.16.tar.gz',
-       'FILES'         => q[lib/ExtUtils/Constant.pm lib/ExtUtils/Constant
-                            lib/ExtUtils/t/Constant.t],
+       'FILES'         => q[lib/ExtUtils/Constant.pm
+                            lib/ExtUtils/Constant
+                            lib/ExtUtils/t/Constant.t
+                           ],
+       'EXCLUDED'      => [ qw{ lib/ExtUtils/Constant/Aaargh56Hash.pm
+                                examples/perl_keyword.pl
+                                examples/perl_regcomp_posix_keyword.pl
+                              },
+                          ],
+       'MAP'           => { 't/'       => 'lib/ExtUtils/t/',
+                            'lib/'     => 'lib/',
+                          },
        'CPAN'          => 1,
        'UPSTREAM'      => undef,
        },
@@ -429,13 +663,27 @@ package Maintainers;
     'ExtUtils::Install' =>
        {
        'MAINTAINER'    => 'yves',
-       'DISTRIBUTION'  => 'YVES/ExtUtils-Install-1.52.tar.gz',
-       # MakeMaker has a basic.t too, and we use that.
+       'DISTRIBUTION'  => 'YVES/ExtUtils-Install-1.54.tar.gz',
        'FILES'         => q[lib/ExtUtils/{Install,Installed,Packlist}.pm
                              lib/ExtUtils/Changes_EU-Install
                             lib/ExtUtils/t/Installed.t
-                            lib/ExtUtils/t/basic.pl
+                            lib/ExtUtils/t/InstallWithMM.t
                             lib/ExtUtils/t/{Install,Installapi2,Packlist,can_write_dir}.t],
+       'EXCLUDED'      => [ qw{ t/lib/MakeMaker/Test/Setup/BFD.pm
+                                t/lib/MakeMaker/Test/Utils.pm
+                                t/lib/Test/Builder.pm
+                                t/lib/Test/Builder/Module.pm
+                                t/lib/Test/More.pm
+                                t/lib/Test/Simple.pm
+                                t/lib/TieOut.pm
+                                t/pod-coverage.t
+                                t/pod.t
+                              },
+                          ],
+       'MAP'           => { 't/'       => 'lib/ExtUtils/t/',
+                            'lib/'     => 'lib/',
+                            'Changes'  => 'lib/ExtUtils/Changes_EU-Install',
+                          },
        'CPAN'          => 1,
        'UPSTREAM'      => 'blead',
        },
@@ -443,14 +691,29 @@ package Maintainers;
     'ExtUtils::MakeMaker' =>
        {
        'MAINTAINER'    => 'mschwern',
-       'DISTRIBUTION'  => 'MSCHWERN/ExtUtils-MakeMaker-6.52.tar.gz',
+       'DISTRIBUTION'  => 'MSCHWERN/ExtUtils-MakeMaker-6.55_02.tar.gz',
+                           # note that t/lib/TieOut.pm is included in
+                           # more than one distro
        'FILES'         => q[lib/ExtUtils/{Liblist,MakeMaker,Mkbootstrap,Mksymlists,MM*,MY,testlib}.pm
                             lib/ExtUtils/{Command,Liblist,MakeMaker}
                             lib/ExtUtils/t/{[0-9FLV-Zabdf-z]*,IN*,Mkbootstrap,MM_*,PL_FILES,cd,config}.t
+                            lib/ExtUtils/t/testdata/
+                            lib/ExtUtils/t/MakeMaker_Parameters.t
                             lib/ExtUtils/Changes
                             lib/ExtUtils/{NOTES,PATCHING,README,TODO}
                             lib/ExtUtils/instmodsh
-                            t/lib/MakeMaker t/lib/TieIn.pm t/lib/TieOut.pm],
+                            t/lib/MakeMaker
+                            t/lib/TieIn.pm
+                            t/lib/TieOut.pm
+                           ],
+       'EXCLUDED'      => [ qr{^t/lib/Test/},
+                            qr{^inc/ExtUtils/},
+                          ],
+       'MAP'           => { ''         => 'lib/ExtUtils/',
+                            'lib/'     => 'lib/',
+                            't/lib/'   => 't/lib/',
+                            'bin/'     => 'lib/ExtUtils/',
+                          },
        'CPAN'          => 1,
        'UPSTREAM'      => 'first-come',
        },
@@ -459,7 +722,12 @@ package Maintainers;
        {
        'MAINTAINER'    => 'rkobes',
        'DISTRIBUTION'  => 'RKOBES/ExtUtils-Manifest-1.56.tar.gz',
-       'FILES'         => q[lib/ExtUtils/{Manifest.pm,MANIFEST.SKIP} lib/ExtUtils/t/Manifest.t],
+       'FILES'         => q[lib/ExtUtils/{Manifest.pm,MANIFEST.SKIP}
+                            lib/ExtUtils/t/Manifest.t
+                           ],
+       'MAP'           => { ''         => 'lib/ExtUtils/',
+                            'lib/'     => 'lib/',
+                          },
        'CPAN'          => 1,
        'UPSTREAM'      => undef,
        },
@@ -467,10 +735,13 @@ package Maintainers;
     'ExtUtils::ParseXS' =>
        {
        'MAINTAINER'    => 'kwilliams',
-       'DISTRIBUTION'  => 'KWILLIAMS/ExtUtils-ParseXS-2.19.tar.gz',
-       'FILES'         => q[lib/ExtUtils/ParseXS.pm lib/ExtUtils/ParseXS],
+       'DISTRIBUTION'  => 'DAGOLDEN/ExtUtils-ParseXS-2.2002.tar.gz',
+       'FILES'         => q[lib/ExtUtils/ParseXS.pm
+                            lib/ExtUtils/ParseXS
+                            lib/ExtUtils/xsubpp
+                           ],
        'CPAN'          => 1,
-       'UPSTREAM'      => undef,
+       'UPSTREAM'      => 'cpan',
        },
 
     'faq' =>
@@ -484,7 +755,7 @@ package Maintainers;
     'File::Fetch' =>
        {
        'MAINTAINER'    => 'kane',
-       'DISTRIBUTION'  => 'KANE/File-Fetch-0.18.tar.gz',
+       'DISTRIBUTION'  => 'KANE/File-Fetch-0.20.tar.gz',
        'FILES'         => q[lib/File/Fetch.pm lib/File/Fetch],
        'CPAN'          => 1,
        'UPSTREAM'      => 'cpan',
@@ -493,8 +764,16 @@ package Maintainers;
     'File::Path' =>
        {
        'MAINTAINER'    => 'dland',
-       'DISTRIBUTION'  => 'DLAND/File-Path-2.07.tar.gz',
+       'DISTRIBUTION'  => 'DLAND/File-Path-2.07_03.tar.gz',
        'FILES'         => q[lib/File/Path.pm lib/File/Path.t],
+       'EXCLUDED'      => [ qw{eg/setup-extra-tests
+                               t/pod.t
+                               t/taint.t
+                              }
+                          ],
+       'MAP'           => { ''         => 'lib/File/',
+                            't/'       => 'lib/File/',
+                          },
        'CPAN'          => 1,
        'UPSTREAM'      => undef,
        },
@@ -502,8 +781,15 @@ package Maintainers;
     'File::Temp' =>
        {
        'MAINTAINER'    => 'tjenness',
-       'DISTRIBUTION'  => 'TJENNESS/File-Temp-0.21.tar.gz',
+       'DISTRIBUTION'  => 'TJENNESS/File-Temp-0.22.tar.gz',
        'FILES'         => q[lib/File/Temp.pm lib/File/Temp],
+       'EXCLUDED'      => [ qw{misc/benchmark.pl
+                               misc/results.txt
+                              }
+                          ],
+       'MAP'           => { ''         => 'lib/File/',
+                            't/'       => 'lib/File/Temp/t/',
+                          },
        'CPAN'          => 1,
        'UPSTREAM'      => undef,
        },
@@ -512,8 +798,17 @@ package Maintainers;
        {
        'MAINTAINER'    => 'smueller',
        'DISTRIBUTION'  => 'SMUELLER/Filter-Simple-0.84.tar.gz',
-       'FILES'         => q[lib/Filter/Simple.pm lib/Filter/Simple
-                           t/lib/Filter/Simple/ ],
+       'FILES'         => q[lib/Filter/Simple.pm
+                            lib/Filter/Simple
+                            t/lib/Filter/Simple/
+                           ],
+       'EXCLUDED'      => [ qw(Makefile.PL MANIFEST README META.yml),
+                            qr{^demo/}
+                          ],
+       'MAP'           => { 't/lib/'   => 't/lib/',
+                            't/'       => 'lib/Filter/Simple/t/',
+                            'Changes'  => 'lib/Filter/Simple/Changes',
+                          },
        'CPAN'          => 1,
        'UPSTREAM'      => "blead",
        },
@@ -521,9 +816,34 @@ package Maintainers;
     'Filter::Util::Call' =>
        {
        'MAINTAINER'    => 'pmqs',
-       'DISTRIBUTION'  => 'PMQS/Filter-1.36.tar.gz',
+       'DISTRIBUTION'  => 'PMQS/Filter-1.37.tar.gz',
        'FILES'         => q[ext/Filter-Util-Call
-                            t/lib/filter-util.pl],
+                            t/lib/filter-util.pl
+                            pod/perlfilter.pod
+                           ],
+       'EXCLUDED'      => [ qr{^decrypt/},
+                            qr{^examples/},
+                            qr{^Exec/},
+                            qr{^lib/Filter/},
+                            qr{^tee/},
+                            qw{ Call/Makefile.PL
+                                Call/ppport.h
+                                Call/typemap
+                                mytest
+                                t/cpp.t
+                                t/decrypt.t
+                                t/exec.t
+                                t/order.t
+                                t/pod.t
+                                t/sh.t
+                                t/tee.t
+                              }
+                          ],
+       'MAP'           => { 'Call/'          => 'ext/Filter-Util-Call/',
+                            'filter-util.pl' => 't/lib/filter-util.pl',
+                            'perlfilter.pod' => 'pod/perlfilter.pod',
+                            ''               => 'ext/Filter-Util-Call/',
+                          },
        'CPAN'          => 1,
        'UPSTREAM'      => undef,
        },
@@ -532,19 +852,26 @@ package Maintainers;
        {
        'MAINTAINER'    => 'jv',
        'DISTRIBUTION'  => 'JV/Getopt-Long-2.38.tar.gz',
-       'FILES'         => q[lib/Getopt/Long.pm lib/Getopt/Long],
+       'FILES'         => q[lib/Getopt/Long.pm
+                            lib/Getopt/Long
+                            lib/newgetopt.pl
+                           ],
+       'EXCLUDED'      => [ qr{^examples/},
+                            qw{perl-Getopt-Long.spec},
+                          ],
        'CPAN'          => 1,
        'UPSTREAM'      => 'cpan',
        },
 
     # Sean has donated it to us.
     # Nothing has changed since his last CPAN release.
+    # (not strictly true: there have been some trivial typo fixes; DAPM 6/2009)
     'I18N::LangTags' =>
        {
        'MAINTAINER'    => 'p5p',
        'DISTRIBUTION'  => 'SBURKE/I18N-LangTags-0.35.tar.gz',
        'FILES'         => q[lib/I18N/LangTags.pm lib/I18N/LangTags],
-       'CPAN'          => 1,
+       'CPAN'          => 0,
        'UPSTREAM'      => 'blead',
        },
 
@@ -553,24 +880,33 @@ package Maintainers;
        'MAINTAINER'    => 'ilyaz',
        'DISTRIBUTION'  => 'ILYAZ/modules/if-0.0401.tar.gz',
        'FILES'         => q[lib/if.{pm,t}],
+       'MAP'           => { 't/' => 'lib/',
+                            ''   => 'lib/',
+                          },
        'CPAN'          => 1,
        'UPSTREAM'      => undef,
        },
 
     'IO' =>
        {
-       'MAINTAINER'    => 'gbarr',
+       'MAINTAINER'    => 'p5p',
        'DISTRIBUTION'  => 'GBARR/IO-1.25.tar.gz',
        'FILES'         => q[ext/IO/],
+       'EXCLUDED'      => [ qw{t/test.pl}, ],
        'CPAN'          => 1,
-       'UPSTREAM'      => undef,
+       'UPSTREAM'      => 'blead',
        },
 
     'IO-Compress' =>
        {
        'MAINTAINER'    => 'pmqs',
-       'DISTRIBUTION'  => 'PMQS/IO-Compress-2.019.tar.gz',
-       'FILES'         => q[ext/IO-Compress],
+       'DISTRIBUTION'  => 'PMQS/IO-Compress-2.020.tar.gz',
+       'FILES'         => q[ext/IO-Compress t/lib/compress ],
+       'EXCLUDED'      => [ qr{t/Test/},
+                            qw{t/cz-03zlib-v1.t},
+                          ],
+       'MAP'           => { ''           => 'ext/IO-Compress/',
+                          },
        'CPAN'          => 1,
        'UPSTREAM'      => undef,
        },
@@ -580,6 +916,9 @@ package Maintainers;
        'MAINTAINER'    => 'tomhughes',
        'DISTRIBUTION'  => 'TOMHUGHES/IO-Zlib-1.09.tar.gz',
        'FILES'         => q[lib/IO/Zlib.pm lib/IO/Zlib],
+       'MAP'           => { 'Zlib.pm' => 'lib/IO/Zlib.pm',
+                            ''        => 'lib/IO/Zlib/',
+                          },
        'CPAN'          => 1,
        'UPSTREAM'      => undef,
        },
@@ -587,7 +926,7 @@ package Maintainers;
     'IPC::Cmd' =>
        {
        'MAINTAINER'    => 'kane',
-       'DISTRIBUTION'  => 'KANE/IPC-Cmd-0.44.tar.gz',
+       'DISTRIBUTION'  => 'KANE/IPC-Cmd-0.46.tar.gz',
        'FILES'         => q[lib/IPC/Cmd lib/IPC/Cmd.pm],
        'CPAN'          => 1,
        'UPSTREAM'      => 'cpan',
@@ -598,6 +937,7 @@ package Maintainers;
        'MAINTAINER'    => 'mhx',
        'DISTRIBUTION'  => 'MHX/IPC-SysV-2.01.tar.gz',
        'FILES'         => q[ext/IPC-SysV],
+       'EXCLUDED'      => [ qw{const-c.inc const-xs.inc} ],
        'CPAN'          => 1,
        'UPSTREAM'      => 'cpan',
        },
@@ -606,8 +946,11 @@ package Maintainers;
        {
        'MAINTAINER'    => 'smueller',
        'DISTRIBUTION'  => 'SMUELLER/lib-0.62.tar.gz',
-       'FILES'         =>
-               q[lib/lib_pm.PL lib/lib.t],
+       'FILES'         => q[lib/lib_pm.PL lib/lib.t],
+       'EXCLUDED'      => [ qw{forPAUSE/lib.pm t/00pod.t} ],
+       'MAP'           => { 'lib_pm.PL' => 'lib/lib_pm.PL',
+                            't/01lib.t' => 'lib/lib.t',
+                          },
        'CPAN'          => 1,
        'UPSTREAM'      => "blead",
        },
@@ -616,8 +959,20 @@ package Maintainers;
        {
        'MAINTAINER'    => 'gbarr',
        'DISTRIBUTION'  => 'GBARR/libnet-1.22.tar.gz',
-       'FILES'         =>
-               q[lib/Net/{Cmd,Config,Domain,FTP,Netrc,NNTP,POP3,SMTP,Time}.pm lib/Net/Changes lib/Net/FTP lib/Net/demos/ lib/Net/*.eg lib/Net/libnetFAQ.pod lib/Net/README lib/Net/t],
+       'FILES'         => q[lib/Net/{Cmd,Config,Domain,FTP,Netrc,NNTP,POP3,SMTP,Time}.pm
+                            lib/Net/Changes
+                            lib/Net/FTP
+                            lib/Net/demos/
+                            lib/Net/*.eg
+                            lib/Net/libnetFAQ.pod
+                            lib/Net/README
+                            lib/Net/t
+                           ],
+       'EXCLUDED'      => [ qw{Configure install-nomake} ],
+       'MAP'           => { 'Net/' => 'lib/Net/',
+                            't/'   => 'lib/Net/t/',
+                            ''     => 'lib/Net/',
+                          },
        'CPAN'          => 1,
        'UPSTREAM'      => undef,
        },
@@ -627,6 +982,11 @@ package Maintainers;
        'MAINTAINER'    => 'neilb',
        'DISTRIBUTION'  => 'NEILB/Locale-Codes-2.07.tar.gz',
        'FILES'         => q[lib/Locale/{Codes,Constants,Country,Currency,Language,Script}*],
+       'MAP'           => { 'lib/' => 'lib/',
+                            ''     => 'lib/Locale/Codes/',
+                            #XXX why is this file renamed???
+                            't/language.t' => 'lib/Locale/Codes/t/languages.t',
+                          },
        'CPAN'          => 1,
        'UPSTREAM'      => undef,
        },
@@ -635,7 +995,15 @@ package Maintainers;
        {
        'MAINTAINER'    => 'ferreira',
        'DISTRIBUTION'  => 'FERREIRA/Locale-Maketext-1.13.tar.gz',
-       'FILES'         => q[lib/Locale/Maketext.pm lib/Locale/Maketext.pod lib/Locale/Maketext/ChangeLog lib/Locale/Maketext/{Guts,GutsLoader}.pm lib/Locale/Maketext/README lib/Locale/Maketext/TPJ13.pod lib/Locale/Maketext/t],
+       'FILES'         => q[lib/Locale/Maketext.pm
+                            lib/Locale/Maketext.pod
+                            lib/Locale/Maketext/ChangeLog
+                            lib/Locale/Maketext/{Guts,GutsLoader}.pm
+                            lib/Locale/Maketext/README
+                            lib/Locale/Maketext/TPJ13.pod
+                            lib/Locale/Maketext/t
+                           ],
+       'EXCLUDED'      => [ qw{perlcriticrc t/00_load.t t/pod.t} ],
        'CPAN'          => 1,
        'UPSTREAM'      => undef,
        },
@@ -644,7 +1012,10 @@ package Maintainers;
        {
        'MAINTAINER'    => 'audreyt',
        'DISTRIBUTION'  => 'AUDREYT/Locale-Maketext-Simple-0.18.tar.gz',
-       'FILES'         => q[lib/Locale/Maketext/Simple.pm lib/Locale/Maketext/Simple],
+       'FILES'         => q[lib/Locale/Maketext/Simple.pm
+                            lib/Locale/Maketext/Simple
+                           ],
+       'EXCLUDED'      => [ qr{^inc/} ],
        'CPAN'          => 1,
        'UPSTREAM'      => undef,
        },
@@ -653,7 +1024,10 @@ package Maintainers;
        {
        'MAINTAINER'    => 'kane',
        'DISTRIBUTION'  => 'KANE/Log-Message-0.02.tar.gz',
-       'FILES'         => q[lib/Log/Message.pm lib/Log/Message/{Config,Handlers,Item}.pm lib/Log/Message/t],
+       'FILES'         => q[lib/Log/Message.pm
+                            lib/Log/Message/{Config,Handlers,Item}.pm
+                            lib/Log/Message/t
+                           ],
        'CPAN'          => 1,
        'UPSTREAM'      => 'cpan',
        },
@@ -662,7 +1036,9 @@ package Maintainers;
        {
        'MAINTAINER'    => 'kane',
        'DISTRIBUTION'  => 'KANE/Log-Message-Simple-0.04.tar.gz',
-       'FILES'         => q[lib/Log/Message/Simple.pm lib/Log/Message/Simple],
+       'FILES'         => q[lib/Log/Message/Simple.pm
+                            lib/Log/Message/Simple
+                           ],
        'CPAN'          => 1,
        'UPSTREAM'      => 'cpan',
        },
@@ -679,9 +1055,25 @@ package Maintainers;
        {
        'MAINTAINER'    => 'tels',
        'DISTRIBUTION'  => 'TELS/math/Math-BigInt-1.89.tar.gz',
-       'FILES'         => q[lib/Math/BigInt.pm lib/Math/BigInt
-                            t/lib/Math
-       'FILES'         => lib/Math/BigFloat.pm lib/Math/BigFloat],
+       'FILES'         => q[lib/Math/BigInt.pm
+                            lib/Math/BigInt
+                            !lib/Math/BigInt/Trace.pm
+                            t/lib/Math/BigInt/
+                            t/lib/Math/BigFloat/
+                            lib/Math/BigFloat.pm
+                           ],
+       'EXCLUDED'      => [ qr{^inc/},
+                            qr{^examples/},
+                            qw{t/pod.t
+                               t/pod_cov.t
+                              }
+                          ],
+       'MAP'           => { 'lib/'    => 'lib/',
+                            't/Math/' => 't/lib/Math/',
+                            ''        => 'lib/Math/BigInt/',
+                            't/new_overloaded.t' =>
+                                       'lib/Math/BigInt/t/new_ovld.t',
+                          },
        'CPAN'          => 1,
        'UPSTREAM'      => undef,
        },
@@ -691,6 +1083,25 @@ package Maintainers;
        'MAINTAINER'    => 'tels',
        'DISTRIBUTION'  => 'TELS/math/Math-BigInt-FastCalc-0.19.tar.gz',
        'FILES'         => q[ext/Math-BigInt-FastCalc],
+       'EXCLUDED'      => [ qr{^inc/},
+                            qw{
+                               t/pod.t
+                               t/pod_cov.t
+                              },
+                            # instead we use the versions of these test
+                            # files that come with Math::BigInt:
+                            qw{t/bigfltpm.inc
+                               t/bigfltpm.t
+                               t/bigintpm.inc
+                               t/bigintpm.t
+                               t/mbimbf.inc
+                               t/mbimbf.t
+                              },
+                          ],
+       'MAP'           => { '' => 'ext/Math-BigInt-FastCalc/',
+                            'lib/Math/BigInt/FastCalc.pm'
+                                   => 'ext/Math-BigInt-FastCalc/FastCalc.pm',
+                          },
        'CPAN'          => 1,
        'UPSTREAM'      => undef,
        },
@@ -699,7 +1110,20 @@ package Maintainers;
        {
        'MAINTAINER'    => 'tels',
        'DISTRIBUTION'  => 'TELS/math/Math-BigRat-0.22.tar.gz',
-       'FILES'         => q[lib/Math/BigRat.pm lib/Math/BigRat],
+       'FILES'         => q[lib/Math/BigRat.pm
+                            lib/Math/BigRat
+                            t/lib/Math/BigRat/
+                           ],
+       'EXCLUDED'      => [ qr{^inc/},
+                            qw{
+                               t/pod.t
+                               t/pod_cov.t
+                              },
+                          ],
+       'MAP'           => { 't/' => 'lib/Math/BigRat/t/',
+                            't/Math/BigRat/Test.pm'
+                                               => 't/lib/Math/BigRat/Test.pm',
+                          },
        'CPAN'          => 1,
        'UPSTREAM'      => undef,
        },
@@ -708,9 +1132,19 @@ package Maintainers;
        {
        'MAINTAINER'    => 'zefram',
        'DISTRIBUTION'  => 'JHI/Math-Complex-1.56.tar.gz',
-       'FILES'         => q[lib/Math/Complex.pm lib/Math/Complex.t
-                            lib/Math/Trig.pm lib/Math/Trig.t
-                            lib/Math/underbar.t],
+       'FILES'         => q[lib/Math/Complex.pm
+                            lib/Math/Complex.t
+                            lib/Math/Trig.pm
+                            lib/Math/Trig.t
+                            lib/Math/underbar.t
+                           ],
+       'EXCLUDED'      => [
+                            qw{
+                               t/pod.t
+                               t/pod-coverage.t
+                              },
+                          ],
+       'MAP'           => { 't/' => 'lib/Math/' },
        'CPAN'          => 1,
        'UPSTREAM'      => 'cpan',
        },
@@ -720,6 +1154,16 @@ package Maintainers;
        'MAINTAINER'    => 'mjd',
        'DISTRIBUTION'  => 'MJD/Memoize-1.01.tar.gz',
        'FILES'         => q[lib/Memoize.pm lib/Memoize],
+       'EXCLUDED'      => [
+                            qw{
+                               article.html
+                               Memoize/Saves.pm
+                              },
+                          ],
+       'MAP'           => { ''           => 'lib/Memoize/',
+                            'Memoize/'   => 'lib/Memoize/',
+                            'Memoize.pm' => 'lib/Memoize.pm',
+                          },
        'CPAN'          => 1,
        'UPSTREAM'      => undef,
        },
@@ -727,8 +1171,9 @@ package Maintainers;
     'MIME::Base64' =>
        {
        'MAINTAINER'    => 'gaas',
-       'DISTRIBUTION'  => 'GAAS/MIME-Base64-3.07.tar.gz',
+       'DISTRIBUTION'  => 'GAAS/MIME-Base64-3.08.tar.gz',
        'FILES'         => q[ext/MIME-Base64],
+       'EXCLUDED'      => [ qw{ t/bad-sv.t }, ],
        'CPAN'          => 1,
        'UPSTREAM'      => undef,
        },
@@ -736,10 +1181,11 @@ package Maintainers;
     'Module::Build' =>
        {
        'MAINTAINER'    => 'kwilliams',
-       'DISTRIBUTION'  => 'EWILHELM/Module-Build-0.33.tar.gz',
+       'DISTRIBUTION'  => 'DAGOLDEN/Module-Build-0.35.tar.gz',
        'FILES'         => q[lib/Module/Build lib/Module/Build.pm],
+       'EXCLUDED'      => [ qw{ t/par.t t/signature.t scripts/bundle.pl}, ],
        'CPAN'          => 1,
-       'UPSTREAM'      => undef,
+       'UPSTREAM'      => 'cpan',
        },
 
     'Module::CoreList' =>
@@ -747,6 +1193,11 @@ package Maintainers;
        'MAINTAINER'    => 'rgarcia',
        'DISTRIBUTION'  => 'RGARCIA/Module-CoreList-2.17.tar.gz',
        'FILES'         => q[lib/Module/CoreList lib/Module/CoreList.pm],
+       'EXCLUDED'      => [ qw{ identify-dependencies t/pod.t} ],
+       'MAP'           => { 'corelist' => 'lib/Module/CoreList/bin/corelist',
+                            'lib/'     => 'lib/',
+                            ''         => 'lib/Module/CoreList/',
+                          },
        'CPAN'          => 1,
        'UPSTREAM'      => "blead",
        },
@@ -765,7 +1216,8 @@ package Maintainers;
        'MAINTAINER'    => 'kane',
        'DISTRIBUTION'  => 'KANE/Module-Load-Conditional-0.30.tar.gz',
        'FILES'         => q[lib/Module/Load/Conditional
-                            lib/Module/Load/Conditional.pm],
+                            lib/Module/Load/Conditional.pm
+                           ],
        'CPAN'          => 1,
        'UPSTREAM'      => 'cpan',
        },
@@ -793,7 +1245,7 @@ package Maintainers;
     'Net::Ping' =>
        {
        'MAINTAINER'    => 'smpeters',
-       'DISTRIBUTION'  => 'SMPETERS/Net-Ping-2.35.tar.gz',
+       'DISTRIBUTION'  => 'SMPETERS/Net-Ping-2.36.tar.gz',
        'FILES'         => q[lib/Net/Ping.pm lib/Net/Ping],
        'CPAN'          => 1,
        'UPSTREAM'      => 'blead',
@@ -802,8 +1254,9 @@ package Maintainers;
     'NEXT' =>
        {
        'MAINTAINER'    => 'rafl',
-       'DISTRIBUTION'  => 'FLORA/NEXT-0.63.tar.gz',
+       'DISTRIBUTION'  => 'FLORA/NEXT-0.64.tar.gz',
        'FILES'         => q[lib/NEXT.pm lib/NEXT],
+       'EXCLUDED'      => [ qr{^demo/} ],
        'CPAN'          => 1,
        'UPSTREAM'      => 'cpan',
        },
@@ -830,6 +1283,9 @@ package Maintainers;
        {
        'MAINTAINER'    => 'kane',
        'DISTRIBUTION'  => 'KANE/Params-Check-0.26.tar.gz',
+       # For some reason a file of this name appears within
+       # the tarball. Russell's Paradox eat your heart out.
+       'EXCLUDED'      => [ qw( Params-Check-0.26.tar.gz ) ],
        'FILES'         => q[lib/Params/Check lib/Params/Check.pm],
        'CPAN'          => 1,
        'UPSTREAM'      => 'cpan',
@@ -848,7 +1304,15 @@ package Maintainers;
        {
        'MAINTAINER'    => 'smueller',
        'DISTRIBUTION'  => 'ADAMK/Parse-CPAN-Meta-1.39.tar.gz',
-       'FILES'         => q[lib/Parse/CPAN/Meta.pm t/lib/Parse/CPAN/Meta/Test.pm lib/Parse/CPAN/Meta],
+       'FILES'         => q[lib/Parse/CPAN/Meta.pm
+                            lib/Parse/CPAN/Meta
+                            t/lib/Parse/CPAN/Meta/Test.pm
+                           ],
+       'EXCLUDED'      => [ qw( t/97_meta.t t/98_pod.t t/99_pmv.t ) ],
+       'MAP'           => { 'lib/'     => 'lib/',
+                            't/lib/'   => 't/lib/',
+                            ''         => 'lib/Parse/CPAN/Meta/',
+                          },
        'CPAN'          => 1,
        'UPSTREAM'      => "cpan",
        },
@@ -857,8 +1321,25 @@ package Maintainers;
        {
        'MAINTAINER'    => 'kwilliams',
        'DISTRIBUTION'  => 'SMUELLER/PathTools-3.30.tar.gz',
-       'FILES'         => q[lib/File/Spec.pm lib/File/Spec,
-                           ext/Cwd lib/Cwd.pm],
+       'FILES'         => q[lib/File/Spec.pm
+                            lib/File/Spec
+                            ext/Cwd
+                            lib/Cwd.pm
+                           ],
+       # XXX note that the CPAN and blead Makefile.PL are totally
+       # unrelated. The blead one is described as 'core-only'.
+       # Perhaps after the big lib/ => ext/ migration it will be possible
+       # to harmonize them?
+       
+       'EXCLUDED'      => [ qr{^t/lib/Test/} ],
+       'MAP'           => { 'lib/'      => 'lib/',
+                            'Cwd.pm'    => 'lib/Cwd.pm',
+                            ''          => 'ext/Cwd/',
+                            't/'        => 'lib/File/Spec/t/',
+                            't/cwd.t'   => 'ext/Cwd/t/cwd.t',
+                            't/taint.t' => 'ext/Cwd/t/taint.t',
+                            't/win32.t' => 'ext/Cwd/t/win32.t',
+                          },
        'CPAN'          => 1,
        'UPSTREAM'      => "cpan",
        },
@@ -885,6 +1366,9 @@ package Maintainers;
        'DISTRIBUTION'  => 'ELIZABETH/PerlIO-via-QuotedPrint-0.06.tar.gz',
        'FILES'         => q[lib/PerlIO/via/QuotedPrint.pm
                             lib/PerlIO/via/t/QuotedPrint.t],
+       'MAP'           => { 'lib/'      => 'lib/',
+                            ''        => 'lib/PerlIO/via/',
+                          },
        'CPAN'          => 1,
        'UPSTREAM'      => undef,
        },
@@ -918,7 +1402,7 @@ package Maintainers;
     'perlreapi' =>
        {
        MAINTAINER      => 'avar',
-       FILES           => 'pod/perlreapi.pod',
+       FILES           => q[pod/perlreapi.pod],
        CPAN            => 0,
        'UPSTREAM'      => undef,
        },
@@ -941,7 +1425,7 @@ package Maintainers;
 
     'Pod::Escapes' =>
        {
-       'MAINTAINER'    => 'sburke',
+       'MAINTAINER'    => 'arandal',
        'DISTRIBUTION'  => 'SBURKE/Pod-Escapes-1.04.tar.gz',
        'FILES'         => q[lib/Pod/Escapes.pm lib/Pod/Escapes],
        'CPAN'          => 1,
@@ -952,15 +1436,66 @@ package Maintainers;
        {
        'MAINTAINER'    => 'tjenness',
        'DISTRIBUTION'  => 'TJENNESS/Pod-LaTeX-0.58.tar.gz',
-       'FILES'         => q[lib/Pod/LaTeX.pm lib/Pod/t/{pod2latex,user}.t],
+       'FILES'         => q[lib/Pod/LaTeX.pm
+                            lib/Pod/t/{pod2latex,user}.t
+                            pod/pod2latex.PL
+                           ],
+       'EXCLUDED'      => [ qw( t/require.t ) ],
+       'MAP'           => { '' => 'lib/Pod/',
+                            'pod2latex.PL' => 'pod/pod2latex.PL',
+                          },
        'CPAN'          => 1,
        'UPSTREAM'      => undef,
        },
 
     'Pod::Parser'      => {
        'MAINTAINER'    => 'marekr',
+
+       # XXX Parser.pm in the 1.38 distribution identifies itself as
+       # version 1.37!
+
        'DISTRIBUTION'  => 'MAREKR/Pod-Parser-1.38.tar.gz',
-       'FILES'         => q[lib/Pod/{Checker,Find,InputObjects,Parser,ParseUtils,PlainText,Select,Usage}.pm lib/Pod/t/contains_pod.t pod/pod{2usage,checker,select}.PL t/lib/contains_bad_pod.xr t/lib/contains_pod.xr t/pod/emptycmd.* t/pod/find.t t/pod/for.* t/pod/headings.* t/pod/include.* t/pod/included.* t/pod/lref.* t/pod/multiline_items.* t/pod/nested_items.* t/pod/nested_seqs.* t/pod/oneline_cmds.* t/pod/pod2usage.* t/pod/podchkenc.* t/pod/poderrs.* t/pod/podselect.* t/pod/special_seqs.* t/pod/testcmp.pl t/pod/testp2pt.pl t/pod/testpchk.pl t/pod/usage*.pod],
+       'FILES'         => q[lib/Pod/{Checker,Find,InputObjects,Parser,ParseUtils,PlainText,Select,Usage}.pm
+                            lib/Pod/t/contains_pod.t
+                            pod/pod{2usage,checker,select}.PL
+                            t/lib/contains_bad_pod.xr
+                            t/lib/contains_pod.xr
+                            t/pod/emptycmd.*
+                            t/pod/find.t
+                            t/pod/for.*
+                            t/pod/headings.*
+                            t/pod/include.*
+                            t/pod/included.*
+                            t/pod/lref.*
+                            t/pod/multiline_items.*
+                            t/pod/nested_items.*
+                            t/pod/nested_seqs.*
+                            t/pod/oneline_cmds.*
+                            t/pod/p2u_data.pl
+                            t/pod/pod2usage.*
+                            t/pod/pod2usage2.t
+                            t/pod/podchkenc.*
+                            t/pod/poderrs.*
+                            t/pod/podselect.*
+                            t/pod/special_seqs.*
+                            t/pod/testcmp.pl
+                            t/pod/testp2pt.pl
+                            t/pod/testpchk.pl
+                            t/pod/testpods/
+                            t/pod/twice.t
+                            t/pod/usage*.pod
+                           ],
+       'MAP'           => { 't/pod/'   => 't/pod/',
+                            'scripts/' => 'pod/',
+                               't/pod/contains_pod.t'
+                               => 'lib/Pod/t/contains_pod.t',
+                            # XXX these two dislocations have required
+                            # t/pod/contains_pod.t to be edited to match
+                            
+                            't/pod/contains_pod.xr' => 't/lib/contains_pod.xr',
+                            't/pod/contains_bad_pod.xr'
+                               => 't/lib/contains_bad_pod.xr',
+                          },
        'CPAN'          => 1,
        'UPSTREAM'      => undef,
        },
@@ -969,7 +1504,17 @@ package Maintainers;
        {
        'MAINTAINER'    => 'ferreira',
        'DISTRIBUTION'  => 'FERREIRA/Pod-Perldoc-3.15.tar.gz',
-       'FILES'         => q[lib/Pod/Perldoc.pm lib/Pod/Perldoc],
+       'FILES'         => q[lib/Pod/Perldoc.pm
+                            lib/Pod/Perldoc
+                            pod/perldoc.pod
+                           ],
+       # in blead, the perldoc executable is generated by perldoc.PL
+       # instead
+       
+       'EXCLUDED'      => [ qw( perldoc ) ],
+       'MAP'           => { 'lib/perldoc.pod' => 'pod/perldoc.pod',
+                            't/'              => 'lib/Pod/Perldoc/t/',
+                          },
        'CPAN'          => 1,
        'UPSTREAM'      => undef,
        },
@@ -986,7 +1531,15 @@ package Maintainers;
        {
        'MAINTAINER'    => 'arandal',
        'DISTRIBUTION'  => 'ARANDAL/Pod-Simple-3.07.tar.gz',
-       'FILES'         => q[lib/Pod/Simple.pm lib/Pod/Simple.pod lib/Pod/Simple],
+       'FILES'         => q[lib/Pod/Simple.pm
+                            lib/Pod/Simple.pod
+                            lib/Pod/Simple
+                           ],
+       # XXX these two files correspond to similar ones in bleed under
+       # pod/, but the bleed ones have newer changes, and also seem to
+       # have been in blead a long time. I'm going to assume then that
+       # the blead versions of these two files are authoritative - DAPM
+       'EXCLUDED'      => [ qw( lib/perlpod.pod lib/perlpodspec.pod ) ],
        'CPAN'          => 1,
        'UPSTREAM'      => undef,
        },
@@ -995,7 +1548,14 @@ package Maintainers;
        {
        'MAINTAINER'    => 'rra',
        'DISTRIBUTION'  => 'RRA/podlators-2.2.2.tar.gz',
-       'FILES'         => q[lib/Pod/{Man,ParseLink,Text,Text/{Color,Overstrike,Termcap}}.pm pod/pod2man.PL pod/pod2text.PL lib/Pod/t/{basic.*,{color,filehandle,man*,parselink,pod-parser,pod-spelling,pod,termcap,text*}.t}],
+       'FILES'         => q[lib/Pod/{Man,ParseLink,Text,Text/{Color,Overstrike,Termcap}}.pm
+                            pod/pod2man.PL
+                            pod/pod2text.PL
+                            lib/Pod/t/{basic.*,{color,filehandle,man*,parselink,pod-parser,pod-spelling,pod,termcap,text*}.t}
+                           ],
+       'MAP'           => { 'scripts/' => 'pod/',
+                            't/'       => 'lib/Pod/t/',
+                          },
        'CPAN'          => 1,
        'UPSTREAM'      => 'cpan',
        },
@@ -1003,7 +1563,7 @@ package Maintainers;
     'Safe' =>
        {
        'MAINTAINER'    => 'rgarcia',
-       'DISTRIBUTION'  => 'RGARCIA/Safe-2.16.tar.gz',
+       'DISTRIBUTION'  => 'RGARCIA/Safe-2.19.tar.gz',
        'FILES'         => q[ext/Safe],
        'CPAN'          => 1,
        'UPSTREAM'      => "blead",
@@ -1013,7 +1573,12 @@ package Maintainers;
        {
        'MAINTAINER'    => 'gbarr',
        'DISTRIBUTION'  => 'GBARR/Scalar-List-Utils-1.21.tar.gz',
+       # Note that perl uses its own version of Makefile.PL
        'FILES'         => q[ext/List-Util],
+       'EXCLUDED'      => [ qr{^inc/Module/},
+                            qr{^inc/Test/},
+                            qw{ mytypemap },
+                          ],
        'CPAN'          => 1,
        'UPSTREAM'      => undef,
        },
@@ -1023,6 +1588,7 @@ package Maintainers;
        'MAINTAINER'    => 'smueller',
        'DISTRIBUTION'  => 'SMUELLER/SelfLoader-1.17.tar.gz',
        'FILES'         => q[lib/SelfLoader.pm lib/SelfLoader],
+       'EXCLUDED'      => [ qw{ t/00pod.t } ],
        'CPAN'          => 1,
        'UPSTREAM'      => "blead",
        },
@@ -1032,6 +1598,10 @@ package Maintainers;
        'MAINTAINER'    => 'ferreira',
        'DISTRIBUTION'  => 'FERREIRA/Shell-0.72.tar.gz',
        'FILES'         => q[lib/Shell.pm lib/Shell.t],
+       'EXCLUDED'      => [ qw{ t/01_use.t t/99_pod.t } ],
+       'MAP'           => { ''  => 'lib/',
+                            't/'=> 'lib/',
+                          },
        'CPAN'          => 1,
        'UPSTREAM'      => undef,
        },
@@ -1041,6 +1611,7 @@ package Maintainers;
        'MAINTAINER'    => 'ams',
        'DISTRIBUTION'  => 'AMS/Storable-2.20.tar.gz',
        'FILES'         => q[ext/Storable],
+       'EXCLUDED'      => [ qr{^t/Test/} ],
        'CPAN'          => 1,
        'UPSTREAM'      => undef,
        },
@@ -1050,6 +1621,9 @@ package Maintainers;
        'MAINTAINER'    => 'rgarcia',
        'DISTRIBUTION'  => 'RGARCIA/Switch-2.14.tar.gz',
        'FILES'         => q[lib/Switch.pm lib/Switch],
+       'MAP'           => { ''  => 'lib/',
+                            't/'=> 'lib/Switch/t/',
+                          },
        'CPAN'          => 1,
        'UPSTREAM'      => "blead",
        },
@@ -1059,16 +1633,16 @@ package Maintainers;
        'MAINTAINER'    => 'saper',
        'DISTRIBUTION'  => 'SAPER/Sys-Syslog-0.27.tar.gz',
        'FILES'         => q[ext/Sys-Syslog],
-       'CPAN'          => 1,
-       'UPSTREAM'      => undef,
-       },
-
-    'Text-Tabs+Wrap' =>
-       {
-       'MAINTAINER'    => 'muir',
-       'DISTRIBUTION'  => 'MUIR/modules/Text-Tabs+Wrap-2009.0305.tar.gz',
-       'FILES'         =>
-               q[lib/Text/{Tabs,Wrap}.pm lib/Text/TabsWrap],
+       'EXCLUDED'      => [ qr{^eg/},
+                            qw{t/data-validation.t
+                               t/distchk.t
+                               t/pod.t
+                               t/podcover.t
+                               t/podspell.t
+                               t/portfs.t
+                               win32/PerlLog.RES
+                              },
+                          ],
        'CPAN'          => 1,
        'UPSTREAM'      => 'cpan',
        },
@@ -1076,8 +1650,15 @@ package Maintainers;
     'Term::ANSIColor' =>
        {
        'MAINTAINER'    => 'rra',
-       'DISTRIBUTION'  => 'RRA/ANSIColor-2.00.tar.gz',
-       'FILES'         => q[lib/Term/ANSIColor.pm lib/Term/ANSIColor],
+       'DISTRIBUTION'  => 'RRA/ANSIColor-2.01.tar.gz',
+       'FILES'         => q{lib/Term/ANSIColor.pm lib/Term/ANSIColor},
+       'EXCLUDED'      => [ qr{^tests/},
+                            qw(t/pod-spelling.t t/pod.t)
+                          ],
+       'MAP'           => {
+                            ''            => 'lib/Term/ANSIColor/',
+                            'ANSIColor.pm'=> 'lib/Term/ANSIColor.pm',
+                          },
        'CPAN'          => 1,
        'UPSTREAM'      => 'cpan',
        },
@@ -1086,7 +1667,11 @@ package Maintainers;
        {
        'MAINTAINER'    => 'jstowe',
        'DISTRIBUTION'  => 'JSTOWE/Term-Cap-1.12.tar.gz',
-       'FILES'         => q[lib/Term/Cap.{pm,t}],
+       'FILES'         => q{lib/Term/Cap.{pm,t}},
+       'MAP'           => {
+                            ''        => 'lib/Term/',
+                            'test.pl' => 'lib/Term/Cap.t',
+                          },
        'CPAN'          => 1,
        'UPSTREAM'      => undef,
        },
@@ -1095,18 +1680,18 @@ package Maintainers;
        {
        'MAINTAINER'    => 'kane',
        'DISTRIBUTION'  => 'KANE/Term-UI-0.20.tar.gz',
-       'FILES'         => q[lib/Term/UI.pm lib/Term/UI],
+       'FILES'         => q{lib/Term/UI.pm lib/Term/UI},
        'CPAN'          => 1,
        'UPSTREAM'      => 'cpan',
        },
 
     'Test' =>
        {
-       'MAINTAINER'    => 'sburke',
-       'DISTRIBUTION'  => 'SBURKE/Test-1.25.tar.gz',
+       'MAINTAINER'    => 'jesse',
+       'DISTRIBUTION'  => 'JESSE/Test-1.25_02.tar.gz',
        'FILES'         => q[lib/Test.pm lib/Test/t],
        'CPAN'          => 1,
-       'UPSTREAM'      => undef,
+       'UPSTREAM'      => 'cpan',
        },
 
     'Test::Harness' =>
@@ -1114,6 +1699,16 @@ package Maintainers;
        'MAINTAINER'    => 'andya',
        'DISTRIBUTION'  => 'ANDYA/Test-Harness-3.17.tar.gz',
        'FILES'         => q[ext/Test-Harness],
+       'EXCLUDED'      => [ qr{^examples/},
+                            qr{^inc/},
+                            qr{^t/lib/Test/},
+                            qr{^xt/},
+                            qw{Changes-2.64
+                               HACKING.pod
+                               perlcriticrc
+                               t/lib/if.pm
+                              }
+                          ],
        'CPAN'          => 1,
        'UPSTREAM'      => undef,
        },
@@ -1121,11 +1716,37 @@ package Maintainers;
     'Test::Simple' =>
        {
        'MAINTAINER'    => 'mschwern',
-       'DISTRIBUTION'  => 'MSCHWERN/Test-Simple-0.88.tar.gz',
-       'FILES'         => q[lib/Test/Simple.pm lib/Test/Simple
-                            lib/Test/Builder.pm lib/Test/Builder
-                            lib/Test/More.pm lib/Test/Tutorial.pod
-                            t/lib/Test/Simple t/lib/Dev/Null.pm],
+       'DISTRIBUTION'  => 'MSCHWERN/Test-Simple-0.92.tar.gz',
+       'FILES'         => q[lib/Test/Simple.pm
+                            lib/Test/Simple
+                            lib/Test/Builder.pm
+                            lib/Test/Builder
+                            lib/Test/More.pm
+                            lib/Test/Tutorial.pod
+                            t/lib/Test/
+                            t/lib/Dev/Null.pm
+                           ],
+       'EXCLUDED'      => [
+                            # NB - TieOut.pm comes with more than one
+                            # distro. We use the MM one
+                            qw{.perlcriticrc
+                               .perltidyrc
+                               t/pod.t
+                               t/pod-coverage.t
+                               t/Builder/reset_outputs.t
+
+                               lib/Test/Builder/IO/Scalar.pm
+
+                               t/lib/TieOut.pm
+                              }
+                          ],
+       'MAP'           => {
+                            'lib/'        => 'lib/',
+                            't/lib/'      => 'lib/Test/Simple/t/lib/',
+                            't/lib/Test/' => 't/lib/Test/',
+                            't/lib/Dev/' =>  't/lib/Dev/',
+                            ''            => 'lib/Test/Simple/',
+                          },
        'CPAN'          => 1,
        'UPSTREAM'      => undef,
        },
@@ -1135,6 +1756,12 @@ package Maintainers;
        'MAINTAINER'    => 'dmanura',
        'DISTRIBUTION'  => 'DCONWAY/Text-Balanced-v2.0.0.tar.gz',
        'FILES'         => q[lib/Text/Balanced.pm lib/Text/Balanced],
+       'EXCLUDED'      => [ qw( t/pod-coverage.t t/pod.t ) ],
+       'MAP'           => { ''            => 'lib/Text/Balanced/',
+                            'lib/'        => 'lib/',
+                            # VMS doesn't like multiple dots?
+                            't/00.load.t' => 'lib/Text/Balanced/t/00-load.t',
+                          },
        'CPAN'          => 1,
        'UPSTREAM'      => undef,
        },
@@ -1144,6 +1771,11 @@ package Maintainers;
        'MAINTAINER'    => 'chorny',
        'DISTRIBUTION'  => 'CHORNY/Text-ParseWords-3.27.zip',
        'FILES'         => q[lib/Text/ParseWords{.pm,.t,}],
+       'EXCLUDED'      => [ qw( t/pod.t ) ],
+       'MAP'           => { ''               => 'lib/Text/',
+                            't/ParseWords.t' => 'lib/Text/ParseWords.t',
+                            't/taint.t'      => 'lib/Text/ParseWords/taint.t',
+                          },
        'CPAN'          => 1,
        'UPSTREAM'      => undef,
        },
@@ -1153,15 +1785,40 @@ package Maintainers;
        'MAINTAINER'    => 'markm',
        'DISTRIBUTION'  => 'MARKM/Text-Soundex-3.03.tar.gz',
        'FILES'         => q[ext/Text-Soundex],
+       'MAP'           => { ''               => 'ext/Text-Soundex/',
+                            # XXX these two files are clearly related,
+                            # but they appear to have diverged
+                            # considerably over the years
+                            'test.pl'        => 'ext/Text-Soundex/t/Soundex.t',
+                          },
        'CPAN'          => 1,
        'UPSTREAM'      => undef,
        },
 
+    'Text-Tabs+Wrap' =>
+       {
+       'MAINTAINER'    => 'muir',
+       'DISTRIBUTION'  => 'MUIR/modules/Text-Tabs+Wrap-2009.0305.tar.gz',
+       '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',
+       },
+
     'Thread::Queue' =>
        {
        'MAINTAINER'    => 'jdhedden',
        'DISTRIBUTION'  => 'JDHEDDEN/Thread-Queue-2.11.tar.gz',
        'FILES'         => q[lib/Thread/Queue.pm lib/Thread/Queue],
+       'EXCLUDED'      => [ qw(examples/queue.pl
+                               t/00_load.t
+                               t/99_pod.t
+                               t/test.pl
+                              ) ],
        'CPAN'          => 1,
        'UPSTREAM'      => 'blead',
        },
@@ -1171,6 +1828,11 @@ package Maintainers;
        'MAINTAINER'    => 'jdhedden',
        'DISTRIBUTION'  => 'JDHEDDEN/Thread-Semaphore-2.09.tar.gz',
        'FILES'         => q[lib/Thread/Semaphore.pm lib/Thread/Semaphore],
+       'EXCLUDED'      => [ qw(examples/semaphore.pl
+                               t/00_load.t
+                               t/99_pod.t
+                               t/test.pl
+                              ) ],
        'CPAN'          => 1,
        'UPSTREAM'      => 'blead',
        },
@@ -1178,8 +1840,13 @@ package Maintainers;
     'threads' =>
        {
        'MAINTAINER'    => 'jdhedden',
-       'DISTRIBUTION'  => 'JDHEDDEN/threads-1.72.tar.gz',
+       'DISTRIBUTION'  => 'JDHEDDEN/threads-1.74.tar.gz',
        'FILES'         => q[ext/threads],
+       'EXCLUDED'      => [ qw(examples/pool.pl
+                               t/pod.t
+                               t/test.pl
+                               threads.h
+                              ) ],
        'CPAN'          => 1,
        'UPSTREAM'      => 'blead',
        },
@@ -1187,8 +1854,13 @@ package Maintainers;
     'threads::shared' =>
        {
        'MAINTAINER'    => 'jdhedden',
-       'DISTRIBUTION'  => 'JDHEDDEN/threads-shared-1.28.tar.gz',
+       'DISTRIBUTION'  => 'JDHEDDEN/threads-shared-1.31.tar.gz',
        'FILES'         => q[ext/threads-shared],
+       'EXCLUDED'      => [ qw(examples/class.pl
+                               shared.h
+                               t/pod.t
+                               t/test.pl
+                              ) ],
        'CPAN'          => 1,
        'UPSTREAM'      => 'blead',
        },
@@ -1207,6 +1879,9 @@ package Maintainers;
        'MAINTAINER'    => 'nuffin',
        'DISTRIBUTION'  => 'NUFFIN/Tie-RefHash-1.38.tar.gz',
        'FILES'         => q[lib/Tie/RefHash.pm lib/Tie/RefHash],
+       'MAP'           => { 'lib/' => 'lib/',
+                            't/'   => 'lib/Tie/RefHash/',
+                          },
        'CPAN'          => 1,
        'UPSTREAM'      => 'cpan',
        },
@@ -1225,6 +1900,10 @@ package Maintainers;
        'MAINTAINER'    => 'drolsky',
        'DISTRIBUTION'  => 'DROLSKY/Time-Local-1.1901.tar.gz',
        'FILES'         => q[lib/Time/Local.{pm,t}],
+       'EXCLUDED'      => [ qw(t/pod-coverage.t t/pod.t) ],
+       'MAP'           => { 'lib/' => 'lib/',
+                            't/'   => 'lib/Time/',
+                          },
        'CPAN'          => 1,
        'UPSTREAM'      => undef,
        },
@@ -1232,7 +1911,7 @@ package Maintainers;
     'Time::Piece' =>
        {
        'MAINTAINER'    => 'msergeant',
-       'DISTRIBUTION'  => 'MSERGEANT/Time-Piece-1.14.tar.gz',
+       'DISTRIBUTION'  => 'MSERGEANT/Time-Piece-1.15.tar.gz',
        'FILES'         => q[ext/Time-Piece],
        'CPAN'          => 1,
        'UPSTREAM'      => undef,
@@ -1243,7 +1922,16 @@ package Maintainers;
        'MAINTAINER'    => 'sadahiro',
        'DISTRIBUTION'  => 'SADAHIRO/Unicode-Collate-0.52.tar.gz',
        'FILES'         => q[lib/Unicode/Collate.pm
-                            lib/Unicode/Collate],
+                            lib/Unicode/Collate
+                           ],
+                           # ignore experimental XS version
+       'EXCLUDED'      => [ qr{X$},
+                            qw{disableXS enableXS }
+                          ],
+       'MAP'           => { ''           => 'lib/Unicode/Collate/',
+                            'Collate.pm' => 'lib/Unicode/Collate.pm',
+                            'Collate/'   => 'lib/Unicode/Collate/',
+                          },
        'CPAN'          => 1,
        'UPSTREAM'      => 'first-come',
        },
@@ -1251,8 +1939,9 @@ package Maintainers;
     'Unicode::Normalize' =>
        {
        'MAINTAINER'    => 'sadahiro',
-       'DISTRIBUTION'  => 'SADAHIRO/Unicode-Normalize-1.02.tar.gz',
+       'DISTRIBUTION'  => 'SADAHIRO/Unicode-Normalize-1.03.tar.gz',
        'FILES'         => q[ext/Unicode-Normalize],
+       'EXCLUDED'      => [ qw{MANIFEST.N Normalize.pmN disableXS enableXS }],
        'CPAN'          => 1,
        'UPSTREAM'      => 'first-come',
        },
@@ -1260,8 +1949,16 @@ package Maintainers;
     'version' =>
        {
        'MAINTAINER'    => 'jpeacock',
-       'DISTRIBUTION'  => 'JPEACOCK/version-0.76.tar.gz',
-       'FILES'         => q[lib/version.pm lib/version.pod lib/version.t],
+       'DISTRIBUTION'  => 'JPEACOCK/version-0.77.tar.gz',
+       'FILES'         => q[lib/version.pm lib/version.pod lib/version.t
+                            lib/version],
+       'EXCLUDED'      => [ qr{^t/.*\.t$}, qr{^vutil/},
+                            qw{lib/version/typemap},
+                            qw{vperl/vpp.pm},
+                          ],
+       'MAP'           => { 'lib/'           => 'lib/',
+                            't/coretests.pm' => 'lib/version.t',
+                          },
        'CPAN'          => 1,
        'UPSTREAM'      => undef,
        },
@@ -1277,8 +1974,11 @@ package Maintainers;
     'warnings' =>
        {
        'MAINTAINER'    => 'pmqs',
-       'FILES'         => q[warnings.pl lib/warnings.{pm,t}
-                            lib/warnings t/lib/warnings],
+       'FILES'         => q[warnings.pl
+                            lib/warnings.{pm,t}
+                            lib/warnings
+                            t/lib/warnings
+                           ],
        'CPAN'          => 0,
        'UPSTREAM'      => undef,
        },
@@ -1305,6 +2005,9 @@ package Maintainers;
        'MAINTAINER'    => 'tyemq',
        'DISTRIBUTION'  => 'CHORNY/Win32API-File-0.1101.zip',
        'FILES'         => q[ext/Win32API-File],
+       'EXCLUDED'      => [ qr{^ex/},
+                            qw{t/pod.t},
+                          ],
        'CPAN'          => 1,
        'UPSTREAM'      => undef,
        },
@@ -1313,9 +2016,17 @@ package Maintainers;
        {
        'MAINTAINER'    => 'saper',
        'DISTRIBUTION'  => 'SAPER/XSLoader-0.10.tar.gz',
-       'FILES'         => q[ext/DynaLoader/t/XSLoader.t ext/DynaLoader/XSLoader_pm.PL],
+       'FILES'         => q[ext/DynaLoader/t/XSLoader.t
+                            ext/DynaLoader/XSLoader_pm.PL
+                           ],
+       'EXCLUDED'      => [ qr{^eg/},
+                            qw{t/pod.t
+                               t/podcover.t
+                               t/portfs.t
+                               XSLoader.pm}, # we use XSLoader_pm.PL
+                          ],
        'CPAN'          => 1,
-       'UPSTREAM'      => undef,
+       'UPSTREAM'      => 'blead',
        },
 
     's2p' =>
@@ -1333,7 +2044,7 @@ package Maintainers;
     # accounted for, and that there are no duplicates:
     #
     #    perl Porting/Maintainers --checkmani lib ext
-    #    perl Porting/Maintainers --checkmani 
+    #    perl Porting/Maintainers --checkmani
 
     '_PERLLIB' =>
        {
@@ -1376,6 +2087,7 @@ package Maintainers;
                                ext/DynaLoader/
                                    !ext/DynaLoader/t/XSLoader.t
                                    !ext/DynaLoader/XSLoader_pm.PL
+                               ext/Errno
                                ext/Fcntl/
                                ext/File-Glob/
                                ext/GDBM_File/
@@ -1417,9 +2129,7 @@ package Maintainers;
                                lib/ExtUtils/Embed.pm
                                lib/ExtUtils/XSSymSet.pm
                                lib/ExtUtils/t/Embed.t
-                               lib/ExtUtils/t/basic_finish.pl
                                lib/ExtUtils/typemap
-                               lib/ExtUtils/xsubpp
                                lib/File/Basename.{pm,t}
                                lib/File/CheckTree.{pm,t}
                                lib/File/Compare.{pm,t}
@@ -1513,7 +2223,6 @@ package Maintainers;
                                lib/less.{pm,t}
                                lib/locale.{pm,t}
                                lib/look.pl
-                               lib/newgetopt.pl
                                lib/open.{pm,t}
                                lib/open2.pl
                                lib/open3.pl