In perl.git, the branch maint-5.20 has been updated <http://perl5.git.perl.org/perl.git/commitdiff/f570cf7c1e17335dc907b0d959292fc080660221?hp=0f4dd660ffb8324a4fd0c8ffe4f377c4556575f4>
- Log ----------------------------------------------------------------- commit f570cf7c1e17335dc907b0d959292fc080660221 Author: Steve Hay <[email protected]> Date: Sat Jan 31 22:15:00 2015 +0000 Make Porting/cmpVERSION.pl --tag v5.18.4 happy M Porting/cmpVERSION.pl commit a8735c2fb8c50adfab0d7dbbbacac7b7e851087b Author: Steve Hay <[email protected]> Date: Sat Jan 31 22:14:42 2015 +0000 Bump $VMS::DCLsym::VERSION for commit 555bd962bf Required for Porting/cmpVERSION.pl --tag v5.18.4, but only an _01 bump since blead has already since been bumped to 1.06. M ext/VMS-DCLsym/DCLsym.pm commit 180e3e86c5e7a33f26d288243133eebb241f82eb Author: Steve Hay <[email protected]> Date: Sat Jan 31 20:55:21 2015 +0000 Bump VMS::Stdio $VERSION To keep Porting\cmpVERSION.pl --tag v5.18.4 happy. (cherry picked from commit 3d3208118267855d24632e4686da267ab15f8108) M ext/VMS-Stdio/Stdio.pm commit cf7298153de07bff5bd2426d05a098697a4d7c85 Author: Steve Hay <[email protected]> Date: Sat Jan 31 22:00:35 2015 +0000 Bump Pod::PlainText $VERSION To keep Porting\cmpVERSION.pl --tag v5.18.4 happy. (cherry picked from commit f8d8294fb886e7b57f8bb3b2a1edd33218c74281) M Porting/Maintainers.pl M cpan/Pod-Parser/lib/Pod/PlainText.pm M t/porting/customized.dat commit ae3da9779761b7076cb229eff3c2843e2c2d23a9 Author: Steve Hay <[email protected]> Date: Sat Jan 31 21:59:08 2015 +0000 Bump some CPAN $VERSIONs To keep Porting\cmpVERSION.pl --tag v5.18.4 happy. (cherry picked from commit 057e4b4ac27b64f0c638760275b3d6205d87b3f0) M Porting/Maintainers.pl M cpan/CPAN/lib/CPAN/Author.pm M cpan/CPAN/lib/CPAN/CacheMgr.pm M cpan/CPAN/lib/CPAN/FTP.pm M cpan/CPAN/lib/CPAN/HTTP/Client.pm M cpan/CPAN/lib/CPAN/HandleConfig.pm M cpan/CPAN/lib/CPAN/Index.pm M cpan/CPAN/lib/CPAN/LWP/UserAgent.pm M cpan/CPAN/lib/CPAN/Mirrors.pm M t/porting/customized.dat commit 2c9f51572ce25cd19e6d2f2a17fd8c3a1d257857 Author: Steve Hay <[email protected]> Date: Sat Jan 31 19:55:16 2015 +0000 Porting/cmpVERSION.pl - Show $VERSION of failing modules These are the $VERSIONs of modules with differing contents between two versions of Perl. This $pm_version should have been bumped to differ from $orig_pm_version. (cherry picked from commit f5872097542d02dd273d1b6a9ba7fa14e10f77d8) M Porting/cmpVERSION.pl ----------------------------------------------------------------------- Summary of changes: Porting/Maintainers.pl | 14 ++++++++++++++ Porting/cmpVERSION.pl | 9 +++++++-- cpan/CPAN/lib/CPAN/Author.pm | 2 +- cpan/CPAN/lib/CPAN/CacheMgr.pm | 2 +- cpan/CPAN/lib/CPAN/FTP.pm | 2 +- cpan/CPAN/lib/CPAN/HTTP/Client.pm | 2 +- cpan/CPAN/lib/CPAN/HandleConfig.pm | 4 ++-- cpan/CPAN/lib/CPAN/Index.pm | 2 +- cpan/CPAN/lib/CPAN/LWP/UserAgent.pm | 2 +- cpan/CPAN/lib/CPAN/Mirrors.pm | 2 +- cpan/Pod-Parser/lib/Pod/PlainText.pm | 2 +- ext/VMS-DCLsym/DCLsym.pm | 4 ++-- ext/VMS-Stdio/Stdio.pm | 2 +- t/porting/customized.dat | 9 +++++++++ 14 files changed, 43 insertions(+), 15 deletions(-) diff --git a/Porting/Maintainers.pl b/Porting/Maintainers.pl index fa85183..8ad84f9 100755 --- a/Porting/Maintainers.pl +++ b/Porting/Maintainers.pl @@ -290,6 +290,18 @@ use File::Glob qw(:case); t/yaml_code.yml ), ], + # Waiting to be merged upstream: see pull request #83 + 'CUSTOMIZED' => [ + qw( lib/CPAN/Author.pm + lib/CPAN/CacheMgr.pm + lib/CPAN/FTP.pm + lib/CPAN/HTTP/Client.pm + lib/CPAN/HandleConfig.pm + lib/CPAN/Index.pm + lib/CPAN/LWP/UserAgent.pm + lib/CPAN/Mirrors.pm + ), + ], }, # Note: When updating CPAN-Meta the META.* files will need to be regenerated @@ -948,6 +960,8 @@ use File::Glob qw(:case); 'Pod::Parser' => { 'DISTRIBUTION' => 'MAREKR/Pod-Parser-1.62.tar.gz', 'FILES' => q[cpan/Pod-Parser], + # Waiting to be merged upstream: see CPAN RT#101847 + 'CUSTOMIZED' => [ qw( lib/Pod/PlainText.pm) ], }, 'Pod::Perldoc' => { diff --git a/Porting/cmpVERSION.pl b/Porting/cmpVERSION.pl index 0123f29..f583191 100755 --- a/Porting/cmpVERSION.pl +++ b/Porting/cmpVERSION.pl @@ -83,6 +83,11 @@ my %skip; @skip{ 'cpan/ExtUtils-MakeMaker/t/lib/MakeMaker/Test/Setup/BFD.pm', # just a test module 'cpan/ExtUtils-MakeMaker/t/lib/MakeMaker/Test/Setup/XS.pm', # just a test module + 'cpan/Module-Build/t/lib/DistGen.pm', # just a test module + 'cpan/Module-Build/t/lib/MBTest.pm', # just a test module + 'cpan/Module-Metadata/t/lib/DistGen.pm', # just a test module + 'cpan/Module-Metadata/t/lib/MBTest.pm', # just a test module + 'cpan/Module-Metadata/t/lib/Tie/CPHash.pm', # just a test module 'dist/Attribute-Handlers/demo/MyClass.pm', # it's just demonstration code 'dist/Exporter/lib/Exporter/Heavy.pm', 'lib/Carp/Heavy.pm', @@ -190,11 +195,11 @@ foreach my $pm_file (sort keys %module_diffs) { and grep $pm_version eq $_, @{$skip_versions{$pm_file}}) { print "ok $count - SKIP $pm_file version $pm_version\n"; } else { - print "not ok $count - $pm_file\n"; + print "not ok $count - $pm_file version $pm_version\n"; } } else { push @diff, @{$module_diffs{$pm_file}}; - print "$pm_file\n"; + print "$pm_file version $pm_version\n"; } } } diff --git a/cpan/CPAN/lib/CPAN/Author.pm b/cpan/CPAN/lib/CPAN/Author.pm index a8429cf..572f3ab 100644 --- a/cpan/CPAN/lib/CPAN/Author.pm +++ b/cpan/CPAN/lib/CPAN/Author.pm @@ -8,7 +8,7 @@ use CPAN::InfoObj; use vars qw( $VERSION ); -$VERSION = "5.5001"; +$VERSION = "5.5002"; package CPAN::Author; use strict; diff --git a/cpan/CPAN/lib/CPAN/CacheMgr.pm b/cpan/CPAN/lib/CPAN/CacheMgr.pm index d50ed52..144efd6 100644 --- a/cpan/CPAN/lib/CPAN/CacheMgr.pm +++ b/cpan/CPAN/lib/CPAN/CacheMgr.pm @@ -10,7 +10,7 @@ use File::Find; use vars qw( $VERSION ); -$VERSION = "5.5001"; +$VERSION = "5.5002"; package CPAN::CacheMgr; use strict; diff --git a/cpan/CPAN/lib/CPAN/FTP.pm b/cpan/CPAN/lib/CPAN/FTP.pm index 8aaf3d3..831f234 100644 --- a/cpan/CPAN/lib/CPAN/FTP.pm +++ b/cpan/CPAN/lib/CPAN/FTP.pm @@ -14,7 +14,7 @@ use vars qw($connect_to_internet_ok $Ua $Thesite $ThesiteURL $Themethod); use vars qw( $VERSION ); -$VERSION = "5.5005"; +$VERSION = "5.5006"; #-> sub CPAN::FTP::ftp_statistics # if they want to rewrite, they need to pass in a filehandle diff --git a/cpan/CPAN/lib/CPAN/HTTP/Client.pm b/cpan/CPAN/lib/CPAN/HTTP/Client.pm index 8cb1c80..4fc792c 100644 --- a/cpan/CPAN/lib/CPAN/HTTP/Client.pm +++ b/cpan/CPAN/lib/CPAN/HTTP/Client.pm @@ -6,7 +6,7 @@ use vars qw(@ISA); use CPAN::HTTP::Credentials; use HTTP::Tiny 0.005; -$CPAN::HTTP::Client::VERSION = $CPAN::HTTP::Client::VERSION = "1.9600"; +$CPAN::HTTP::Client::VERSION = $CPAN::HTTP::Client::VERSION = "1.9601"; # CPAN::HTTP::Client is adapted from parts of cpanm by Tatsuhiko Miyagawa # and parts of LWP by Gisle Aas diff --git a/cpan/CPAN/lib/CPAN/HandleConfig.pm b/cpan/CPAN/lib/CPAN/HandleConfig.pm index f114321..a138128 100644 --- a/cpan/CPAN/lib/CPAN/HandleConfig.pm +++ b/cpan/CPAN/lib/CPAN/HandleConfig.pm @@ -12,7 +12,7 @@ CPAN::HandleConfig - internal configuration handling for CPAN.pm =cut -$VERSION = "5.5003"; # see also CPAN::Config::VERSION at end of file +$VERSION = "5.5005"; # see also CPAN::Config::VERSION at end of file %can = ( commit => "Commit changes to disk", @@ -768,7 +768,7 @@ sub prefs_lookup { use strict; use vars qw($AUTOLOAD $VERSION); - $VERSION = "5.5002"; + $VERSION = "5.5005"; # formerly CPAN::HandleConfig was known as CPAN::Config sub AUTOLOAD { ## no critic diff --git a/cpan/CPAN/lib/CPAN/Index.pm b/cpan/CPAN/lib/CPAN/Index.pm index f52bf36..8205d78 100644 --- a/cpan/CPAN/lib/CPAN/Index.pm +++ b/cpan/CPAN/lib/CPAN/Index.pm @@ -1,7 +1,7 @@ package CPAN::Index; use strict; use vars qw($LAST_TIME $DATE_OF_02 $DATE_OF_03 $HAVE_REANIMATED $VERSION); -$VERSION = "1.9600"; +$VERSION = "1.9601"; @CPAN::Index::ISA = qw(CPAN::Debug); $LAST_TIME ||= 0; $DATE_OF_03 ||= 0; diff --git a/cpan/CPAN/lib/CPAN/LWP/UserAgent.pm b/cpan/CPAN/lib/CPAN/LWP/UserAgent.pm index 8a59862..fe8bf27 100644 --- a/cpan/CPAN/lib/CPAN/LWP/UserAgent.pm +++ b/cpan/CPAN/lib/CPAN/LWP/UserAgent.pm @@ -6,7 +6,7 @@ use vars qw(@ISA $USER $PASSWD $SETUPDONE); use CPAN::HTTP::Credentials; # we delay requiring LWP::UserAgent and setting up inheritance until we need it -$CPAN::LWP::UserAgent::VERSION = $CPAN::LWP::UserAgent::VERSION = "1.9600"; +$CPAN::LWP::UserAgent::VERSION = $CPAN::LWP::UserAgent::VERSION = "1.9601"; sub config { diff --git a/cpan/CPAN/lib/CPAN/Mirrors.pm b/cpan/CPAN/lib/CPAN/Mirrors.pm index 4304f53..37e7ce0 100644 --- a/cpan/CPAN/lib/CPAN/Mirrors.pm +++ b/cpan/CPAN/lib/CPAN/Mirrors.pm @@ -34,7 +34,7 @@ CPAN::Mirrors - Get CPAN mirror information and select a fast one package CPAN::Mirrors; use strict; use vars qw($VERSION $urllist $silent); -$VERSION = "1.9600"; +$VERSION = "1.9601"; use Carp; use FileHandle; diff --git a/cpan/Pod-Parser/lib/Pod/PlainText.pm b/cpan/Pod-Parser/lib/Pod/PlainText.pm index 5f93b88..3db4d90 100644 --- a/cpan/Pod-Parser/lib/Pod/PlainText.pm +++ b/cpan/Pod-Parser/lib/Pod/PlainText.pm @@ -29,7 +29,7 @@ use vars qw(@ISA %ESCAPES $VERSION); # by Pod::Usage. @ISA = qw(Pod::Select); -$VERSION = '2.06'; +$VERSION = '2.07'; BEGIN { if ($] < 5.006) { diff --git a/ext/VMS-DCLsym/DCLsym.pm b/ext/VMS-DCLsym/DCLsym.pm index 6548223..f299c43 100644 --- a/ext/VMS-DCLsym/DCLsym.pm +++ b/ext/VMS-DCLsym/DCLsym.pm @@ -7,7 +7,7 @@ use strict; # Package globals @ISA = ( 'DynaLoader' ); -$VERSION = '1.05'; +$VERSION = '1.05_01'; my(%Locsyms) = ( ':ID' => 'LOCAL' ); my(%Gblsyms) = ( ':ID' => 'GLOBAL'); my $DoCache = 1; @@ -265,7 +265,7 @@ Charles Bailey [email protected] =head1 VERSION -1.05 12-Feb-2011 +1.05_01 16-Jun-2013 =head1 BUGS diff --git a/ext/VMS-Stdio/Stdio.pm b/ext/VMS-Stdio/Stdio.pm index 1b8a4f7..4d05994 100644 --- a/ext/VMS-Stdio/Stdio.pm +++ b/ext/VMS-Stdio/Stdio.pm @@ -13,7 +13,7 @@ use Carp '&croak'; use DynaLoader (); use Exporter (); -$VERSION = '2.4'; +$VERSION = '2.41'; @ISA = qw( Exporter DynaLoader IO::File ); @EXPORT = qw( &O_APPEND &O_CREAT &O_EXCL &O_NDELAY &O_NOWAIT &O_RDONLY &O_RDWR &O_TRUNC &O_WRONLY ); diff --git a/t/porting/customized.dat b/t/porting/customized.dat index 37d6bf2..04c8db0 100644 --- a/t/porting/customized.dat +++ b/t/porting/customized.dat @@ -1,3 +1,11 @@ +CPAN cpan/CPAN/lib/CPAN/Author.pm 792d7c8fbe6ed45e1244e589a8b712878c5dd2a5 +CPAN cpan/CPAN/lib/CPAN/CacheMgr.pm 132adb7f96014ec7ded45457044ed925d3181475 +CPAN cpan/CPAN/lib/CPAN/FTP.pm 3f0d5fc572c8749a566d73ca892c6c89ce3fb676 +CPAN cpan/CPAN/lib/CPAN/HandleConfig.pm e52052b6ef6d1d664f0ffa6cf01d48a8d1321520 +CPAN cpan/CPAN/lib/CPAN/HTTP/Client.pm 242842ca566fd8e3d776deb549ff758a571ca2e3 +CPAN cpan/CPAN/lib/CPAN/Index.pm 73aee30450127c5ac4dc05abc2c10a8accd4b198 +CPAN cpan/CPAN/lib/CPAN/LWP/UserAgent.pm e09525b0c2377c5ac28b7fad1b6d70c57e343913 +CPAN cpan/CPAN/lib/CPAN/Mirrors.pm 580e74746abaf1628d533015d5b529d82a470af4 Digest::MD5 cpan/Digest-MD5/t/files.t bdbe05b705d9da305fedce7a9f4b6ba63250c7cf Encode cpan/Encode/bin/enc2xs f60036fd3574ec05c9aab7f4db00a828d5dea92d Encode cpan/Encode/Byte/Makefile.PL 0986e25f981a3bf182a13a0060d28d4efedd87e6 @@ -12,6 +20,7 @@ Encode cpan/Encode/Symbol/Makefile.PL 4beddbbd00f638b7de9c6cd0821d9d38020a8218 Encode cpan/Encode/TW/Makefile.PL 0cc44f95e59f45c0fb3b66bde41525f13c19a25c Module::Build cpan/Module-Build/lib/Module/Build/ConfigData.pm 85eb9656e68d1f256737dc52d86b5d0fed28f832 PerlIO::via::QuotedPrint cpan/PerlIO-via-QuotedPrint/t/QuotedPrint.t ca39f0146e89de02c746e199c45dcb3e5edad691 +Pod::Parser cpan/Pod-Parser/lib/Pod/PlainText.pm f0b490545b4e52e141450d1192d0ca00bd8d7a82 Text::Balanced cpan/Text-Balanced/t/01_compile.t 1598cf491a48fa546260a2ec41142abe84da533d Text::Balanced cpan/Text-Balanced/t/02_extbrk.t 6ba1b64a4604e822dc2260b8ffcea6b406339ee8 Text::Balanced cpan/Text-Balanced/t/03_extcbk.t 3307c980af28963414cab799c427b359ef3b8657 -- Perl5 Master Repository
