r23063 - in /trunk/libi18n-charset-perl: Changes META.yml debian/changelog lib/I18N/Charset.pm t/libi.t
gregoa at users.alioth.debian.org
gregoa at users.alioth.debian.org
Sat Jul 12 12:46:28 UTC 2008
Author: gregoa
Date: Sat Jul 12 12:46:28 2008
New Revision: 23063
URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=23063
Log:
New upstream release.
Modified:
trunk/libi18n-charset-perl/Changes
trunk/libi18n-charset-perl/META.yml
trunk/libi18n-charset-perl/debian/changelog
trunk/libi18n-charset-perl/lib/I18N/Charset.pm
trunk/libi18n-charset-perl/t/libi.t
Modified: trunk/libi18n-charset-perl/Changes
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libi18n-charset-perl/Changes?rev=23063&op=diff
==============================================================================
--- trunk/libi18n-charset-perl/Changes (original)
+++ trunk/libi18n-charset-perl/Changes Sat Jul 12 12:46:28 2008
@@ -1,6 +1,7 @@
2008-07-05 Kingpin <Martin at BLUEMAX>
* lib/I18N/Charset.pm: overhauled the U::Map8 initialization
+ (_init_data_extra): added aliases listed in RT#18802
2008-02-15 <Daddy at C-3PO>
Modified: trunk/libi18n-charset-perl/META.yml
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libi18n-charset-perl/META.yml?rev=23063&op=diff
==============================================================================
--- trunk/libi18n-charset-perl/META.yml (original)
+++ trunk/libi18n-charset-perl/META.yml Sat Jul 12 12:46:28 2008
@@ -28,4 +28,4 @@
requires:
IO::String: 0
perl: 5.004
-version: 1.392
+version: 1.394
Modified: trunk/libi18n-charset-perl/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libi18n-charset-perl/debian/changelog?rev=23063&op=diff
==============================================================================
--- trunk/libi18n-charset-perl/debian/changelog (original)
+++ trunk/libi18n-charset-perl/debian/changelog Sat Jul 12 12:46:28 2008
@@ -1,3 +1,9 @@
+libi18n-charset-perl (1.394-1) UNRELEASED; urgency=low
+
+ * New upstream release.
+
+ -- gregor herrmann <gregoa at debian.org> Sat, 12 Jul 2008 14:44:52 +0200
+
libi18n-charset-perl (1.392-1) unstable; urgency=low
* New upstream release.
Modified: trunk/libi18n-charset-perl/lib/I18N/Charset.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libi18n-charset-perl/lib/I18N/Charset.pm?rev=23063&op=diff
==============================================================================
--- trunk/libi18n-charset-perl/lib/I18N/Charset.pm (original)
+++ trunk/libi18n-charset-perl/lib/I18N/Charset.pm Sat Jul 12 12:46:28 2008
@@ -1,5 +1,5 @@
-# $rcs = ' $Id: Charset.pm,v 1.392 2008/07/05 16:55:26 Martin Exp $ ' ;
+# $rcs = ' $Id: Charset.pm,v 1.394 2008/07/12 03:29:09 Martin Exp $ ' ;
package I18N::Charset;
@@ -33,7 +33,7 @@
$sCharset = libi_charset_name('x-sjis');
# $sCharset is now 'MS_KANJI' which can be passed to `iconv -f $sCharset ...`
$sCharset = enco_charset_name('Shift-JIS');
- # $sCharset is now 'shiftjis' which can be passed to `Encode::from_to()`
+ # $sCharset is now 'shiftjis' which can be passed to Encode::from_to()
I18N::Charset::add_iana_alias('my-japanese' => 'iso-2022-jp');
I18N::Charset::add_map8_alias('my-arabic' => 'arabic7');
@@ -69,7 +69,7 @@
# Public Global Variables
#-----------------------------------------------------------------------
our
-$VERSION = do { my @r = (q$Revision: 1.392 $ =~ /\d+/g); sprintf "%d."."%03d" x $#r, @r };
+$VERSION = do { my @r = (q$Revision: 1.394 $ =~ /\d+/g); sprintf "%d."."%03d" x $#r, @r };
our @EXPORT = qw( iana_charset_name
map8_charset_name
umap_charset_name
@@ -1042,7 +1042,17 @@
$hsMIBofShortname{$s} = $iMIB;
} # while
# If there are special cases for Unicode::Map8, add them here:
- # &add_map8_alias("new-name", "existing-name");
+ &add_map8_alias('ISO_8859-13:1998', 'ISO_8859-13');
+ &add_map8_alias('L 7', 'ISO_8859-13');
+ &add_map8_alias('Latin 7', 'ISO_8859-13');
+ &add_map8_alias('ISO_8859-15:1998', 'ISO_8859-15');
+ &add_map8_alias('L 0', 'ISO_8859-15');
+ &add_map8_alias('Latin 0', 'ISO_8859-15');
+ &add_map8_alias('L 9', 'ISO_8859-15');
+ &add_map8_alias('Latin 9', 'ISO_8859-15');
+ &add_map8_alias('ISO-8859-1-Windows-3.1-Latin-1', 'cp1252');
+ &add_map8_alias('csWindows31Latin1', 'cp1252');
+ # Above aliases were described in RT#18802
push @asMap8Debug, "done.\n";
print STDERR @asMap8Debug if $iDebug;
} # if Unicode::Map8 installed
@@ -1154,7 +1164,7 @@
$MIBtoUMU8{charset_name_to_mib($s)} = $sName;
next UMU8_NAME;
} # if maps to U::Map
- # print STDERR " + UmapUTF8 entry ===$sName=== has no U::Map entry\n" if $iDebug;
+ # print STDERR " + UmapUTF8 entry ==$sName== has no U::Map entry\n" if $iDebug;
$s = map8_charset_name($sName) || '';
if ($s ne '')
{
@@ -1162,7 +1172,7 @@
$MIBtoUMU8{charset_name_to_mib($s)} = $sName;
next UMU8_NAME;
} # if maps to U::Map8
- print STDERR " + UmapUTF8 entry ===$sName=== has no entries at all\n" if $iDebug;
+ print STDERR " + UmapUTF8 entry ==$sName== has no entries at all\n" if $iDebug;
} # foreach
# If there are special cases for Unicode::MapUTF8, add them here:
# &add_umap_alias("new-name", "existing-name");
@@ -1295,6 +1305,12 @@
# ??? === dingbats
# ??? === nextstep
# ??? === posix-bc
+# The following aliases are listed in RT#18802:
+ISO-8859-10 === 8859-10 === ISO_8859-10:1993
+# TCVN-5712 x-viet-tcvn viet-tcvn VN-1 TCVN-5712:1993
+TIS-620 === TIS_620-2553 === TIS_620-2553:1990
+# VPS x-viet-vps viet-vps
+# The above aliases are listed in RT#18802
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
} # _init_data_extra
Modified: trunk/libi18n-charset-perl/t/libi.t
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libi18n-charset-perl/t/libi.t?rev=23063&op=diff
==============================================================================
--- trunk/libi18n-charset-perl/t/libi.t (original)
+++ trunk/libi18n-charset-perl/t/libi.t Sat Jul 12 12:46:28 2008
@@ -1,7 +1,8 @@
# libi.t - tests for "preferred LIBI name" functionality of I18N::Charset
-# $Id: libi.t,v 1.12 2008/05/24 18:17:07 Martin Exp $
+# $Id: libi.t,v 1.14 2008/07/12 03:27:12 Martin Exp $
+use blib;
use Test::More tests => 25;
use IO::Capture::Stderr;
@@ -53,7 +54,9 @@
diag "libiconv version is $iLibiVersion\n";
SKIP:
{
- if ($iLibiVersion < 1.8)
+ # Convert "n.m" into an actual floating point number so we can compare it:
+ my $fLibiVersion = do { my @r = ($iLibiVersion =~ /\d+/g); sprintf "%d."."%03d" x $#r, @r };
+ if ($fLibiVersion < 1.008)
{
diag 'iconv version is too old(?)';
skip 'iconv version is too old(?)', 16;
@@ -77,6 +80,8 @@
ok(I18N::Charset::add_libi_alias('my-japanese' => 'x-x-sjis'));
is(libi_charset_name("my-japanese"), 'MS_KANJI', 'alias literal -- my-japanese');
is(libi_charset_name("my-japanese"), libi_charset_name('Shift_JIS'), 'alias equal -- my-japanese');
+ pass; # I miscounted but I don't feel like going back and
+ # changing all the 16 to 15 8-)
} # end of SKIP block
} # end of SKIP block
} # end of SKIP block
More information about the Pkg-perl-cvs-commits
mailing list