In perl.git, the branch blead has been updated <http://perl5.git.perl.org/perl.git/commitdiff/c2062197fdd9d9368439fc4f47b6043c665f6e1e?hp=9a05568773864b86272cd01e8647c71f8299cf31>
- Log ----------------------------------------------------------------- commit c2062197fdd9d9368439fc4f47b6043c665f6e1e Author: Steve Hay <[email protected]> Date: Sat Jan 31 21:52:43 2015 +0000 Bump Encode::Unicode $VERSION To keep Porting\cmpVERSION.pl --tag v5.20.1 happy. M Porting/Maintainers.pl M cpan/Encode/Unicode/Unicode.pm M t/porting/customized.dat commit a162ba07d7805eed6dd2b09297a5c3bd5ea94f56 Author: Steve Hay <[email protected]> Date: Sat Jan 31 21:30:41 2015 +0000 Bump $Encode::encoding::VERSION Already noted as CUSTOMIZED by 3e669301f0 (which omitted the $VERSION bump). M cpan/Encode/encoding.pm M t/porting/customized.dat commit 3d3208118267855d24632e4686da267ab15f8108 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. M ext/VMS-Stdio/Stdio.pm commit f8d8294fb886e7b57f8bb3b2a1edd33218c74281 Author: Steve Hay <[email protected]> Date: Sat Jan 31 20:50:59 2015 +0000 Bump Pod::PlainText $VERSION To keep Porting\cmpVERSION.pl --tag v5.18.4 happy. M Porting/Maintainers.pl M cpan/Pod-Parser/lib/Pod/PlainText.pm M t/porting/customized.dat commit 057e4b4ac27b64f0c638760275b3d6205d87b3f0 Author: Steve Hay <[email protected]> Date: Sat Jan 31 20:38:40 2015 +0000 Bump some CPAN $VERSIONs To keep Porting\cmpVERSION.pl --tag v5.18.4 happy. 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 f5872097542d02dd273d1b6a9ba7fa14e10f77d8 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. M Porting/cmpVERSION.pl ----------------------------------------------------------------------- Summary of changes: Porting/Maintainers.pl | 24 +++++++++++++++++++++--- Porting/cmpVERSION.pl | 4 ++-- 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/Encode/Unicode/Unicode.pm | 2 +- cpan/Encode/encoding.pm | 4 ++-- cpan/Pod-Parser/lib/Pod/PlainText.pm | 2 +- ext/VMS-Stdio/Stdio.pm | 2 +- t/porting/customized.dat | 12 +++++++++++- 15 files changed, 48 insertions(+), 20 deletions(-) diff --git a/Porting/Maintainers.pl b/Porting/Maintainers.pl index e0f8ee5..9ad392a 100755 --- a/Porting/Maintainers.pl +++ b/Porting/Maintainers.pl @@ -277,6 +277,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 @@ -382,9 +394,13 @@ use File::Glob qw(:case); 'Encode' => { 'DISTRIBUTION' => 'DANKOGAI/Encode-2.68.tar.gz', 'FILES' => q[cpan/Encode], - # Waiting to be merged upstream if it smokes ok: see CPAN RT#100347, - # in particular see khw's comments on that ticket on 21 Nov 2014. - 'CUSTOMIZED' => [ qw( encoding.pm ) ], + 'CUSTOMIZED' => [ + # Waiting to be merged upstream if it smokes ok: see CPAN RT#100347, + # in particular see khw's comments on that ticket on 21 Nov 2014. + qw( encoding.pm ), + # Waiting to be merged upstream: see pull request #31 + qw( Unicode/Unicode.pm ), + ], }, 'encoding::warnings' => { @@ -902,6 +918,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 37017cf..7964b9b 100755 --- a/Porting/cmpVERSION.pl +++ b/Porting/cmpVERSION.pl @@ -189,11 +189,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/Encode/Unicode/Unicode.pm b/cpan/Encode/Unicode/Unicode.pm index 6b35cb7..75da3d7 100644 --- a/cpan/Encode/Unicode/Unicode.pm +++ b/cpan/Encode/Unicode/Unicode.pm @@ -4,7 +4,7 @@ use strict; use warnings; no warnings 'redefine'; -our $VERSION = do { my @r = ( q$Revision: 2.9 $ =~ /\d+/g ); sprintf "%d." . "%02d" x $#r, @r }; +our $VERSION = do { my @r = ( q$Revision: 2.10 $ =~ /\d+/g ); sprintf "%d." . "%02d" x $#r, @r }; use XSLoader; XSLoader::load( __PACKAGE__, $VERSION ); diff --git a/cpan/Encode/encoding.pm b/cpan/Encode/encoding.pm index 8674cfa..167c2fb 100644 --- a/cpan/Encode/encoding.pm +++ b/cpan/Encode/encoding.pm @@ -1,6 +1,6 @@ -# $Id: encoding.pm,v 2.12 2013/04/26 18:30:46 dankogai Exp $ +# $Id: encoding.pm,v 2.13 2013/04/26 18:30:46 dankogai Exp $ package encoding; -our $VERSION = sprintf "%d.%02d", q$Revision: 2.12 $ =~ /(\d+)/g; +our $VERSION = sprintf "%d.%02d", q$Revision: 2.13 $ =~ /(\d+)/g; use Encode; use strict; 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-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 9bde2de..9b6063e 100644 --- a/t/porting/customized.dat +++ b/t/porting/customized.dat @@ -1,6 +1,16 @@ -Encode cpan/Encode/encoding.pm 506ec84f1fbbff189c3f4f47b92aff5afc95b98e +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 +Encode cpan/Encode/encoding.pm baa25e197ba4d5fa228dbf7b440afb5ae18ec5ed +Encode cpan/Encode/Unicode/Unicode.pm 3ba3aeffd03c89c40195a189a98f7e47a11c2a11 ExtUtils::MakeMaker cpan/ExtUtils-MakeMaker/t/pm_to_blib.t 71ebcee355691ce374fcad251b12d8b2412462b3 PerlIO::via::QuotedPrint cpan/PerlIO-via-QuotedPrint/t/QuotedPrint.t ca39f0146e89de02c746e199c45dcb3e5edad691 +Pod::Parser cpan/Pod-Parser/lib/Pod/PlainText.pm f0b490545b4e52e141450d1192d0ca00bd8d7a82 Test::Simple cpan/Test-Simple/t/Legacy/exit.t 83edbf569d56d8cdbabea552dfe5602ea1c1822e Text::Balanced cpan/Text-Balanced/t/01_compile.t 1598cf491a48fa546260a2ec41142abe84da533d Text::Balanced cpan/Text-Balanced/t/02_extbrk.t 6ba1b64a4604e822dc2260b8ffcea6b406339ee8 -- Perl5 Master Repository
