Tidy up comments.
[p5sagit/p5-mst-13.2.git] / Porting / Maintainers.pl
old mode 100644 (file)
new mode 100755 (executable)
index 8af00e8..72b72d3
@@ -39,7 +39,7 @@ package Maintainers;
     '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>',
@@ -88,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.
@@ -115,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.31_03.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",
@@ -151,9 +205,15 @@ 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
@@ -173,7 +233,7 @@ 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,
@@ -185,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' =>
@@ -199,6 +259,7 @@ package Maintainers;
                           },
        'CPAN'          => 1,
        'UPSTREAM'      => undef,
+       'UPSTREAM'      => 'blead',
        },
 
     'B::Deparse' =>
@@ -229,11 +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 t/compile-time.t t/fields-5.6.0.t
-                               t/fields-5.8.0.t t/lib/HasSigDie.pm )
-                          ],
+       'EXCLUDED'      => [ qw( t/Dummy.pm ) ],
        'CPAN'          => 1,
        'UPSTREAM'      => "blead",
        },
@@ -255,7 +314,7 @@ 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
@@ -265,8 +324,7 @@ package Maintainers;
                                )
                           ],
        'MAP'           => { 'examples/' => 'lib/CGI/eg/',
-                            'CGI/'      => 'lib/CGI/',
-                            'CGI.pm'    => 'lib/CGI.pm',
+                            'lib/'      => 'lib/',
                             ''          => 'lib/CGI/',
                           },
        'CPAN'          => 1,
@@ -291,7 +349,6 @@ package Maintainers;
                             # NB: we use the CompTestUtils.pm
                             # from IO-Compress instead
                             qw( bzip2-src/bzip2-cpp.patch
-                                t/compress/CompTestUtils.pm
                             )
                           ],
        'CPAN'          => 1,
@@ -309,12 +366,9 @@ package Maintainers;
        'EXCLUDED'      => [ qr{^t/Test/},
                             qw( t/000prereq.t
                                 t/99pod.t
-                                t/compress/CompTestUtils.pm
                               )
                           ],
        'MAP'           => { '' => 'ext/Compress-Raw-Zlib/',
-                            't/compress/CompTestUtils.pm' =>
-                                           't/lib/compress/CompTestUtils.pm',
                           },
        'CPAN'          => 1,
        'UPSTREAM'      => undef,
@@ -336,13 +390,13 @@ package Maintainers;
                             '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/},
@@ -390,7 +444,7 @@ 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
@@ -418,17 +472,23 @@ package Maintainers;
                            ],
        'EXCLUDED'      => [ qr{^inc/},
                             qr{^t/dummy-.*\.hidden$},
-                            qw{ bin/cpanp-boxed
+                            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.32.tar.gz',
+       'DISTRIBUTION'  => 'BINGOS/CPANPLUS-Dist-Build-0.38.tar.gz',
        'FILES'         => q[lib/CPANPLUS/Dist/Build.pm
                             lib/CPANPLUS/Dist/Build
                            ],
@@ -444,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',
@@ -468,7 +528,7 @@ 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,
@@ -478,7 +538,7 @@ 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/',
@@ -492,7 +552,7 @@ 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,
@@ -515,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,
        },
@@ -552,11 +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{bleadcheck.pl}, ],
+       'EXCLUDED'      => [ qw{devtools} ],
        'CPAN'          => 1,
-       'UPSTREAM'      => undef,
+       'UPSTREAM'      => 'cpan',
        },
 
     'ExtUtils::Command' =>
@@ -602,15 +663,13 @@ 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/basic.t
-                                t/lib/MakeMaker/Test/Setup/BFD.pm
+       '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
@@ -632,13 +691,14 @@ package Maintainers;
     'ExtUtils::MakeMaker' =>
        {
        'MAINTAINER'    => 'mschwern',
-       'DISTRIBUTION'  => 'MSCHWERN/ExtUtils-MakeMaker-6.53_02.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
@@ -675,13 +735,13 @@ package Maintainers;
     'ExtUtils::ParseXS' =>
        {
        'MAINTAINER'    => 'kwilliams',
-       'DISTRIBUTION'  => 'KWILLIAMS/ExtUtils-ParseXS-2.19.tar.gz',
+       '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' =>
@@ -695,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',
@@ -704,7 +764,7 @@ 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
@@ -721,7 +781,7 @@ 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
@@ -756,7 +816,7 @@ 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
                             pod/perlfilter.pod
@@ -811,7 +871,7 @@ package Maintainers;
        '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',
        },
 
@@ -829,12 +889,12 @@ package Maintainers;
 
     'IO' =>
        {
-       'MAINTAINER'    => 'gbarr',
-       'DISTRIBUTION'  => 'GBARR/IO-1.24.tar.gz',
+       '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' =>
@@ -845,8 +905,7 @@ package Maintainers;
        'EXCLUDED'      => [ qr{t/Test/},
                             qw{t/cz-03zlib-v1.t},
                           ],
-       'MAP'           => { 't/compress' => 't/lib/compress',
-                            ''           => 'ext/IO-Compress/',
+       'MAP'           => { ''           => 'ext/IO-Compress/',
                           },
        'CPAN'          => 1,
        'UPSTREAM'      => undef,
@@ -867,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',
@@ -1112,7 +1171,7 @@ 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,
@@ -1122,11 +1181,11 @@ package Maintainers;
     'Module::Build' =>
        {
        'MAINTAINER'    => 'kwilliams',
-       'DISTRIBUTION'  => 'EWILHELM/Module-Build-0.32.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 }, ],
+       'EXCLUDED'      => [ qw{ t/par.t t/signature.t scripts/bundle.pl}, ],
        'CPAN'          => 1,
-       'UPSTREAM'      => undef,
+       'UPSTREAM'      => 'cpan',
        },
 
     'Module::CoreList' =>
@@ -1186,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',
@@ -1195,7 +1254,7 @@ 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,
@@ -1504,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",
@@ -1513,7 +1572,7 @@ package Maintainers;
     'Scalar-List-Utils' =>
        {
        'MAINTAINER'    => 'gbarr',
-       'DISTRIBUTION'  => 'GBARR/Scalar-List-Utils-1.19.tar.gz',
+       '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/},
@@ -1585,27 +1644,13 @@ package Maintainers;
                               },
                           ],
        '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',
        },
 
     'Term::ANSIColor' =>
        {
        'MAINTAINER'    => 'rra',
-       'DISTRIBUTION'  => 'RRA/ANSIColor-2.00.tar.gz',
+       '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)
@@ -1671,40 +1716,26 @@ package Maintainers;
     'Test::Simple' =>
        {
        'MAINTAINER'    => 'mschwern',
-       'DISTRIBUTION'  => 'MSCHWERN/Test-Simple-0.86.tar.gz',
+       '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/Simple
+                            t/lib/Test/
                             t/lib/Dev/Null.pm
                            ],
        'EXCLUDED'      => [
                             # NB - TieOut.pm comes with more than one
                             # distro. We use the MM one
-                            # XXX should all these actually be excluded
-                            # from blead ???? - DAPM
                             qw{.perlcriticrc
                                .perltidyrc
                                t/pod.t
                                t/pod-coverage.t
-                               t/versions.t
-                               t/Builder/current_test.t
-                               t/Builder/current_test_without_plan.t
-                               t/Builder/done_testing.t
-                               t/Builder/done_testing_double.t
-                               t/Builder/done_testing_plan_mismatch.t
-                               t/Builder/done_testing_with_no_plan.t
-                               t/Builder/done_testing_with_number.t
-                               t/Builder/done_testing_with_plan.t
-                               t/Builder/fork_with_new_stdout.t
-                               t/Builder/no_plan_at_all.t
                                t/Builder/reset_outputs.t
 
                                lib/Test/Builder/IO/Scalar.pm
-                               t/lib/Test/Builder/NoOutput.pm
 
                                t/lib/TieOut.pm
                               }
@@ -1764,6 +1795,20 @@ package Maintainers;
        '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',
@@ -1795,7 +1840,7 @@ 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
@@ -1809,7 +1854,7 @@ 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
@@ -1866,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,
@@ -1904,8 +1949,9 @@ 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},
@@ -1980,7 +2026,7 @@ package Maintainers;
                                XSLoader.pm}, # we use XSLoader_pm.PL
                           ],
        'CPAN'          => 1,
-       'UPSTREAM'      => undef,
+       'UPSTREAM'      => 'blead',
        },
 
     's2p' =>
@@ -2083,7 +2129,6 @@ 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/File/Basename.{pm,t}
                                lib/File/CheckTree.{pm,t}