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

[gregoa at users.alioth.debian.org]

Author: gregoa
Date: Sun Jul  6 00:48:47 2008
New Revision: 22826

URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=22826
Log:
Upstream has changed the Unicode::Map8 handling, we can simplify our
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=22826&op=diff
==============================================================================
--- trunk/libi18n-charset-perl/debian/changelog (original)
+++ trunk/libi18n-charset-perl/debian/changelog Sun Jul  6 00:48:47 2008
@@ -1,6 +1,8 @@
 libi18n-charset-perl (1.392-1) UNRELEASED; urgency=low
 
   * New upstream release.
+  * Upstream has changed the Unicode::Map8 handling, we can simplify our
+    t_utf8.patch.
 
  -- gregor herrmann <gregoa at debian.org>  Sun, 06 Jul 2008 02:42:06 +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=22826&op=diff
==============================================================================
--- trunk/libi18n-charset-perl/debian/patches/t_utf8.patch (original)
+++ trunk/libi18n-charset-perl/debian/patches/t_utf8.patch Sun Jul  6 00:48:47 2008
@@ -1,6 +1,6 @@
 --- a/t/utf8.t
 +++ b/t/utf8.t
-@@ -45,34 +45,34 @@ SKIP:
+@@ -45,11 +45,11 @@
        {
        skip 'Unicode::Map8 is not installed', 7 unless eval 'require Unicode::Map8';
        # Unicode::Map8 aliases:
@@ -9,57 +9,11 @@
 -      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:
-       {
+       # Unicode::Map8 names with dummy mib:
+       my $sInput = 'Adobe Zapf Ding Bats';
+       my $sExpect = 'Adobe-Zapf-Dingbats';