This is a live mirror of the Perl 5 development currently hosted at https://github.com/perl/perl5
move Carp to ext/Carp, preparing for dual-lifing
[perl5.git] / Porting / Maintainers.pl
index b274a08..8ad5471 100755 (executable)
@@ -76,6 +76,7 @@ use File::Glob qw(:case);
     'sadahiro' => 'SADAHIRO Tomoyuki <SADAHIRO@cpan.org>',
     'salva'    => 'Salvador Fandiño García <salva@cpan.org>',
     'saper'    => 'Sébastien Aperghis-Tramoni <saper@cpan.org>',
+    'sartak'   => 'Shawn M Moore <sartak@gmail.com>',
     'sbeck'     => 'Sullivan Beck <sbeck@cpan.org>',
     'sburke'   => 'Sean Burke <sburke@cpan.org>',
     'mschwern' => 'Michael Schwern <mschwern@cpan.org>',
@@ -145,9 +146,11 @@ use File::Glob qw(:case);
 # It defaults to the empty list.
 
 # CUSTOMIZED is a list of files that have been customized within the
-# Perl core.  They should also be listed in EXCLUDED, but this will
-# additionally suppress core-cpan-diff warnings that they differ from
-# the CPAN tarballs
+# Perl core.  Use this whenever patching a cpan upstream distribution
+# or whenever we expect to have a file that differs from the tarball.
+# If the file in blead matches the file in the tarball from CPAN,
+# Porting/core-cpan-diff will warn about it, as it indicates an expected
+# customization might have been lost when updating from upstream
 
 # DEPRECATED contains the *first* version of Perl in which the module
 # was considered deprecated.  It should only be present if the module is
@@ -195,7 +198,7 @@ use File::Glob qw(:case);
     'Archive::Extract' =>
        {
        'MAINTAINER'    => 'kane',
-       'DISTRIBUTION'  => 'BINGOS/Archive-Extract-0.52.tar.gz',
+       'DISTRIBUTION'  => 'BINGOS/Archive-Extract-0.56.tar.gz',
        'FILES'         => q[cpan/Archive-Extract],
        'UPSTREAM'      => 'cpan',
        'BUGS'          => 'bug-archive-extract@rt.cpan.org',
@@ -251,6 +254,7 @@ use File::Glob qw(:case);
                              )
                           ],
        'UPSTREAM'      => 'cpan',
+        'CUSTOMIZED'   => [qw( t/open.t )],
        },
 
     'AutoLoader' =>
@@ -306,7 +310,7 @@ use File::Glob qw(:case);
     'B::Lint' =>
        {
        'MAINTAINER'    => 'jjore',
-       'DISTRIBUTION'  => 'FLORA/B-Lint-1.12.tar.gz',
+       'DISTRIBUTION'  => 'FLORA/B-Lint-1.13.tar.gz',
        'FILES'         => q[dist/B-Lint],
        'EXCLUDED'      => [ qw( t/test.pl ) ],
        'UPSTREAM'      => 'blead',
@@ -330,7 +334,7 @@ use File::Glob qw(:case);
     'bignum' =>
        {
        'MAINTAINER'    => 'rafl',
-       'DISTRIBUTION'  => 'FLORA/bignum-0.25.tar.gz',
+       'DISTRIBUTION'  => 'FLORA/bignum-0.29.tar.gz',
        'FILES'         => q[dist/bignum],
        'EXCLUDED'      => [ qr{^inc/Module/}, qw(t/pod.t t/pod_cov.t) ],
        'UPSTREAM'      => 'blead',
@@ -339,14 +343,14 @@ use File::Glob qw(:case);
     'Carp' =>
        {
        'MAINTAINER'    => 'p5p',
-       'FILES'         => q[lib/Carp.{pm,t} lib/Carp/Heavy.pm],
+       'FILES'         => q[ext/Carp],
        'UPSTREAM'      => 'blead',
        },
 
     'CGI' =>
        {
        'MAINTAINER'    => 'lstein',
-       'DISTRIBUTION'  => 'MARKSTOS/CGI.pm-3.54.tar.gz',
+       'DISTRIBUTION'  => 'MARKSTOS/CGI.pm-3.55.tar.gz',
        'FILES'         => q[cpan/CGI],
        'EXCLUDED'      => [ qr{^t/lib/Test},
                                qw( cgi-lib_porting.html
@@ -357,6 +361,7 @@ use File::Glob qw(:case);
                                )
                           ],
        'UPSTREAM'      => 'cpan',
+       'CUSTOMIZED'    => [qw( t/tmpdir.t)],
        },
 
         'Class::Struct' =>
@@ -369,7 +374,7 @@ use File::Glob qw(:case);
     'Compress::Raw::Bzip2' =>
        {
        'MAINTAINER'    => 'pmqs',
-       'DISTRIBUTION'  => 'PMQS/Compress-Raw-Bzip2-2.035.tar.gz',
+       'DISTRIBUTION'  => 'PMQS/Compress-Raw-Bzip2-2.037.tar.gz',
        'FILES'         => q[cpan/Compress-Raw-Bzip2],
        'EXCLUDED'      => [ qr{^t/Test/},
                             qw( bzip2-src/bzip2-cpp.patch
@@ -381,7 +386,7 @@ use File::Glob qw(:case);
     'Compress::Raw::Zlib' =>
        {
        'MAINTAINER'    => 'pmqs',
-       'DISTRIBUTION'  => 'PMQS/Compress-Raw-Zlib-2.035.tar.gz',
+       'DISTRIBUTION'  => 'PMQS/Compress-Raw-Zlib-2.037.tar.gz',
 
        'FILES'         => q[cpan/Compress-Raw-Zlib],
        'EXCLUDED'      => [ qr{^t/Test/},
@@ -395,7 +400,7 @@ use File::Glob qw(:case);
     'constant' =>
        {
        'MAINTAINER'    => 'saper',
-       'DISTRIBUTION'  => 'SAPER/constant-1.22.tar.gz',
+       'DISTRIBUTION'  => 'SAPER/constant-1.21.tar.gz',
        'FILES'         => q[dist/constant],
        'EXCLUDED'      => [ qw( t/00-load.t
                                 t/more-tests.t
@@ -410,7 +415,7 @@ use File::Glob qw(:case);
     'CPAN' =>
        {
        'MAINTAINER'    => 'andk',
-       'DISTRIBUTION'  => 'ANDK/CPAN-1.9600.tar.gz',
+       'DISTRIBUTION'  => 'ANDK/CPAN-1.9800.tar.gz',
        'FILES'         => q[cpan/CPAN],
        'EXCLUDED'      => [ qr{^distroprefs/},
                             qr{^inc/Test/},
@@ -454,7 +459,7 @@ use File::Glob qw(:case);
     'CPANPLUS' =>
        {
        'MAINTAINER'    => 'kane',
-       'DISTRIBUTION'  => 'BINGOS/CPANPLUS-0.9105.tar.gz',
+       'DISTRIBUTION'  => 'BINGOS/CPANPLUS-0.9110.tar.gz',
        'FILES'         => q[cpan/CPANPLUS],
        'EXCLUDED'      => [ qr{^inc/},
                             qr{^t/dummy-.*\.hidden$},
@@ -465,7 +470,7 @@ use File::Glob qw(:case);
                                 t/031_CPANPLUS-Internals-Source-SQLite.t
                                 t/032_CPANPLUS-Internals-Source-via-sqlite.t
                               },
-                             qw{ Makefile.PL },
+           qw{ Makefile.PL },
                           ],
        'CUSTOMIZED'    => [ qw{ Makefile.PL } ],
        'UPSTREAM'      => 'cpan',
@@ -488,7 +493,7 @@ use File::Glob qw(:case);
     'CPAN::Meta' =>
        {
        'MAINTAINER'    => 'dagolden',
-       'DISTRIBUTION'  => 'DAGOLDEN/CPAN-Meta-2.110930.tar.gz',
+       'DISTRIBUTION'  => 'DAGOLDEN/CPAN-Meta-2.112150.tar.gz',
        'FILES'         => q[cpan/CPAN-Meta],
        'EXCLUDED'      => [
                                qr/^xt/,
@@ -519,7 +524,7 @@ use File::Glob qw(:case);
     'DB_File' =>
        {
        'MAINTAINER'    => 'pmqs',
-       'DISTRIBUTION'  => 'PMQS/DB_File-1.822.tar.gz',
+       'DISTRIBUTION'  => 'PMQS/DB_File-1.824.tar.gz',
        'FILES'         => q[cpan/DB_File],
        'EXCLUDED'      => [ qr{^patches/},
                             qw{ t/pod.t
@@ -537,15 +542,6 @@ use File::Glob qw(:case);
        'UPSTREAM'      => 'blead',
        },
 
-    'Devel::DProf' =>
-       {
-       'MAINTAINER'    => 'rafl',
-       'DISTRIBUTION'  => 'FLORA/Devel-DProf-20110228.00.tar.gz',
-       'FILES'         => q[cpan/Devel-DProf],
-       'EXCLUDED'      => [ qr{^t/release-} ],
-       'UPSTREAM'      => 'cpan',
-       },
-
     'Devel::SelfStubber' =>
        {
        'MAINTAINER'    => 'p5p',
@@ -614,7 +610,7 @@ use File::Glob qw(:case);
     'Dumpvalue' =>
        {
        'MAINTAINER'    => 'p5p',
-       'DISTRIBUTION'  => 'FLORA/Dumpvalue-1.15.tar.gz',
+       'DISTRIBUTION'  => 'FLORA/Dumpvalue-1.16.tar.gz',
        'FILES'         => q[dist/Dumpvalue],
        'UPSTREAM'      => 'blead',
        },
@@ -629,7 +625,7 @@ use File::Glob qw(:case);
     'Encode' =>
        {
        'MAINTAINER'    => 'dankogai',
-       'DISTRIBUTION'  => 'DANKOGAI/Encode-2.42.tar.gz',
+       'DISTRIBUTION'  => 'DANKOGAI/Encode-2.44.tar.gz',
        'FILES'         => q[cpan/Encode],
        'UPSTREAM'      => 'cpan',
        },
@@ -656,7 +652,7 @@ use File::Glob qw(:case);
     'Env' =>
        {
        'MAINTAINER'    => 'p5p',
-       'DISTRIBUTION'  => 'FLORA/Env-1.02.tar.gz',
+       'DISTRIBUTION'  => 'FLORA/Env-1.03.tar.gz',
        'FILES'         => q[dist/Env],
        'UPSTREAM'      => 'blead',
        },
@@ -735,10 +731,12 @@ use File::Glob qw(:case);
     'ExtUtils::MakeMaker' =>
        {
        'MAINTAINER'    => 'mschwern',
-       'DISTRIBUTION'  => 'CHORNY/ExtUtils-MakeMaker-6.57_05.tar.gz',
+       'DISTRIBUTION'  => 'MSTROUT/ExtUtils-MakeMaker-6.59.tar.gz',
        'FILES'         => q[cpan/ExtUtils-MakeMaker],
        'EXCLUDED'      => [ qr{^t/lib/Test/},
-                            qr{^inc/ExtUtils/},
+           qr{^(bundled|my)/},
+           qr{^t/Liblist_Kid.t},
+           qr{^t/liblist/},
                           ],
        'UPSTREAM'      => 'first-come',
        },
@@ -746,30 +744,27 @@ use File::Glob qw(:case);
     'ExtUtils::Manifest' =>
        {
        'MAINTAINER'    => 'p5p',
-       'DISTRIBUTION'  => 'RKOBES/ExtUtils-Manifest-1.58.tar.gz',
+       'DISTRIBUTION'  => 'FLORA/ExtUtils-Manifest-1.60.tar.gz',
        'FILES'         => q[dist/ExtUtils-Manifest],
+       'EXCLUDED'      => [ qr(t/release-.*\.t) ],
        'UPSTREAM'      => 'blead',
        },
 
     'ExtUtils::ParseXS' =>
        {
-       'MAINTAINER'    => 'kwilliams',
-    'DISTRIBUTION' => 'DAGOLDEN/ExtUtils-ParseXS-2.2206.tar.gz',
-    'EXCLUDED'  => [ qw{
-                       t/bugs/RT48104.xs
-                                   t/bugs/typemap
-                                       t/include/nsUniversalDetector.h
-                                       t/include/nscore.h
-                                  }],
+       'MAINTAINER'    => 'smueller',
+       'DISTRIBUTION'  => 'SMUELLER/ExtUtils-ParseXS-3.04_01.tar.gz',
        'FILES'         => q[dist/ExtUtils-ParseXS],
        'UPSTREAM'      => 'blead',
        },
 
-    'faq' =>
+    'perlfaq' =>
        {
        'MAINTAINER'    => 'perlfaq',
-       'FILES'         => q[pod/perlfaq*],
-       'UPSTREAM'      => undef,
+       'DISTRIBUTION'  => 'LLAP/perlfaq-5.01500302.tar.gz',
+       'FILES'         => q[cpan/perlfaq],
+       'EXCLUDED'      => [ qw(t/release-pod-syntax.t) ],
+       'UPSTREAM'      => 'cpan',
        },
 
     'File::Basename' =>
@@ -796,7 +791,7 @@ use File::Glob qw(:case);
     'File::CheckTree' =>
        {
        'MAINTAINER'    => 'p5p',
-       'DISTRIBUTION'  => 'FLORA/File-CheckTree-4.4.tar.gz',
+       'DISTRIBUTION'  => 'FLORA/File-CheckTree-4.41.tar.gz',
        'FILES'         => q[dist/File-CheckTree],
        'UPSTREAM'      => 'blead',
        },
@@ -894,7 +889,6 @@ use File::Glob qw(:case);
        'MAINTAINER'    => 'pmqs',
        'DISTRIBUTION'  => 'PMQS/Filter-1.39.tar.gz',
        'FILES'         => q[cpan/Filter-Util-Call
-                            t/lib/filter-util.pl
                             pod/perlfilter.pod
                            ],
        'EXCLUDED'      => [ qr{^decrypt/},
@@ -948,15 +942,11 @@ use File::Glob qw(:case);
        {
        'MAINTAINER'    => 'jv',
        'DISTRIBUTION'  => 'JV/Getopt-Long-2.38.tar.gz',
-       'FILES'         => q[cpan/Getopt-Long
-                            lib/newgetopt.pl
-                           ],
+       'FILES'         => q[cpan/Getopt-Long],
        'EXCLUDED'      => [ qr{^examples/},
-                            qw{perl-Getopt-Long.spec},
+                            qw{perl-Getopt-Long.spec lib/newgetopt.pl},
                           ],
-       'MAP'           => { ''                => 'cpan/Getopt-Long/',
-                            'lib/newgetopt.pl' => 'lib/newgetopt.pl',
-                          },
+       'MAP'           => { '' => 'cpan/Getopt-Long/' },
        'UPSTREAM'      => 'cpan',
        },
 
@@ -984,7 +974,7 @@ use File::Glob qw(:case);
     'HTTP::Tiny' =>
        {
        'MAINTAINER'    => 'dagolden',
-       'DISTRIBUTION'  => 'DAGOLDEN/HTTP-Tiny-0.012.tar.gz',
+       'DISTRIBUTION'  => 'DAGOLDEN/HTTP-Tiny-0.013.tar.gz',
        'FILES'         => q[cpan/HTTP-Tiny],
        'EXCLUDED'      => [
                                't/200_live.t',
@@ -997,7 +987,7 @@ use File::Glob qw(:case);
     'I18N::Collate' =>
        {
        'MAINTAINER'    => 'p5p',
-       'DISTRIBUTION'  => 'FLORA/I18N-Collate-1.01.tar.gz',
+       'DISTRIBUTION'  => 'FLORA/I18N-Collate-1.02.tar.gz',
        'FILES'         => q[dist/I18N-Collate],
        'UPSTREAM'      => 'blead',
        },
@@ -1040,7 +1030,7 @@ use File::Glob qw(:case);
     'IO-Compress' =>
        {
        'MAINTAINER'    => 'pmqs',
-       'DISTRIBUTION'  => 'PMQS/IO-Compress-2.035.tar.gz',
+       'DISTRIBUTION'  => 'PMQS/IO-Compress-2.037.tar.gz',
        'FILES'         => q[cpan/IO-Compress],
        'EXCLUDED'      => [ qr{t/Test/} ],
        'UPSTREAM'      => 'cpan',
@@ -1057,18 +1047,11 @@ use File::Glob qw(:case);
     'IPC::Cmd' =>
        {
        'MAINTAINER'    => 'kane',
-       'DISTRIBUTION'  => 'BINGOS/IPC-Cmd-0.70.tar.gz',
+       'DISTRIBUTION'  => 'BINGOS/IPC-Cmd-0.72.tar.gz',
        'FILES'         => q[cpan/IPC-Cmd],
        'UPSTREAM'      => 'cpan',
        },
 
-    'IPC::Open2' =>
-       {
-       'MAINTAINER'    => 'p5p',
-       'FILES'         => q[ext/IPC-Open2],
-       'UPSTREAM'      => 'blead',
-       },
-
     'IPC::Open3' =>
        {
        'MAINTAINER'    => 'p5p',
@@ -1088,7 +1071,7 @@ use File::Glob qw(:case);
     'JSON::PP' =>
        {
        'MAINTAINER'    => 'makamaka',
-       'DISTRIBUTION'  => 'MAKAMAKA/JSON-PP-2.27105.tar.gz',
+       'DISTRIBUTION'  => 'MAKAMAKA/JSON-PP-2.27200.tar.gz',
        'FILES'         => q[cpan/JSON-PP],
        'EXCLUDED'      => [
                't/900_pod.t',    # Pod testing
@@ -1118,9 +1101,9 @@ use File::Glob qw(:case);
     'Locale-Codes' =>
        {
        'MAINTAINER'    => 'sbeck',
-       'DISTRIBUTION'  => 'SBECK/Locale-Codes-3.16.tar.gz',
+       'DISTRIBUTION'  => 'SBECK/Locale-Codes-3.18.tar.gz',
        'FILES'         => q[cpan/Locale-Codes],
-       'EXCLUDED'      => [ qw{t/pod_coverage.t t/pod.t}, qr{^t/runtests},
+       'EXCLUDED'      => [ qw{t/pod_coverage.t t/pod.t}, qr{^t/runtests}, qr{^t/runtests\.bat},
                             qr{^internal/}, qr{^examples/} ],
        'UPSTREAM'      => 'cpan',
        },
@@ -1183,7 +1166,7 @@ use File::Glob qw(:case);
     'Math::BigInt::FastCalc' =>
        {
        'MAINTAINER'    => 'rafl',
-       'DISTRIBUTION'  => 'PJACKLAM/Math-BigInt-FastCalc-0.28.tar.gz',
+       'DISTRIBUTION'  => 'FLORA/Math-BigInt-FastCalc-0.29.tar.gz',
        'FILES'         => q[dist/Math-BigInt-FastCalc],
        'EXCLUDED'      => [ qr{^inc/},
                             qw{
@@ -1206,7 +1189,7 @@ use File::Glob qw(:case);
     'Math::BigRat' =>
        {
        'MAINTAINER'    => 'rafl',
-       'DISTRIBUTION'  => 'FLORA/Math-BigRat-0.26.tar.gz',
+       'DISTRIBUTION'  => 'PJACKLAM/Math-BigRat-0.2602.tar.gz',
        'FILES'         => q[dist/Math-BigRat],
        'EXCLUDED'      => [ qr{^inc/},
                             qw{
@@ -1220,7 +1203,7 @@ use File::Glob qw(:case);
     'Math::Complex' =>
        {
        'MAINTAINER'    => 'zefram',
-       'DISTRIBUTION'  => 'ZEFRAM/Math-Complex-1.57.tar.gz',
+       'DISTRIBUTION'  => 'ZEFRAM/Math-Complex-1.58.tar.gz',
        'FILES'         => q[cpan/Math-Complex],
        'EXCLUDED'      => [
                             qw{
@@ -1257,7 +1240,7 @@ use File::Glob qw(:case);
     'Module::Build' =>
        {
        'MAINTAINER'    => 'kwilliams',
-       'DISTRIBUTION'  => 'DAGOLDEN/Module-Build-0.3800.tar.gz',
+       'DISTRIBUTION'  => 'DAGOLDEN/Module-Build-0.39_01.tar.gz',
        'FILES'         => q[cpan/Module-Build],
        'EXCLUDED'      => [
                qw{ t/par.t t/signature.t },
@@ -1265,14 +1248,14 @@ use File::Glob qw(:case);
                qr!^devtools!,
                qr!^inc!,
        ],
-       'CUSTOMIZED'    => [ 'lib/Module/Build/ConfigData.pm' ],
+       'CUSTOMIZED'    => [ 'cpan/Module-Build/lib/Module/Build/ConfigData.pm' ],
        'UPSTREAM'      => 'cpan',
        },
 
     'Module::CoreList' =>
        {
-       'MAINTAINER'    => 'rgarcia',
-       'DISTRIBUTION'  => 'BINGOS/Module-CoreList-2.41.tar.gz',
+       'MAINTAINER'    => 'bingos',
+       'DISTRIBUTION'  => 'BINGOS/Module-CoreList-2.55.tar.gz',
        'FILES'         => q[dist/Module-CoreList],
        'UPSTREAM'      => 'blead',
        },
@@ -1280,7 +1263,7 @@ use File::Glob qw(:case);
     'Module::Load' =>
        {
        'MAINTAINER'    => 'kane',
-       'DISTRIBUTION'  => 'BINGOS/Module-Load-0.18.tar.gz',
+       'DISTRIBUTION'  => 'BINGOS/Module-Load-0.20.tar.gz',
        'FILES'         => q[cpan/Module-Load],
        'UPSTREAM'      => 'cpan',
        },
@@ -1304,9 +1287,9 @@ use File::Glob qw(:case);
     'Module::Metadata' =>
        {
        'MAINTAINER'    => 'dagolden',
-       'DISTRIBUTION'  => 'DAGOLDEN/Module-Metadata-1.000004.tar.gz',
+       'DISTRIBUTION'  => 'DAGOLDEN/Module-Metadata-1.000005.tar.gz',
        'FILES'         => q[cpan/Module-Metadata],
-       'EXCLUDED'      => [ ],
+       'EXCLUDED'      => [ qr{^maint}, qr{^xt} ],
        'UPSTREAM'      => 'cpan',
        },
 
@@ -1316,6 +1299,7 @@ use File::Glob qw(:case);
        'DISTRIBUTION'  => 'SIMONW/Module-Pluggable-3.9.tar.gz',
        'FILES'         => q[cpan/Module-Pluggable],
        'UPSTREAM'      => 'cpan',
+       'CUSTOMIZED'    => [qw(Makefile.PL)],
        },
 
     'mro' =>
@@ -1389,7 +1373,7 @@ use File::Glob qw(:case);
     'Params::Check' =>
        {
        'MAINTAINER'    => 'kane',
-       'DISTRIBUTION'  => 'BINGOS/Params-Check-0.28.tar.gz',
+       'DISTRIBUTION'  => 'BINGOS/Params-Check-0.32.tar.gz',
        'EXCLUDED'      => [ qw( Params-Check-0.26.tar.gz ) ],
        'FILES'         => q[cpan/Params-Check],
        'UPSTREAM'      => 'cpan',
@@ -1425,6 +1409,13 @@ use File::Glob qw(:case);
        # directory.
        },
 
+    'perldtrace' =>
+       {
+       'MAINTAINER'    => 'sartak',
+       'FILES'         => q[pod/perldtrace.pod],
+       'UPSTREAM'      => 'blead',
+       },
+
     'perlebcdic' =>
        {
        'MAINTAINER'    => 'pvhp',
@@ -1560,34 +1551,20 @@ use File::Glob qw(:case);
        {
        'MAINTAINER'    => 'ferreira',
        'DISTRIBUTION'  => 'FERREIRA/Pod-Perldoc-3.15_01.tar.gz',
-       # I don't know whether it's conceptually cleaner to a rule to copy
-       # ext/Pod-Perldoc/pod/perldoc.pod to pod/perldoc.pod at make time
-       # (in 4 places), or leave it as 1 mapping here.
-       'FILES'         => q[dist/Pod-Perldoc
-                            pod/perldoc.pod
-                           ],
+       'FILES'         => q[dist/Pod-Perldoc],
        # in blead, the perldoc executable is generated by perldoc.PL
        # instead
        # XXX We can and should fix this, but clean up the DRY-failure in utils
        # first
        'EXCLUDED'      => [ qw( perldoc ) ],
-       'MAP'           => { '' => 'dist/Pod-Perldoc/',
-                            'lib/perldoc.pod' => 'pod/perldoc.pod',
-                          },
        'UPSTREAM'      => 'blead',
        },
 
     'Pod::Simple' =>
        {
        'MAINTAINER'    => 'arandal',
-       'DISTRIBUTION'  => 'DWHEELER/Pod-Simple-3.16.tar.gz',
+       'DISTRIBUTION'  => 'DWHEELER/Pod-Simple-3.19.tar.gz',
        'FILES'         => q[cpan/Pod-Simple],
-       # XXX these two files correspond to similar ones in blead under
-       # pod/, but the blead 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
-  # Now been removed from Pod-Simple-3.15 commenting this out - bingos
-       #'EXCLUDED'     => [ qw( lib/perlpod.pod lib/perlpodspec.pod ) ],
        'UPSTREAM'      => 'cpan',
        },
 
@@ -1600,7 +1577,11 @@ use File::Glob qw(:case);
        # run to create pod2man and pod2text, while the CPAN distribution
        # just has the post-generated pod2man and pod2text files.
        # The following entries attempt to codify that odd fact.
-       'CUSTOMIZED'    => [ qw{scripts/pod2man.PL scripts/pod2text.PL} ],
+       'CUSTOMIZED'    => [ qw{
+               scripts/pod2man.PL
+               scripts/pod2text.PL
+               pod/perlpodstyle.pod
+       } ],
        'MAP'           => {
                    '' => 'cpan/podlators/',
                    'scripts/pod2man'  => 'cpan/podlators/scripts/pod2man.PL',
@@ -1652,6 +1633,14 @@ use File::Glob qw(:case);
        'UPSTREAM'      => 'blead',
        },
 
+    'Search::Dict' =>
+       {
+       'MAINTAINER'    => 'p5p',
+       'DISTRIBUTION'  => 'FLORA/Search-Dict-1.03.tar.gz',
+       'FILES'         => q[dist/Search-Dict],
+       'UPSTREAM'      => 'blead',
+       },
+
     'SelfLoader' =>
        {
        'MAINTAINER'    => 'smueller',
@@ -1661,17 +1650,6 @@ use File::Glob qw(:case);
        'UPSTREAM'      => 'blead',
        },
 
-    'Shell' =>
-       {
-       'MAINTAINER'    => 'ferreira',
-       'DISTRIBUTION'  => 'FERREIRA/Shell-0.72_01.tar.gz',
-       'FILES'         => q[cpan/Shell],
-       'EXCLUDED'      => [ qw{ t/01_use.t t/99_pod.t } ],
-       'CPAN'          => 1,
-       'UPSTREAM'      => undef,
-       'DEPRECATED'    => 5.011,
-       },
-
     'sigtrap' =>
        {
        'MAINTAINER'    => 'p5p',
@@ -1689,7 +1667,7 @@ use File::Glob qw(:case);
     'Storable' =>
        {
        'MAINTAINER'    => 'ams',
-       'DISTRIBUTION'  => 'AMS/Storable-2.24.tar.gz',
+       'DISTRIBUTION'  => 'AMS/Storable-2.30.tar.gz',
        'FILES'         => q[dist/Storable],
        'EXCLUDED'      => [ qr{^t/Test/} ],
        'UPSTREAM'      => 'blead',
@@ -1715,15 +1693,17 @@ use File::Glob qw(:case);
                                t/podspell.t
                                t/portfs.t
                                win32/PerlLog.RES
+                               win32/PerlLog_RES.uu
                               },
                           ],
        'UPSTREAM'      => 'cpan',
+       'CUSTOMIZED'    => [qw( t/syslog.t )],
        },
 
     'Term::ANSIColor' =>
        {
        'MAINTAINER'    => 'rra',
-       'DISTRIBUTION'  => 'RRA/ANSIColor-3.00.tar.gz',
+       'DISTRIBUTION'  => 'RRA/ANSIColor-3.01.tar.gz',
        'FILES'         => q[cpan/Term-ANSIColor],
        'EXCLUDED'      => [ qr{^tests/}, qw(t/pod-spelling.t t/pod.t) ],
        'UPSTREAM'      => 'cpan',
@@ -1737,6 +1717,22 @@ use File::Glob qw(:case);
        'UPSTREAM'      => undef,
        },
 
+    'Term::Complete' =>
+       {
+       'MAINTAINER'    => 'p5p',
+       'DISTRIBUTION'  => 'FLORA/Term-Complete-1.402.tar.gz',
+       'FILES'         => q[dist/Term-Complete],
+       'UPSTREAM'      => 'blead',
+       },
+
+    'Term::ReadLine' =>
+       {
+       'MAINTAINER'    => 'p5p',
+       'DISTRIBUTION'  => 'FLORA/Term-ReadLine-1.07.tar.gz',
+       'FILES'         => q[dist/Term-ReadLine],
+       'UPSTREAM'      => 'blead',
+       },
+
     'Term::UI' =>
        {
        'MAINTAINER'    => 'kane',
@@ -1763,12 +1759,17 @@ use File::Glob qw(:case);
                             qr{^t/lib/Test/},
                             qr{^xt/},
                             qw{Changes-2.64
+                               NotBuild.PL
                                HACKING.pod
                                perlcriticrc
                                t/lib/if.pm
                               }
                           ],
        'UPSTREAM'      => 'cpan',
+       'CUSTOMIZED'    => [qw(
+               t/source.t
+               t/testargs.t
+       )],
        },
 
     'Test::Simple' =>
@@ -1789,6 +1790,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',
@@ -1833,6 +1843,10 @@ use File::Glob qw(:case);
        'FILES'         => q[cpan/Text-Tabs],
        'EXCLUDED'      => [ qw( t/dnsparks.t ) ], # see af6492bf9e
        'UPSTREAM'      => 'cpan',
+       'CUSTOMIZED'    => [qw(
+               t/fill.t
+               t/tabs.t
+       )],
        },
 
     'Thread::Queue' =>
@@ -1864,7 +1878,7 @@ use File::Glob qw(:case);
     'threads' =>
        {
        'MAINTAINER'    => 'jdhedden',
-       'DISTRIBUTION'  => 'JDHEDDEN/threads-1.83.tar.gz',
+       'DISTRIBUTION'  => 'JDHEDDEN/threads-1.85.tar.gz',
        'FILES'         => q[dist/threads],
        'EXCLUDED'      => [ qr{^examples/},
                             qw(t/pod.t
@@ -1877,7 +1891,7 @@ use File::Glob qw(:case);
     'threads::shared' =>
        {
        'MAINTAINER'    => 'jdhedden',
-       'DISTRIBUTION'  => 'JDHEDDEN/threads-shared-1.37.tar.gz',
+       'DISTRIBUTION'  => 'JDHEDDEN/threads-shared-1.39.tar.gz',
        'FILES'         => q[dist/threads-shared],
        'EXCLUDED'      => [ qw(examples/class.pl
                                shared.h
@@ -1927,7 +1941,7 @@ use File::Glob qw(:case);
     'Time::HiRes' =>
        {
        'MAINTAINER'    => 'zefram',
-       'DISTRIBUTION'  => 'ZEFRAM/Time-HiRes-1.9722.tar.gz',
+       'DISTRIBUTION'  => 'ZEFRAM/Time-HiRes-1.9724.tar.gz',
        'FILES'         => q[cpan/Time-HiRes],
        'UPSTREAM'      => 'cpan',
        },
@@ -1952,7 +1966,7 @@ use File::Glob qw(:case);
     'Unicode::Collate' =>
        {
        'MAINTAINER'    => 'sadahiro',
-       'DISTRIBUTION'  => 'SADAHIRO/Unicode-Collate-0.76-withoutworldwriteables.tar.gz',
+       'DISTRIBUTION'  => 'SADAHIRO/Unicode-Collate-0.78.tar.gz',
        'FILES'         => q[cpan/Unicode-Collate],
        'EXCLUDED'      => [ qr{N$},
                    qr{^data/},
@@ -1965,7 +1979,7 @@ use File::Glob qw(:case);
     'Unicode::Normalize' =>
        {
        'MAINTAINER'    => 'sadahiro',
-       'DISTRIBUTION'  => 'SADAHIRO/Unicode-Normalize-1.10-withoutworldwriteables.tar.gz',
+       'DISTRIBUTION'  => 'SADAHIRO/Unicode-Normalize-1.13.tar.gz',
        'FILES'         => q[cpan/Unicode-Normalize],
        'EXCLUDED'      => [ qw{MANIFEST.N Normalize.pmN disableXS enableXS }],
        'UPSTREAM'      => 'first-come',
@@ -1990,7 +2004,7 @@ use File::Glob qw(:case);
     'version' =>
        {
        'MAINTAINER'    => 'jpeacock',
-       'DISTRIBUTION'  => 'JPEACOCK/version-0.88.tar.gz',
+       'DISTRIBUTION'  => 'JPEACOCK/version-0.93.tar.gz',
        'FILES'         => q[lib/version.pm lib/version.pod lib/version.t
                             lib/version],
        'EXCLUDED'      => [ qr{^t/.*\.t$}, qw{t/survey_locales}, qr{^vutil/},
@@ -2053,7 +2067,7 @@ use File::Glob qw(:case);
     'Win32API::File' =>
        {
        'MAINTAINER'    => 'chorny',
-       'DISTRIBUTION'  => 'CHORNY/Win32API-File-0.1101.zip',
+       'DISTRIBUTION'  => 'CHORNY/Win32API-File-0.1200.tar.gz',
        'FILES'         => q[cpan/Win32API-File],
        'EXCLUDED'      => [ qr{^ex/},
                             qw{t/pod.t},
@@ -2112,7 +2126,6 @@ use File::Glob qw(:case);
                                lib/ExtUtils/t/Embed.t
                                lib/ExtUtils/typemap
                                lib/Internals.t
-                               lib/Module/Build/ConfigData.pm
                                lib/Net/hostent.{pm,t}
                                lib/Net/netent.{pm,t}
                                lib/Net/protoent.{pm,t}
@@ -2124,12 +2137,8 @@ use File::Glob qw(:case);
                                lib/Pod/t/Usage.t
                                lib/Pod/t/eol.t
                                lib/Pod/t/utils.t
-                               lib/Search/Dict.{pm,t}
                                lib/SelectSaver.{pm,t}
                                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/
@@ -2146,62 +2155,32 @@ use File::Glob qw(:case);
                                lib/Unicode/README
                                lib/User/grent.{pm,t}
                                lib/User/pwent.{pm,t}
-                               lib/abbrev.pl
-                               lib/assert.pl
-                               lib/bigfloat{.pl,pl.t}
-                               lib/bigint{.pl,pl.t}
-                               lib/bigrat.pl
                                lib/blib.{pm,t}
                                lib/bytes.{pm,t}
                                lib/bytes_heavy.pl
-                               lib/cacheout.pl
                                lib/charnames.{pm,t}
-                               lib/complete.pl
-                               lib/ctime.pl
                                lib/dbm_filter_util.pl
                                lib/deprecate.pm
-                               lib/dotsh.pl
                                lib/dumpvar.{pl,t}
-                               lib/exceptions.pl
-                               lib/fastcwd.pl
                                lib/feature.{pm,t}
                                lib/feature/
                                lib/filetest.{pm,t}
-                               lib/find.pl
-                               lib/finddepth.pl
-                               lib/flush.pl
-                               lib/getcwd.pl
-                               lib/getopt.pl
-                               lib/getopts.pl
                                lib/h2ph.t
                                lib/h2xs.t
-                               lib/hostname.pl
-                               lib/importenv.pl
                                lib/integer.{pm,t}
                                lib/less.{pm,t}
                                lib/locale.{pm,t}
-                               lib/look.pl
                                lib/open.{pm,t}
-                               lib/open2.pl
-                               lib/open3.pl
                                lib/overload/numbers.pm
                                lib/overloading.{pm,t}
                                lib/perl5db.{pl,t}
                                lib/perl5db/
-                               lib/pwd.pl
-                               lib/shellwords.pl
                                lib/sort.{pm,t}
-                               lib/stat.pl
                                lib/strict.{pm,t}
                                lib/subs.{pm,t}
-                               lib/syslog.pl
-                               lib/tainted.pl
-                               lib/termcap.pl
-                               lib/timelocal.pl
                                lib/unicore/
                                lib/utf8.{pm,t}
                                lib/utf8_heavy.pl
-                               lib/validate.pl
                                lib/vars{.pm,.t,_carp.t}
                                lib/vmsish.{pm,t}
                            ],