From fd172611d1f859cac8b24983ce0841e6619e37c3 Mon Sep 17 00:00:00 2001 From: Chris 'BinGOs' Williams Date: Wed, 15 Aug 2012 07:47:38 +0100 Subject: [PATCH] Update Encode to CPAN version 2.47 [DELTA] $Revision: 2.47 $ $Date: 2012/08/15 05:36:16 $ ! Encode.pm POD Fixes: Copyright and mail address ! Makefile.PL Added LICENSE => 'perl' ! lib/Encode/GSM0338.pm t/gsm0338.t REALLY fixed RT#75670: Wrong decoding for GSM 3.38 character \x09 ucm/gsm0338.ucm is dropped from MANIFEST since 2.25 but I was fixing the wrong file! https://rt.cpan.org/Ticket/Display.html?id=75670 --- Porting/Maintainers.pl | 2 +- cpan/Encode/Changes | 17 ++++++++++++++--- cpan/Encode/Encode.pm | 8 ++++---- cpan/Encode/META.json | 4 ++-- cpan/Encode/META.yml | 4 ++-- cpan/Encode/Makefile.PL | 3 ++- cpan/Encode/lib/Encode/GSM0338.pm | 7 ++++--- cpan/Encode/t/gsm0338.t | 6 +++++- pod/perldelta.pod | 2 +- 9 files changed, 35 insertions(+), 18 deletions(-) diff --git a/Porting/Maintainers.pl b/Porting/Maintainers.pl index 80f8149..8cb7ac2 100755 --- a/Porting/Maintainers.pl +++ b/Porting/Maintainers.pl @@ -629,7 +629,7 @@ use File::Glob qw(:case); 'Encode' => { 'MAINTAINER' => 'dankogai', - 'DISTRIBUTION' => 'DANKOGAI/Encode-2.46.tar.gz', + 'DISTRIBUTION' => 'DANKOGAI/Encode-2.47.tar.gz', 'FILES' => q[cpan/Encode], 'UPSTREAM' => 'cpan', }, diff --git a/cpan/Encode/Changes b/cpan/Encode/Changes index 6bacb71..8f8f7df 100644 --- a/cpan/Encode/Changes +++ b/cpan/Encode/Changes @@ -1,12 +1,23 @@ # Revision history for Perl extension Encode. # -# $Id: Changes,v 2.46 2012/08/12 05:49:30 dankogai Exp dankogai $ +# $Id: Changes,v 2.47 2012/08/15 05:36:16 dankogai Exp dankogai $ # -$Revision: 2.46 $ $Date: 2012/08/12 05:49:30 $ +$Revision: 2.47 $ $Date: 2012/08/15 05:36:16 $ +! Encode.pm + POD Fixes: Copyright and mail address +! Makefile.PL + Added LICENSE => 'perl' +! lib/Encode/GSM0338.pm t/gsm0338.t + REALLY fixed RT#75670: Wrong decoding for GSM 3.38 character \x09 + ucm/gsm0338.ucm is dropped from MANIFEST since 2.25 + but I was fixing the wrong file! + https://rt.cpan.org/Ticket/Display.html?id=75670 + +! 2.46 2012/08/12 05:49:30 ! Encode.pm Fixed: RT#78917 for I18N-Charset: Fails with Encode 2.45 To be more exact, 2.45 broke Encode->encodings(':all') - https://rt.cpan.org/Ticket/Bug/Display.html?id=78917 + https://rt.cpan.org/Ticket/Display.html?id=78917 2.45 2012/08/05 23:08:49 ! lib/Encode/Alias.pm diff --git a/cpan/Encode/Encode.pm b/cpan/Encode/Encode.pm index db9cd05..ff7e0de 100644 --- a/cpan/Encode/Encode.pm +++ b/cpan/Encode/Encode.pm @@ -1,10 +1,10 @@ # -# $Id: Encode.pm,v 2.46 2012/08/12 05:49:30 dankogai Exp dankogai $ +# $Id: Encode.pm,v 2.47 2012/08/15 05:36:16 dankogai Exp dankogai $ # package Encode; use strict; use warnings; -our $VERSION = sprintf "%d.%02d", q$Revision: 2.46 $ =~ /(\d+)/g; +our $VERSION = sprintf "%d.%02d", q$Revision: 2.47 $ =~ /(\d+)/g; use constant DEBUG => !!$ENV{PERL_ENCODE_DEBUG}; use XSLoader (); XSLoader::load( __PACKAGE__, $VERSION ); @@ -1010,7 +1010,7 @@ the Perl Unicode Mailing List L =head1 MAINTAINER This project was originated by the late Nick Ing-Simmons and later -maintained by Dan Kogai I<< >>. See AUTHORS +maintained by Dan Kogai I<< >>. See AUTHORS for a full list of people involved. For any questions, send mail to I<< >> so that we can all share. @@ -1020,7 +1020,7 @@ who submitted code to the project. =head1 COPYRIGHT -Copyright 2002-2011 Dan Kogai I<< >>. +Copyright 2002-2012 Dan Kogai I<< >>. This library is free software; you can redistribute it and/or modify it under the same terms as Perl itself. diff --git a/cpan/Encode/META.json b/cpan/Encode/META.json index 44e6079..80ef7b7 100644 --- a/cpan/Encode/META.json +++ b/cpan/Encode/META.json @@ -6,7 +6,7 @@ "dynamic_config" : 1, "generated_by" : "ExtUtils::MakeMaker version 6.6302, CPAN::Meta::Converter version 2.120921", "license" : [ - "unknown" + "perl_5" ], "meta-spec" : { "url" : "http://search.cpan.org/perldoc?CPAN::Meta::Spec", @@ -35,5 +35,5 @@ } }, "release_status" : "stable", - "version" : "2.46" + "version" : "2.47" } diff --git a/cpan/Encode/META.yml b/cpan/Encode/META.yml index 0492b90..cf556fa 100644 --- a/cpan/Encode/META.yml +++ b/cpan/Encode/META.yml @@ -8,7 +8,7 @@ configure_requires: ExtUtils::MakeMaker: 0 dynamic_config: 1 generated_by: 'ExtUtils::MakeMaker version 6.6302, CPAN::Meta::Converter version 2.120921' -license: unknown +license: perl meta-spec: url: http://module-build.sourceforge.net/META-spec-v1.4.html version: 1.4 @@ -18,4 +18,4 @@ no_index: - t - inc requires: {} -version: 2.46 +version: 2.47 diff --git a/cpan/Encode/Makefile.PL b/cpan/Encode/Makefile.PL index 2db8802..f12f02d 100644 --- a/cpan/Encode/Makefile.PL +++ b/cpan/Encode/Makefile.PL @@ -1,5 +1,5 @@ # -# $Id: Makefile.PL,v 2.8 2009/07/08 13:34:15 dankogai Exp $ +# $Id: Makefile.PL,v 2.9 2012/08/15 05:36:16 dankogai Exp dankogai $ # use 5.007003; use strict; @@ -43,6 +43,7 @@ WriteMakefile( DIST_DEFAULT => 'all tardist', }, INC => '-I' . File::Spec->catfile( '.', 'Encode' ), + LICENSE => 'perl', PMLIBDIRS => \@pmlibdirs, INSTALLDIRS => 'perl', ); diff --git a/cpan/Encode/lib/Encode/GSM0338.pm b/cpan/Encode/lib/Encode/GSM0338.pm index 2ea71f2..381d5a4 100644 --- a/cpan/Encode/lib/Encode/GSM0338.pm +++ b/cpan/Encode/lib/Encode/GSM0338.pm @@ -1,5 +1,5 @@ # -# $Id: GSM0338.pm,v 2.1 2008/05/07 20:56:05 dankogai Exp $ +# $Id: GSM0338.pm,v 2.2 2012/08/15 05:36:16 dankogai Exp dankogai $ # package Encode::GSM0338; @@ -8,7 +8,7 @@ use warnings; use Carp; use vars qw($VERSION); -$VERSION = do { my @r = ( q$Revision: 2.1 $ =~ /\d+/g ); sprintf "%d." . "%02d" x $#r, @r }; +$VERSION = do { my @r = ( q$Revision: 2.2 $ =~ /\d+/g ); sprintf "%d." . "%02d" x $#r, @r }; use Encode qw(:fallbacks); @@ -138,7 +138,8 @@ our %UNI2GSM = ( "\x{00E4}" => "\x7B", # LATIN SMALL LETTER A WITH DIAERESIS "\x{00E5}" => "\x0F", # LATIN SMALL LETTER A WITH RING ABOVE "\x{00E6}" => "\x1D", # LATIN SMALL LETTER AE - "\x{00E7}" => "\x09", # LATIN SMALL LETTER C WITH CEDILLA + #"\x{00E7}" => "\x09", # LATIN SMALL LETTER C WITH CEDILLA + "\x{00C7}" => "\x09", # LATIN CAPITAL LETTER C WITH CEDILLA "\x{00E8}" => "\x04", # LATIN SMALL LETTER E WITH GRAVE "\x{00E9}" => "\x05", # LATIN SMALL LETTER E WITH ACUTE "\x{00EC}" => "\x07", # LATIN SMALL LETTER I WITH GRAVE diff --git a/cpan/Encode/t/gsm0338.t b/cpan/Encode/t/gsm0338.t index 822ff4f..127604b 100644 --- a/cpan/Encode/t/gsm0338.t +++ b/cpan/Encode/t/gsm0338.t @@ -13,7 +13,7 @@ BEGIN { use strict; use utf8; -use Test::More tests => 778; +use Test::More tests => 780; use Encode; use Encode::GSM0338; @@ -87,6 +87,10 @@ for my $c ( map { chr } 0 .. 127 ) { } } +# https://rt.cpan.org/Ticket/Display.html?id=75670 +is decode("gsm0338", "\x09") => chr(0xC7), 'RT75670: decode'; +is encode("gsm0338", chr(0xC7)) => "\x09", 'RT75670: encode'; + __END__ for my $c (map { chr } 0..127){ my $b = "\x1b$c"; diff --git a/pod/perldelta.pod b/pod/perldelta.pod index 0f951df..3a794a5 100644 --- a/pod/perldelta.pod +++ b/pod/perldelta.pod @@ -167,7 +167,7 @@ internals. =item * -L has been upgraded from version 2.44 to 2.46. The Mac alias x-mac-ce +L has been upgraded from version 2.44 to 2.47. The Mac alias x-mac-ce has been added, and various bugs have been fixed in Encode::Unicode and Encode::UTF7. -- 2.7.4