In perl.git, the branch blead has been updated

<http://perl5.git.perl.org/perl.git/commitdiff/0f83390ec040bf71772034647ad4b9586471d838?hp=d187b712a6af2c12904446f06de1eb336ab61a72>

- Log -----------------------------------------------------------------
commit 0f83390ec040bf71772034647ad4b9586471d838
Author: Steve Hay <[email protected]>
Date:   Mon Dec 29 15:22:43 2014 +0000

    More CUSTOMIZED updates:
    
    - The Encode change already has a CPAN RT ticket, so note it here.
    - The Socket changes were assimilated by v2.016
    - The autodie changes were assimilated by v2.26
-----------------------------------------------------------------------

Summary of changes:
 Porting/Maintainers.pl   | 6 ++----
 t/porting/customized.dat | 3 ---
 2 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/Porting/Maintainers.pl b/Porting/Maintainers.pl
index 3db33d7..22c346c 100755
--- a/Porting/Maintainers.pl
+++ b/Porting/Maintainers.pl
@@ -384,6 +384,8 @@ use File::Glob qw(:case);
     'Encode' => {
         'DISTRIBUTION' => 'DANKOGAI/Encode-2.67.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 ) ],
     },
 
@@ -972,10 +974,6 @@ use File::Glob qw(:case);
     'Socket' => {
         'DISTRIBUTION' => 'PEVANS/Socket-2.016.tar.gz',
         'FILES'        => q[cpan/Socket],
-        'CUSTOMIZED'   => [
-            # Waiting to be merged upstream: see CPAN RT#98217
-            qw(        t/getnameinfo.t ),
-        ],
     },
 
     'Storable' => {
diff --git a/t/porting/customized.dat b/t/porting/customized.dat
index 9f27367..0c1e483 100644
--- a/t/porting/customized.dat
+++ b/t/porting/customized.dat
@@ -1,7 +1,6 @@
 Digest::MD5 cpan/Digest-MD5/t/files.t bdbe05b705d9da305fedce7a9f4b6ba63250c7cf
 Encode cpan/Encode/encoding.pm 506ec84f1fbbff189c3f4f47b92aff5afc95b98e
 PerlIO::via::QuotedPrint cpan/PerlIO-via-QuotedPrint/t/QuotedPrint.t 
ca39f0146e89de02c746e199c45dcb3e5edad691
-Socket cpan/Socket/t/getnameinfo.t f25ae4125d64a81538d4d3b73a3a0b9ce3c0404d
 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
@@ -14,8 +13,6 @@ Text::Balanced cpan/Text-Balanced/t/08_extvar.t 
0776ef2cbdad5b1fbefb300541d07921
 Text::Balanced cpan/Text-Balanced/t/09_gentag.t 
42361b5dfb3bb728bce20f4fb0d92ccfb27c2ba7
 Text::ParseWords cpan/Text-ParseWords/t/ParseWords.t 
9bae51c9b944cd5c0bbabe9d397e573976a2be8e
 Text::ParseWords cpan/Text-ParseWords/t/taint.t 
3cff0dae812801f7aa1738d6070508f2c5bcc2e5
-autodie cpan/autodie/t/truncate.t 0fa688d8838b2b4d5b6508f244f4eb099a72e86f
-autodie cpan/autodie/t/utf8_open.t 5295851351c49f939008c5aca6a798742b1e503d
 podlators cpan/podlators/scripts/pod2man.PL 
f81acf53f3ff46cdcc5ebdd661c5d13eb35d20d6
 podlators cpan/podlators/scripts/pod2text.PL 
b4693fcfe4a0a1b38a215cfb8985a65d5d025d69
 threads dist/threads/lib/threads.pm e1b210ff6d66a0e1d43aa8f040954fc811e3d250

--
Perl5 Master Repository

Reply via email to