Upgrade Encode from version 2.70 to 2.72

This incorporates all current blead customizations.

diff --git a/Porting/Maintainers.pl b/Porting/Maintainers.pl
index 599af4f..d137dd8 100755 (executable)
--- a/Porting/Maintainers.pl
+++ b/Porting/Maintainers.pl
@@ -381,13 +381,8 @@ use File::Glob qw(:case);
     },
 
     'Encode' => {
-        'DISTRIBUTION' => 'DANKOGAI/Encode-2.70.tar.gz',
+        'DISTRIBUTION' => 'DANKOGAI/Encode-2.72.tar.gz',
         'FILES'        => q[cpan/Encode],
-        '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 ),
-        ],
     },
 
     'encoding::warnings' => {

diff --git a/cpan/Encode/Encode.pm b/cpan/Encode/Encode.pm
index 7a9135c..3bb1097 100644 (file)
--- a/cpan/Encode/Encode.pm
+++ b/cpan/Encode/Encode.pm
@@ -1,10 +1,10 @@
 #
-# $Id: Encode.pm,v 2.70 2015/02/05 10:52:16 dankogai Exp $
+# $Id: Encode.pm,v 2.72 2015/03/14 02:43:24 dankogai Exp $
 #
 package Encode;
 use strict;
 use warnings;
-our $VERSION = sprintf "%d.%02d", q$Revision: 2.70 $ =~ /(\d+)/g;
+our $VERSION = sprintf "%d.%02d", q$Revision: 2.72 $ =~ /(\d+)/g;
 use constant DEBUG => !!$ENV{PERL_ENCODE_DEBUG};
 use XSLoader ();
 XSLoader::load( __PACKAGE__, $VERSION );

diff --git a/cpan/Encode/Makefile.PL b/cpan/Encode/Makefile.PL
index 8193de3..7da9329 100644 (file)
--- a/cpan/Encode/Makefile.PL
+++ b/cpan/Encode/Makefile.PL
@@ -1,5 +1,5 @@
 #
-# $Id: Makefile.PL,v 2.13 2015/02/05 10:53:00 dankogai Exp dankogai $
+# $Id: Makefile.PL,v 2.13 2015/02/05 10:53:00 dankogai Exp $
 #
 use 5.007003;
 use strict;

diff --git a/cpan/Encode/encoding.pm b/cpan/Encode/encoding.pm
index 167c2fb..fde410d 100644 (file)
--- a/cpan/Encode/encoding.pm
+++ b/cpan/Encode/encoding.pm
@@ -1,6 +1,6 @@
-# $Id: encoding.pm,v 2.13 2013/04/26 18:30:46 dankogai Exp $
+# $Id: encoding.pm,v 2.14 2015/03/14 02:44:39 dankogai Exp dankogai $
 package encoding;
-our $VERSION = sprintf "%d.%02d", q$Revision: 2.13 $ =~ /(\d+)/g;
+our $VERSION = sprintf "%d.%02d", q$Revision: 2.14 $ =~ /(\d+)/g;
 
 use Encode;
 use strict;

diff --git a/cpan/Encode/lib/Encode/Alias.pm b/cpan/Encode/lib/Encode/Alias.pm
index 28d3cad..c0945be 100644 (file)
--- a/cpan/Encode/lib/Encode/Alias.pm
+++ b/cpan/Encode/lib/Encode/Alias.pm
@@ -2,7 +2,7 @@ package Encode::Alias;
 use strict;
 use warnings;
 no warnings 'redefine';
-our $VERSION = do { my @r = ( q$Revision: 2.18 $ =~ /\d+/g ); sprintf "%d." . "%02d" x $#r, @r };
+our $VERSION = do { my @r = ( q$Revision: 2.19 $ =~ /\d+/g ); sprintf "%d." . "%02d" x $#r, @r };
 use constant DEBUG => !!$ENV{PERL_ENCODE_DEBUG};
 
 use Exporter 'import';
@@ -256,6 +256,10 @@ sub init_aliases {
         define_alias( qr/\bhk(?:scs)?[-_]?big5$/i => '"big5-hkscs"' );
     }
 
+    # https://github.com/dankogai/p5-encode/issues/37
+    define_alias(qr/cp65000/i => '"UTF-7"');
+    define_alias(qr/cp65001/i => '"utf-8-strict"');
+
     # utf8 is blessed :)
     define_alias( qr/\bUTF-8$/i => '"utf-8-strict"' );
 

diff --git a/cpan/Encode/t/Aliases.t b/cpan/Encode/t/Aliases.t
index d7a72d2..2fc14cc 100644 (file)
--- a/cpan/Encode/t/Aliases.t
+++ b/cpan/Encode/t/Aliases.t
@@ -81,6 +81,8 @@ sub init_a2c{
         'jis0208-raw'   => $ON_EBCDIC ? '' : 'jis0208-raw',
         'jis0212-raw'   => $ON_EBCDIC ? '' : 'jis0212-raw',
         'ksc5601-raw'   => $ON_EBCDIC ? '' : 'ksc5601-raw',
+        'cp65000' => 'UTF-7',
+        'cp65001' => 'utf-8-strict',
        );
 
     for my $i (1..11,13..16){

diff --git a/pod/perldelta.pod b/pod/perldelta.pod
index 3ee8432..9c40ade 100644 (file)
--- a/pod/perldelta.pod
+++ b/pod/perldelta.pod
@@ -164,6 +164,10 @@ L<[cpan #95271]|https://rt.cpan.org/Ticket/Display.html?id=95271>
 
 =item *
 
+L<Encode> has been upgraded from version 2.70 to 2.72.
+
+=item *
+
 L<Test::Simple> has been reverted from version 1.301001_098 to 1.001014.
 
 =item *

diff --git a/t/porting/customized.dat b/t/porting/customized.dat
index 0a9ad1c..e97bf97 100644 (file)
--- a/t/porting/customized.dat
+++ b/t/porting/customized.dat
@@ -1,4 +1,3 @@
-Encode cpan/Encode/encoding.pm baa25e197ba4d5fa228dbf7b440afb5ae18ec5ed
 ExtUtils::MakeMaker cpan/ExtUtils-MakeMaker/t/pm_to_blib.t 71ebcee355691ce374fcad251b12d8b2412462b3
 PerlIO::via::QuotedPrint cpan/PerlIO-via-QuotedPrint/t/QuotedPrint.t ca39f0146e89de02c746e199c45dcb3e5edad691
 Text::ParseWords cpan/Text-ParseWords/t/ParseWords.t 9bae51c9b944cd5c0bbabe9d397e573976a2be8e