Author: branden Date: 2004-07-15 03:04:43 -0500 (Thu, 15 Jul 2004) New Revision: 1655
Added: trunk/debian/patches/094_gbk_compound_text_transformation_fix.diff Modified: trunk/debian/CHANGESETS trunk/debian/TODO trunk/debian/changelog Log: Fix bug in COMPOUND_TEXT translation of the GBK character encoding (thanks, Su Yong). (Closes: #255224) Modified: trunk/debian/CHANGESETS =================================================================== --- trunk/debian/CHANGESETS 2004-07-15 07:30:10 UTC (rev 1654) +++ trunk/debian/CHANGESETS 2004-07-15 08:04:43 UTC (rev 1655) @@ -108,4 +108,8 @@ (Closes: #256297) 1652 +Fix bug in COMPOUND_TEXT translation of the GBK character encoding +(thanks, Su Yong). (Closes: #255224) + 1655 + vim:set ai et sts=4 sw=4 tw=80: Modified: trunk/debian/TODO =================================================================== --- trunk/debian/TODO 2004-07-15 07:30:10 UTC (rev 1654) +++ trunk/debian/TODO 2004-07-15 08:04:43 UTC (rev 1655) @@ -57,8 +57,6 @@ more careful about clobbering autodetected monitor sync ranges; study Jay Berkenbilt's feedback [BR] + #259080: xserver-xfree86: [debconf] specialized mouse defaults for Hurd [BR] -* #255224: Apply SU Yong's patch to fix GBK to COMPOUND_TEXT conversion in the - zh_CN.gbk locale. * #255701: add ISO 10646-1 character set support to ja_JP.UTF-8 XLC_LOCALE data [patch by Tatsuki Sugiura included] * #255011: add macintosh/ca symbols file; awaiting keyboard photograph and test Modified: trunk/debian/changelog =================================================================== --- trunk/debian/changelog 2004-07-15 07:30:10 UTC (rev 1654) +++ trunk/debian/changelog 2004-07-15 08:04:43 UTC (rev 1655) @@ -85,8 +85,11 @@ + Warning fix [Marc Aurele La France] (Closes: #256297) - -- Branden Robinson <[EMAIL PROTECTED]> Thu, 15 Jul 2004 02:13:15 -0500 + * Fix bug in COMPOUND_TEXT translation of the GBK character encoding + (thanks, Su Yong). (Closes: #255224) + -- Branden Robinson <[EMAIL PROTECTED]> Thu, 15 Jul 2004 02:57:52 -0500 + xfree86 (4.3.0.dfsg.1-6) unstable; urgency=low Changes by Branden Robinson: Added: trunk/debian/patches/094_gbk_compound_text_transformation_fix.diff =================================================================== --- trunk/debian/patches/094_gbk_compound_text_transformation_fix.diff 2004-07-15 07:30:10 UTC (rev 1654) +++ trunk/debian/patches/094_gbk_compound_text_transformation_fix.diff 2004-07-15 08:04:43 UTC (rev 1655) @@ -0,0 +1,21 @@ +$Id$ + +Fix bug in COMPOUND_TEXT translation of the GBK character encoding. +See Debian #255224 and XFree86 #1362. + +This patch by Su Yong. Placed under the traditional MIT/X11 license by the +author, if copyright is applicable. + +Fixed upstream, post-relicensing, in CVS revision 1.2. + +--- xc/nls/XLC_LOCALE/zh_CN.gbk~ 2004-07-15 02:48:57.000000000 -0500 ++++ xc/nls/XLC_LOCALE/zh_CN.gbk 2004-07-15 02:49:03.000000000 -0500 +@@ -62,7 +62,7 @@ + byte2 \x40,\x7e;\x80,\xfe + + wc_encoding \x00008000 +- ct_encoding GBK-0:GLGR:\x1b\x25\x2f\x32\x80\x88\x47\x42\x4b\x2d\x30\x02 ++ ct_encoding GBK-0:GLGR:\x1b\x25\x2f\x32 + + mb_conversion [\x8140,\xfefe]->\x0140 + ct_conversion [\x0140,\x7efe]->\x8140 Property changes on: trunk/debian/patches/094_gbk_compound_text_transformation_fix.diff ___________________________________________________________________ Name: svn:keywords + Id