r20614 - in /trunk/libi18n-charset-perl/debian: changelog patches/t_utf8.patch

[gregoa at users.alioth.debian.org]

Author: gregoa
Date: Sun Jun  1 17:53:29 2008
New Revision: 20614

URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=20614
Log:
Refresh patch t_utf8.patch.

Modified:
    trunk/libi18n-charset-perl/debian/changelog
    trunk/libi18n-charset-perl/debian/patches/t_utf8.patch

Modified: trunk/libi18n-charset-perl/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libi18n-charset-perl/debian/changelog?rev=20614&op=diff
==============================================================================
--- trunk/libi18n-charset-perl/debian/changelog (original)
+++ trunk/libi18n-charset-perl/debian/changelog Sun Jun  1 17:53:29 2008
@@ -1,6 +1,7 @@
 libi18n-charset-perl (1.389-1) UNRELEASED; urgency=low
 
   * New upstream release.
+  * Refresh patch t_utf8.patch.
 
  -- gregor herrmann <gregoa at debian.org>  Sun, 01 Jun 2008 18:03:28 +0200
 

Modified: trunk/libi18n-charset-perl/debian/patches/t_utf8.patch
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libi18n-charset-perl/debian/patches/t_utf8.patch?rev=20614&op=diff
==============================================================================
--- trunk/libi18n-charset-perl/debian/patches/t_utf8.patch (original)
+++ trunk/libi18n-charset-perl/debian/patches/t_utf8.patch Sun Jun  1 17:53:29 2008
@@ -1,24 +1,65 @@
 --- libi18n-charset-perl.orig/t/utf8.t
 +++ libi18n-charset-perl/t/utf8.t
-@@ -39,14 +39,14 @@
-       {
-       skip 'Unicode::Map8 is not installed', 7 unless eval 'require Unicode::Map8';
-       # Unicode::Map8 aliases:
--      is(umu8_charset_name('Windows-1-2-5-1'), 'cp1251', 'windows-1-2-5-1');
--      is(umu8_charset_name('windows-1252'), 'cp1252', 'windows-1252 eq');
--      is(umu8_charset_name('win-latin-1'), 'cp1252', 'win-latin-1');
--      isnt(umu8_charset_name('windows-1252'), 'cp1253', 'windows-1252 ne');
--      is(umu8_charset_name('windows-1253'), 'cp1253', 'windows-1253');
-+      is(umu8_charset_name('Windows-1-2-5-1'), 'windows-1251', 'windows-1-2-5-1');
-+      is(umu8_charset_name('windows-1252'), 'windows-1252', 'windows-1252 eq');
-+      is(umu8_charset_name('win-latin-1'), 'windows-1252', 'win-latin-1');
-+      isnt(umu8_charset_name('windows-1252'), 'windows-1253', 'windows-1252 ne');
-+      is(umu8_charset_name('windows-1253'), 'windows-1253', 'windows-1253');
-       # Unicode::Map8 names with dummy mib:
--      is(umu8_charset_name('Adobe Zapf Ding Bats'), 'Adobe-Zapf-Dingbats', 'Adobe Zapf Ding Bats');
--      is(umu8_charset_name(' c p 1 0 0 7 9 '), 'cp10079', ' c p 1 0 0 7 9 ');
-+#      is(umu8_charset_name('Adobe Zapf Ding Bats'), 'Adobe-Zapf-Dingbats', 'Adobe Zapf Ding Bats');
-+#      is(umu8_charset_name(' c p 1 0 0 7 9 '), 'cp10079', ' c p 1 0 0 7 9 ');
-       } # SKIP block for Unicode::Map8 module
-  SKIP:
-       {
+@@ -45,34 +45,34 @@
+       {
+       skip 'Unicode::Map8 is not installed', 7 unless eval 'require Unicode::Map8';
+       # Unicode::Map8 aliases:
+-      is(umu8_charset_name('Windows-1-2-5-1'), 'cp1251', 'windows-1-2-5-1');
+-      is(umu8_charset_name('windows-1252'), 'cp1252', 'windows-1252 eq');
+-      is(umu8_charset_name('win-latin-1'), 'cp1252', 'win-latin-1');
+-      isnt(umu8_charset_name('windows-1252'), 'cp1253', 'windows-1252 ne');
+-      is(umu8_charset_name('windows-1253'), 'cp1253', 'windows-1253');
+-      # Unicode::Map8 names with dummy mib:
+-      my $sInput = 'Adobe Zapf Ding Bats';
+-      my $sExpect = 'Adobe-Zapf-Dingbats';
+-      $oICS->start;
+-      my $sActual = umu8_charset_name($sInput);
+-      $oICS->stop;
+-      if (! is($sActual, $sExpect, $sInput))
+-        {
+-        diag(@I18N::Charset::asMap8Debug);
+-        my @as = $oICS->read;
+-        diag(@as);
+-        } # if
+-      $sInput = ' c p 1 0 0 7 9 ';
+-      $sExpect = 'cp10079';
+-      $oICS->start;
+-      $sActual = umu8_charset_name($sInput);
+-      $oICS->stop;
+-      if (! is($sActual, $sExpect, $sInput))
+-        {
+-        diag(@I18N::Charset::asMap8Debug);
+-        my @as = $oICS->read;
+-        diag(@as);
+-        } # if
++      is(umu8_charset_name('Windows-1-2-5-1'), 'windows-1251', 'windows-1-2-5-1');
++      is(umu8_charset_name('windows-1252'), 'windows-1252', 'windows-1252 eq');
++      is(umu8_charset_name('win-latin-1'), 'windows-1252', 'win-latin-1');
++      isnt(umu8_charset_name('windows-1252'), 'windows-1253', 'windows-1252 ne');
++      is(umu8_charset_name('windows-1253'), 'windows-1253', 'windows-1253');
++#      # Unicode::Map8 names with dummy mib:
++#      my $sInput = 'Adobe Zapf Ding Bats';
++#      my $sExpect = 'Adobe-Zapf-Dingbats';
++#      $oICS->start;
++#      my $sActual = umu8_charset_name($sInput);
++#      $oICS->stop;
++#      if (! is($sActual, $sExpect, $sInput))
++#        {
++#        diag(@I18N::Charset::asMap8Debug);
++#        my @as = $oICS->read;
++#        diag(@as);
++#        } # if
++#      $sInput = ' c p 1 0 0 7 9 ';
++#      $sExpect = 'cp10079';
++#      $oICS->start;
++#      $sActual = umu8_charset_name($sInput);
++#      $oICS->stop;
++#      if (! is($sActual, $sExpect, $sInput))
++#        {
++#        diag(@I18N::Charset::asMap8Debug);
++#        my @as = $oICS->read;
++#        diag(@as);
++#        } # if
+       } # SKIP block for Unicode::Map8 module
+  SKIP:
+       {