In perl.git, the branch blead has been updated <http://perl5.git.perl.org/perl.git/commitdiff/4fa93b191d96930b07c44798f2e63d5249bb21e7?hp=0d0bc2309b74ca16deba27d964086b3a30154bbd>
- Log ----------------------------------------------------------------- commit 4fa93b191d96930b07c44798f2e63d5249bb21e7 Author: Steve Hay <[email protected]> Date: Mon Jan 6 12:51:32 2014 +0000 Fix up the MAP for version following its upgrade to version 0.9906 It appears that vutil.c is also customized for blead. M META.json M META.yml M Porting/Maintainers.pl M t/porting/customized.dat commit c872d591548a07349d13a7e99560c5f7fb0a6fbb Author: Steve Hay <[email protected]> Date: Mon Jan 6 09:31:10 2014 +0000 version has been upgraded from version 0.9904 to 0.9906 The customizations to two tests in CPAN RT#87513 are no longer required, and lib/version/typemap no longer exists. M Porting/Maintainers.pl ----------------------------------------------------------------------- Summary of changes: META.json | 5 ++++- META.yml | 3 +++ Porting/Maintainers.pl | 17 ++++++++--------- t/porting/customized.dat | 3 +-- 4 files changed, 16 insertions(+), 12 deletions(-) diff --git a/META.json b/META.json index 26e8df8..c3679fe 100644 --- a/META.json +++ b/META.json @@ -109,7 +109,10 @@ "pod/perlpodstyle.pod", "Porting/Maintainers.pm", "Porting/perldelta_template.pod", - "TestInit.pm" + "TestInit.pm", + "vutil.c", + "vutil.h", + "vxs.inc" ] }, "release_status" : "unstable", diff --git a/META.yml b/META.yml index 998e8e9..4873dcc 100644 --- a/META.yml +++ b/META.yml @@ -107,6 +107,9 @@ no_index: - Porting/Maintainers.pm - Porting/perldelta_template.pod - TestInit.pm + - vutil.c + - vutil.h + - vxs.inc resources: bugtracker: https://rt.perl.org/ homepage: http://www.perl.org/ diff --git a/Porting/Maintainers.pl b/Porting/Maintainers.pl index 81d5fb3..433378c 100755 --- a/Porting/Maintainers.pl +++ b/Porting/Maintainers.pl @@ -1259,29 +1259,28 @@ use File::Glob qw(:case); }, 'version' => { - 'DISTRIBUTION' => 'JPEACOCK/version-0.9904.tar.gz', + 'DISTRIBUTION' => 'JPEACOCK/version-0.9906.tar.gz', 'FILES' => q[cpan/version], + 'FILES' => q[cpan/version vutil.c vutil.h vxs.inc], 'EXCLUDED' => [ qr{^vutil/lib/}, 'vutil/ppport.h', 'vutil/vxs.xs', - 'lib/version/typemap', 't/survey_locales', - 'vperl/vpp.pm', ], - # Waiting to be merged upstream: see CPAN RT#87513 + # When adding the CPAN-distributed files for version.pm, it is necessary + # to delete an entire block out of lib/version.pm, since that code is + # only necessary with the CPAN release. 'CUSTOMIZED' => [ qw( lib/version.pm - t/07locale.t - t/08_corelist.t + vutil.c ), ], 'MAP' => { - 'vutil.c' => 'vutil.c', - 'vutil.h' => 'vutil.h', - 'vxs.inc' => 'vxs.inc', + 'vperl/' => 'cpan/version/lib/version/', + 'vutil/' => '', '' => 'cpan/version/', }, }, diff --git a/t/porting/customized.dat b/t/porting/customized.dat index 2f4044b..9786c54 100644 --- a/t/porting/customized.dat +++ b/t/porting/customized.dat @@ -17,5 +17,4 @@ libnet cpan/libnet/Makefile.PL 8cc723f0e1d2177af46ef4e41fc1f362085520df podlators cpan/podlators/scripts/pod2man.PL f81acf53f3ff46cdcc5ebdd661c5d13eb35d20d6 podlators cpan/podlators/scripts/pod2text.PL b4693fcfe4a0a1b38a215cfb8985a65d5d025d69 version cpan/version/lib/version.pm 3934bcc033f1f15aed2ba78017f71d2e5482deca -version cpan/version/t/07locale.t 9ec512b4ef9cd6d6ab26c4215692048925fd0179 -version cpan/version/t/08_corelist.t 3094fab78b4e8a5471d0c3bcca2402317c6562d0 +version vutil.c 39e39049e2a42bed505ea6d56430ea7bfef5e89b -- Perl5 Master Repository
