This is a live mirror of the Perl 5 development currently hosted at https://github.com/perl/perl5
https://perl5.git.perl.org / perl5.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Update Getopt-Long to CPAN version 2.42
[perl5.git] / Porting / Maintainers.pl
diff --git a/Porting/Maintainers.pl b/Porting/Maintainers.pl
index e247f71..f9c5d81 100755 (executable)
--- a/Porting/Maintainers.pl
+++ b/Porting/Maintainers.pl
@@ -103,11 +103,11 @@ use File::Glob qw(:case);
 @IGNORABLE = qw(
     .cvsignore .dualLivedDiffConfig .gitignore
     ANNOUNCE Announce Artistic AUTHORS BENCHMARK BUGS Build.PL
-    CHANGELOG ChangeLog Changelog CHANGES Changes COPYING Copying CREDITS
-    dist.ini GOALS HISTORY INSTALL INSTALL.SKIP LICENSE Makefile.PL
-    MANIFEST MANIFEST.SKIP META.yml MYMETA.yml META.json MYMETA.json
-    NEW NOTES perlcritic.rc ppport.h README README.PATCHING SIGNATURE
-    THANKS TODO Todo VERSION WHATSNEW CONTRIBUTING
+    CHANGELOG ChangeLog Changelog CHANGES Changes CONTRIBUTING COPYING Copying
+    cpanfile CREDITS dist.ini GOALS HISTORY INSTALL INSTALL.SKIP LICENSE
+    Makefile.PL MANIFEST MANIFEST.SKIP META.json META.yml MYMETA.json
+    MYMETA.yml NEW NOTES perlcritic.rc ppport.h README README.PATCHING
+    SIGNATURE THANKS TODO Todo VERSION WHATSNEW
 );
 
 # Each entry in the  %Modules hash roughly represents a distribution,
@@ -130,9 +130,7 @@ use File::Glob qw(:case);
 # that this hasn't been discussed for the module at hand.
 # "blead" indicates that the copy of the module in the blead
 # sources is to be considered canonical, "cpan" means that the
-# module on CPAN is to be patched first. "first-come" means
-# that blead can be patched freely if it is in sync with the
-# latest release on CPAN.
+# module on CPAN is to be patched first.
 
 # BUGS is an email or url to post bug reports.  For modules with
 # UPSTREAM => 'blead', use perl5-porters@perl.org.  rt.cpan.org
@@ -225,17 +223,16 @@ use File::Glob qw(:case);
 
     'autodie' => {
         'MAINTAINER'   => 'pjf',
-        'DISTRIBUTION' => 'PJF/autodie-2.20.tar.gz',
+        'DISTRIBUTION' => 'PJF/autodie-2.22.tar.gz',
         'FILES'        => q[cpan/autodie],
         'EXCLUDED'     => [
-            qr{^inc/Module/},
             qr{benchmarks},
             # 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/author-critic.t
+            qw( t/author-critic.t
+                t/boilerplate.t
                 t/critic.t
                 t/fork.t
                 t/kwalitee.t
@@ -248,9 +245,10 @@ use File::Glob qw(:case);
                 t/system.t
                 )
         ],
-       # Test got broken by Carp change; update to be merged upstream
-       # [rt.cpan.org #88076].
-        'CUSTOMIZED' => ['t/backcompat.t'],
+        'CUSTOMIZED'   => [
+            # Waiting to be merged upstream: see CPAN RT#87237
+            qw(        t/utf8_open.t ),
+        ],
         'UPSTREAM'   => 'cpan',
     },
 
@@ -329,7 +327,7 @@ use File::Glob qw(:case);
 
     'Carp' => {
         'MAINTAINER'   => 'zefram',
-        'DISTRIBUTION' => 'ZEFRAM/Carp-1.26.tar.gz',
+        'DISTRIBUTION' => 'ZEFRAM/Carp-1.32.tar.gz',
         'FILES'        => q[dist/Carp],
         'UPSTREAM'     => 'blead',
     },
@@ -404,7 +402,7 @@ use File::Glob qw(:case);
 
     'CPAN' => {
         'MAINTAINER'   => 'andk',
-        'DISTRIBUTION' => 'ANDK/CPAN-2.00.tar.gz',
+        'DISTRIBUTION' => 'ANDK/CPAN-2.03-TRIAL.tar.gz',
         'FILES'        => q[cpan/CPAN],
         'EXCLUDED'     => [
             qr{^distroprefs/},
@@ -412,6 +410,7 @@ use File::Glob qw(:case);
             qr{^t/CPAN/authors/},
             qw( lib/CPAN/Admin.pm
                 scripts/cpan-mirrors
+                PAUSE2015.pub
                 SlayMakefile
                 t/00signature.t
                 t/04clean_load.t
@@ -430,6 +429,7 @@ use File::Glob qw(:case);
                 t/52podcover.t
                 t/60credentials.t
                 t/70_critic.t
+                t/71_minimumversion.t
                 t/CPAN/CpanTestDummies-1.55.pm
                 t/CPAN/TestConfig.pm
                 t/CPAN/TestMirroredBy
@@ -454,11 +454,12 @@ use File::Glob qw(:case);
     # perl -Icpan/CPAN-Meta/lib Porting/makemeta
     'CPAN::Meta' => {
         'MAINTAINER'   => 'dagolden',
-        'DISTRIBUTION' => 'DAGOLDEN/CPAN-Meta-2.132140.tar.gz',
+        'DISTRIBUTION' => 'DAGOLDEN/CPAN-Meta-2.132620.tar.gz',
         'FILES'        => q[cpan/CPAN-Meta],
         'EXCLUDED'     => [
             qw(t/00-compile.t),
             qw[t/00-report-prereqs.t],
+            qw(cpanfile),
             qr{^xt},
             qr{^history},
         ],
@@ -467,10 +468,11 @@ use File::Glob qw(:case);
 
     'CPAN::Meta::Requirements' => {
         'MAINTAINER'   => 'dagolden',
-        'DISTRIBUTION' => 'DAGOLDEN/CPAN-Meta-Requirements-2.122.tar.gz',
+        'DISTRIBUTION' => 'DAGOLDEN/CPAN-Meta-Requirements-2.123.tar.gz',
         'FILES'        => q[cpan/CPAN-Meta-Requirements],
         'EXCLUDED'     => [
             qw(t/00-compile.t),
+            qw(t/00-report-prereqs.t),
             qr{^xt},
             qr{^history},
         ],
@@ -516,14 +518,6 @@ use File::Glob qw(:case);
         'UPSTREAM'   => 'blead',
     },
 
-    'Devel::SelfStubber' => {
-        'MAINTAINER'   => 'p5p',
-        'DISTRIBUTION' => 'FLORA/Devel-SelfStubber-1.05.tar.gz',
-        'FILES'        => q[dist/Devel-SelfStubber],
-        'EXCLUDED'     => [qr{^t/release-.*\.t}],
-        'UPSTREAM'     => 'blead',
-    },
-
     'Devel::Peek' => {
         'MAINTAINER' => 'p5p',
         'FILES'      => q[ext/Devel-Peek],
@@ -538,6 +532,14 @@ use File::Glob qw(:case);
         'UPSTREAM'     => undef, # rjbs has asked mhx to have blead be upstream
     },
 
+    'Devel::SelfStubber' => {
+        'MAINTAINER'   => 'p5p',
+        'DISTRIBUTION' => 'FLORA/Devel-SelfStubber-1.05.tar.gz',
+        'FILES'        => q[dist/Devel-SelfStubber],
+        'EXCLUDED'     => [qr{^t/release-.*\.t}],
+        'UPSTREAM'     => 'blead',
+    },
+
     'diagnostics' => {
         'MAINTAINER' => 'p5p',
         'FILES'      => q[lib/diagnostics.{pm,t}],
@@ -595,7 +597,7 @@ use File::Glob qw(:case);
 
     'Encode' => {
         'MAINTAINER'   => 'dankogai',
-        'DISTRIBUTION' => 'DANKOGAI/Encode-2.52.tar.gz',
+        'DISTRIBUTION' => 'DANKOGAI/Encode-2.55.tar.gz',
         'FILES'        => q[cpan/Encode],
         'UPSTREAM'     => 'cpan',
     },
@@ -645,14 +647,18 @@ use File::Glob qw(:case);
 
     'ExtUtils::CBuilder' => {
         'MAINTAINER'   => 'ambs',
-        'DISTRIBUTION' => 'DAGOLDEN/ExtUtils-CBuilder-0.280205.tar.gz',
+        'DISTRIBUTION' => 'AMBS/ExtUtils/ExtUtils-CBuilder-0.280212.tar.gz',
         'FILES'        => q[dist/ExtUtils-CBuilder],
+        'EXCLUDED'     => [
+            qw(README.mkdn),
+            qr{^xt},
+        ],
         'UPSTREAM'     => 'blead',
     },
 
     'ExtUtils::Command' => {
         'MAINTAINER'   => 'p5p',
-        'DISTRIBUTION' => 'FLORA/ExtUtils-Command-1.17.tar.gz',
+        'DISTRIBUTION' => 'FLORA/ExtUtils-Command-1.18.tar.gz',
         'FILES'        => q[dist/ExtUtils-Command],
         'EXCLUDED'     => [qr{^t/release-}],
         'UPSTREAM'     => 'blead',
@@ -693,7 +699,7 @@ use File::Glob qw(:case);
 
     'ExtUtils::MakeMaker' => {
         'MAINTAINER'   => 'mschwern',
-        'DISTRIBUTION' => 'BINGOS/ExtUtils-MakeMaker-6.72.tar.gz',
+        'DISTRIBUTION' => 'BINGOS/ExtUtils-MakeMaker-6.78.tar.gz',
         'FILES'        => q[cpan/ExtUtils-MakeMaker],
         'EXCLUDED'     => [
             qr{^t/lib/Test/},
@@ -702,12 +708,12 @@ use File::Glob qw(:case);
             qr{^t/liblist/},
             qr{^\.perlcriticrc},
         ],
-        'UPSTREAM' => 'first-come',
+        'UPSTREAM' => 'cpan',
     },
 
     'ExtUtils::Manifest' => {
         'MAINTAINER'   => 'p5p',
-        'DISTRIBUTION' => 'FLORA/ExtUtils-Manifest-1.61.tar.gz',
+        'DISTRIBUTION' => 'FLORA/ExtUtils-Manifest-1.63.tar.gz',
         'FILES'        => q[dist/ExtUtils-Manifest],
         'EXCLUDED'     => [qr(t/release-.*\.t)],
         'UPSTREAM'     => 'blead',
@@ -715,22 +721,15 @@ use File::Glob qw(:case);
 
     'ExtUtils::ParseXS' => {
         'MAINTAINER'   => 'smueller',
-        'DISTRIBUTION' => 'SMUELLER/ExtUtils-ParseXS-3.21.tar.gz',
+        'DISTRIBUTION' => 'SMUELLER/ExtUtils-ParseXS-3.22.tar.gz',
         'FILES'        => q[dist/ExtUtils-ParseXS],
         'UPSTREAM'     => 'blead',
     },
 
-    'perlfaq' => {
-        'MAINTAINER'   => 'perlfaq',
-        'DISTRIBUTION' => 'LLAP/perlfaq-5.0150043.tar.gz',
-        'FILES'        => q[cpan/perlfaq],
-        'EXCLUDED'     => [
-            qw( t/release-pod-syntax.t
-                t/release-eol.t
-                t/release-no-tabs.t
-                )
-        ],
-        'UPSTREAM' => 'cpan',
+    'Fcntl' => {
+        'MAINTAINER' => 'p5p',
+        'FILES'      => q[ext/Fcntl],
+        'UPSTREAM'   => 'blead',
     },
 
     'File::Basename' => {
@@ -759,7 +758,7 @@ use File::Glob qw(:case);
 
     'File::Fetch' => {
         'MAINTAINER'   => 'kane',
-        'DISTRIBUTION' => 'BINGOS/File-Fetch-0.42.tar.gz',
+        'DISTRIBUTION' => 'BINGOS/File-Fetch-0.44.tar.gz',
         'FILES'        => q[cpan/File-Fetch],
         'UPSTREAM'     => 'cpan',
     },
@@ -800,7 +799,7 @@ use File::Glob qw(:case);
 
     'File::Temp' => {
         'MAINTAINER'   => 'tjenness',
-        'DISTRIBUTION' => 'DAGOLDEN/File-Temp-0.2301.tar.gz',
+        'DISTRIBUTION' => 'DAGOLDEN/File-Temp-0.2302.tar.gz',
         'FILES'        => q[cpan/File-Temp],
         'EXCLUDED'     => [
             qw( misc/benchmark.pl
@@ -886,15 +885,9 @@ use File::Glob qw(:case);
         'UPSTREAM'   => 'blead',
     },
 
-    'Fcntl' => {
-        'MAINTAINER' => 'p5p',
-        'FILES'      => q[ext/Fcntl],
-        'UPSTREAM'   => 'blead',
-    },
-
     'Getopt::Long' => {
         'MAINTAINER'   => 'jv',
-        'DISTRIBUTION' => 'JV/Getopt-Long-2.41.tar.gz',
+        'DISTRIBUTION' => 'JV/Getopt-Long-2.42.tar.gz',
         'FILES'        => q[cpan/Getopt-Long],
         'EXCLUDED'     => [
             qr{^examples/},
@@ -912,23 +905,25 @@ use File::Glob qw(:case);
         'UPSTREAM'   => 'blead',
     },
 
-    'Hash::Util::FieldHash' => {
+    'Hash::Util' => {
         'MAINTAINER' => 'p5p',
-        'FILES'      => q[ext/Hash-Util-FieldHash],
+        'FILES'      => q[ext/Hash-Util],
         'UPSTREAM'   => 'blead',
     },
 
-    'Hash::Util' => {
+    'Hash::Util::FieldHash' => {
         'MAINTAINER' => 'p5p',
-        'FILES'      => q[ext/Hash-Util],
+        'FILES'      => q[ext/Hash-Util-FieldHash],
         'UPSTREAM'   => 'blead',
     },
 
     'HTTP::Tiny' => {
         'MAINTAINER'   => 'dagolden',
-        'DISTRIBUTION' => 'DAGOLDEN/HTTP-Tiny-0.034.tar.gz',
+        'DISTRIBUTION' => 'DAGOLDEN/HTTP-Tiny-0.036.tar.gz',
         'FILES'        => q[cpan/HTTP-Tiny],
         'EXCLUDED'     => [
+            'cpanfile',
+            't/00-compile.t',
             't/00-report-prereqs.t',
             't/200_live.t',
             't/200_live_local_ip.t',
@@ -1021,6 +1016,12 @@ use File::Glob qw(:case);
         'EXCLUDED'     => [
             't/900_pod.t',    # Pod testing
         ],
+
+        # Waiting to be merged upstream: see PERL RT#119825
+        'CUSTOMIZED'   => [
+            'lib/JSON/PP.pm',
+        ],
+
         'UPSTREAM' => 'cpan',
     },
 
@@ -1053,7 +1054,7 @@ use File::Glob qw(:case);
 
     'Locale-Codes' => {
         'MAINTAINER'   => 'sbeck',
-        'DISTRIBUTION' => 'SBECK/Locale-Codes-3.26.tar.gz',
+        'DISTRIBUTION' => 'SBECK/Locale-Codes-3.27.tar.gz',
         'FILES'        => q[cpan/Locale-Codes],
         'EXCLUDED'     => [
             qw( t/pod_coverage.t
@@ -1196,12 +1197,13 @@ use File::Glob qw(:case);
         ],
         # Generated file, not part of the CPAN distro:
         'CUSTOMIZED' => ['lib/Module/Build/ConfigData.pm'],
+        'DEPRECATED' => '5.019000',
         'UPSTREAM'   => 'cpan',
     },
 
     'Module::CoreList' => {
         'MAINTAINER'   => 'bingos',
-        'DISTRIBUTION' => 'BINGOS/Module-CoreList-2.97.tar.gz',
+        'DISTRIBUTION' => 'BINGOS/Module-CoreList-2.99.tar.gz',
         'FILES'        => q[dist/Module-CoreList],
         'UPSTREAM'     => 'blead',
     },
@@ -1215,7 +1217,7 @@ use File::Glob qw(:case);
 
     'Module::Load::Conditional' => {
         'MAINTAINER'   => 'kane',
-        'DISTRIBUTION' => 'BINGOS/Module-Load-Conditional-0.54.tar.gz',
+        'DISTRIBUTION' => 'BINGOS/Module-Load-Conditional-0.58.tar.gz',
         'FILES'        => q[cpan/Module-Load-Conditional],
         'UPSTREAM'     => 'cpan',
     },
@@ -1229,7 +1231,7 @@ use File::Glob qw(:case);
 
     'Module::Metadata' => {
         'MAINTAINER'   => 'dagolden',
-        'DISTRIBUTION' => 'ETHER/Module-Metadata-1.000016.tar.gz',
+        'DISTRIBUTION' => 'ETHER/Module-Metadata-1.000018.tar.gz',
         'FILES'        => q[cpan/Module-Metadata],
         'EXCLUDED'     => [
             qr{^maint},
@@ -1304,18 +1306,19 @@ use File::Glob qw(:case);
 
     'parent' => {
         'MAINTAINER'   => 'corion',
-        'DISTRIBUTION' => 'CORION/parent-0.226.tar.gz',
+        'DISTRIBUTION' => 'CORION/parent-0.228.tar.gz',
         'FILES'        => q[cpan/parent],
         'UPSTREAM'     => undef,
     },
 
     'Parse::CPAN::Meta' => {
         'MAINTAINER'   => 'dagolden',
-        'DISTRIBUTION' => 'DAGOLDEN/Parse-CPAN-Meta-1.4405.tar.gz',
+        'DISTRIBUTION' => 'DAGOLDEN/Parse-CPAN-Meta-1.4407.tar.gz',
         'FILES'        => q[cpan/Parse-CPAN-Meta],
         'EXCLUDED'     => [
             qw(t/00-compile.t),
             qw[t/00-report-prereqs.t],
+            qw(cpanfile),
             qr{^xt},
         ],
         'UPSTREAM'     => 'cpan',
@@ -1334,6 +1337,14 @@ use File::Glob qw(:case);
         # directory.
     },
 
+    'Perl::OSType' => {
+        'MAINTAINER'   => 'dagolden',
+        'DISTRIBUTION' => 'DAGOLDEN/Perl-OSType-1.006.tar.gz',
+        'FILES'        => q[cpan/Perl-OSType],
+        'EXCLUDED'     => [qw(cpanfile), qw(tidyall.ini), qr/^xt/, qr{^t/00-}],
+        'UPSTREAM'     => 'cpan',
+    },
+
     'perldtrace' => {
         'MAINTAINER' => 'sartak',
         'FILES'      => q[pod/perldtrace.pod],
@@ -1346,6 +1357,19 @@ use File::Glob qw(:case);
         'UPSTREAM'   => undef,
     },
 
+    'perlfaq' => {
+        'MAINTAINER'   => 'perlfaq',
+        'DISTRIBUTION' => 'LLAP/perlfaq-5.0150044.tar.gz',
+        'FILES'        => q[cpan/perlfaq],
+        'EXCLUDED'     => [
+            qw( t/release-pod-syntax.t
+                t/release-eol.t
+                t/release-no-tabs.t
+                )
+        ],
+        'UPSTREAM' => 'cpan',
+    },
+
     'PerlIO' => {
         'MAINTAINER' => 'p5p',
         'FILES'      => q[lib/PerlIO.pm],
@@ -1390,14 +1414,6 @@ use File::Glob qw(:case);
         'UPSTREAM'     => undef,
     },
 
-    'Perl::OSType' => {
-        'MAINTAINER'   => 'dagolden',
-        'DISTRIBUTION' => 'DAGOLDEN/Perl-OSType-1.004.tar.gz',
-        'FILES'        => q[cpan/Perl-OSType],
-        'EXCLUDED'     => [qr/^xt/, qr{^t/00-}],
-        'UPSTREAM'     => 'cpan',
-    },
-
     'perlpacktut' => {
         'MAINTAINER' => 'laun',
         'FILES'      => q[pod/perlpacktut.pod],
@@ -1497,7 +1513,7 @@ use File::Glob qw(:case);
 
     'podlators' => {
         'MAINTAINER'   => 'rra',
-        'DISTRIBUTION' => 'RRA/podlators-2.5.1.tar.gz',
+        'DISTRIBUTION' => 'RRA/podlators-2.5.2.tar.gz',
         'FILES'        => q[cpan/podlators pod/perlpodstyle.pod],
 
         # The perl distribution has pod2man.PL and pod2text.PL,  which are
@@ -1508,10 +1524,6 @@ use File::Glob qw(:case);
             qw( scripts/pod2man.PL
                 scripts/pod2text.PL
                 ),
-
-            # Waiting to be merged upstream: see CPAN RT#87440
-            qw( pod/perlpodstyle.pod
-                ),
         ],
         'MAP' => {
             ''                 => 'cpan/podlators/',
@@ -1536,6 +1548,12 @@ use File::Glob qw(:case);
         'UPSTREAM'   => 'blead',
     },
 
+    's2p' => {
+        'MAINTAINER' => 'laun',
+        'FILES'      => q[x2p/s2p.PL],
+        'UPSTREAM'   => undef,
+    },
+
     'Safe' => {
         'MAINTAINER'   => 'rgarcia',
         'DISTRIBUTION' => 'RGARCIA/Safe-2.35.tar.gz',
@@ -1545,7 +1563,7 @@ use File::Glob qw(:case);
 
     'Scalar-List-Utils' => {
         'MAINTAINER'   => 'gbarr',
-        'DISTRIBUTION' => 'PEVANS/Scalar-List-Utils-1.31.tar.gz',
+        'DISTRIBUTION' => 'PEVANS/Scalar-List-Utils-1.32.tar.gz',
         'FILES'    => q[cpan/List-Util],
         'EXCLUDED' => [
             qr{^inc/Module/},
@@ -1585,7 +1603,7 @@ use File::Glob qw(:case);
 
     'Socket' => {
         'MAINTAINER'   => 'pevans',
-        'DISTRIBUTION' => 'PEVANS/Socket-2.011.tar.gz',
+        'DISTRIBUTION' => 'PEVANS/Socket-2.012.tar.gz',
         'FILES'        => q[cpan/Socket],
         'UPSTREAM'     => 'cpan',
     },
@@ -1668,7 +1686,7 @@ use File::Glob qw(:case);
 
     'Term::ReadLine' => {
         'MAINTAINER'   => 'p5p',
-        'DISTRIBUTION' => 'FLORA/Term-ReadLine-1.10.tar.gz',
+        'DISTRIBUTION' => 'FLORA/Term-ReadLine-1.14.tar.gz',
         'FILES'        => q[dist/Term-ReadLine],
         'EXCLUDED'     => [qr{^t/release-.*\.t}],
         'UPSTREAM'     => 'blead',
@@ -1719,8 +1737,16 @@ use File::Glob qw(:case);
                 ),
         ],
 
-        # Waiting to be merged upstream: see CPAN RT#79762
-        'CUSTOMIZED' =>  [ 't/fail-more.t' ],
+        'CUSTOMIZED'   => [
+            # Waiting to be merged upstream: see CPAN RT#79762
+            't/fail-more.t',
+
+            # Waiting to be merged upstream: see PERL RT#119825
+            'lib/Test/Builder.pm',
+            'lib/Test/Builder/Module.pm',
+            'lib/Test/More.pm',
+            'lib/Test/Simple.pm',
+        ],
 
         'UPSTREAM' => 'cpan',
     },
@@ -1828,7 +1854,7 @@ use File::Glob qw(:case);
 
     'threads' => {
         'MAINTAINER'   => 'jdhedden',
-        'DISTRIBUTION' => 'JDHEDDEN/threads-1.87.tar.gz',
+        'DISTRIBUTION' => 'JDHEDDEN/threads-1.89.tar.gz',
         'FILES'        => q[dist/threads],
         'EXCLUDED'     => [
             qr{^examples/},
@@ -1908,14 +1934,14 @@ use File::Glob qw(:case);
 
     'Time::Piece' => {
         'MAINTAINER'   => 'msergeant',
-        'DISTRIBUTION' => 'RJBS/Time-Piece-1.22.tar.gz',
+        'DISTRIBUTION' => 'RJBS/Time-Piece-1.23.tar.gz',
         'FILES'        => q[cpan/Time-Piece],
         'UPSTREAM'     => undef,
     },
 
     'Unicode::Collate' => {
         'MAINTAINER'   => 'sadahiro',
-        'DISTRIBUTION' => 'SADAHIRO/Unicode-Collate-0.98.tar.gz',
+        'DISTRIBUTION' => 'SADAHIRO/Unicode-Collate-0.99.tar.gz',
         'FILES'        => q[cpan/Unicode-Collate],
         'EXCLUDED'     => [
             qr{N$},
@@ -1926,7 +1952,7 @@ use File::Glob qw(:case);
                 mklocale
                 ),
         ],
-        'UPSTREAM' => 'first-come',
+        'UPSTREAM' => 'cpan',
     },
 
     'Unicode::Normalize' => {
@@ -1940,7 +1966,7 @@ use File::Glob qw(:case);
                 enableXS
                 ),
         ],
-        'UPSTREAM' => 'first-come',
+        'UPSTREAM' => 'cpan',
     },
 
     'Unicode::UCD' => {
@@ -1951,7 +1977,7 @@ use File::Glob qw(:case);
 
     'version' => {
         'MAINTAINER'   => 'jpeacock',
-        'DISTRIBUTION' => 'JPEACOCK/version-0.9903.tar.gz',
+        'DISTRIBUTION' => 'JPEACOCK/version-0.9904.tar.gz',
         'FILES'        => q[cpan/version],
         'EXCLUDED' => [
             qr{^vutil/},
@@ -1963,12 +1989,8 @@ use File::Glob qw(:case);
         # Waiting to be merged upstream: see CPAN RT#87513
         'CUSTOMIZED'   => [
             qw( lib/version.pm
-                t/01base.t
-                t/02derived.t
-                t/03require.t
-                t/04strict_lax.t
                 t/07locale.t
-                t/coretests.pm
+                t/08_corelist.t
                 ),
         ],
 
@@ -2058,12 +2080,6 @@ use File::Glob qw(:case);
         'UPSTREAM' => undef,
     },
 
-    's2p' => {
-        'MAINTAINER' => 'laun',
-        'FILES'      => q[x2p/s2p.PL],
-        'UPSTREAM'   => undef,
-    },
-
     # this pseudo-module represents all the files under ext/ and lib/
     # that aren't otherwise claimed. This means that the following two
     # commands will check that every file under ext/ and lib/ is
Unnamed repository; edit this file 'description' to name the repository.