X Strike Force XFree86 SVN commit: r1683 - in trunk/debian: . patches
Author: branden
Date: 2004-07-21 21:28:26 -0500 (Wed, 21 Jul 2004)
New Revision: 1683
Modified:
trunk/debian/CHANGESETS
trunk/debian/MANIFEST.alpha.in
trunk/debian/MANIFEST.amd64.in
trunk/debian/MANIFEST.arm.in
trunk/debian/MANIFEST.hppa.in
trunk/debian/MANIFEST.hurd-i386.in
trunk/debian/MANIFEST.i386.in
trunk/debian/MANIFEST.ia64.in
trunk/debian/MANIFEST.m68k.in
trunk/debian/MANIFEST.mips.in
trunk/debian/MANIFEST.mipsel.in
trunk/debian/MANIFEST.powerpc.in
trunk/debian/MANIFEST.s390.in
trunk/debian/MANIFEST.sparc.in
trunk/debian/TODO
trunk/debian/changelog
trunk/debian/patches/000_stolen_from_HEAD.diff
trunk/debian/xlibs-data.install
trunk/debian/xlibs-data.install.s390
Log:
Grab from XFree86 CVS (no later than 2003-12-18) fixes to the ja_JP.UTF-8,
ko_KR.UTF-8, and zh_TW.UTF-8 XLC_LOCALE files to prefer ISO
10646-1-encoded fonts less strongly. Add zh_CN.UTF-8 XLC_LOCALE file.
Update MANIFEST and .install files accordingly. (Closes: #255701)
Modified: trunk/debian/CHANGESETS
===================================================================
--- trunk/debian/CHANGESETS 2004-07-21 21:01:00 UTC (rev 1682)
+++ trunk/debian/CHANGESETS 2004-07-22 02:28:26 UTC (rev 1683)
@@ -163,4 +163,10 @@
file.
1682
+Grab from XFree86 CVS (no later than 2003-12-18) fixes to the ja_JP.UTF-8,
+ko_KR.UTF-8, and zh_TW.UTF-8 XLC_LOCALE files to prefer ISO
+10646-1-encoded fonts less strongly. Add zh_CN.UTF-8 XLC_LOCALE file.
+Update MANIFEST and .install files accordingly. (Closes: #255701)
+ 1683
+
vim:set ai et sts=4 sw=4 tw=80:
Modified: trunk/debian/MANIFEST.alpha.in
===================================================================
--- trunk/debian/MANIFEST.alpha.in 2004-07-21 21:01:00 UTC (rev 1682)
+++ trunk/debian/MANIFEST.alpha.in 2004-07-22 02:28:26 UTC (rev 1683)
@@ -1395,6 +1395,7 @@
usr/X11R6/lib/X11/locale/vi_VN.viscii/Compose
usr/X11R6/lib/X11/locale/vi_VN.viscii/XI18N_OBJS
usr/X11R6/lib/X11/locale/vi_VN.viscii/XLC_LOCALE
+usr/X11R6/lib/X11/locale/zh_CN.UTF-8/XLC_LOCALE
usr/X11R6/lib/X11/locale/zh_CN.gbk/Compose
usr/X11R6/lib/X11/locale/zh_CN.gbk/XI18N_OBJS
usr/X11R6/lib/X11/locale/zh_CN.gbk/XLC_LOCALE
Modified: trunk/debian/MANIFEST.amd64.in
===================================================================
--- trunk/debian/MANIFEST.amd64.in 2004-07-21 21:01:00 UTC (rev 1682)
+++ trunk/debian/MANIFEST.amd64.in 2004-07-22 02:28:26 UTC (rev 1683)
@@ -1395,6 +1395,7 @@
usr/X11R6/lib/X11/locale/vi_VN.viscii/Compose
usr/X11R6/lib/X11/locale/vi_VN.viscii/XI18N_OBJS
usr/X11R6/lib/X11/locale/vi_VN.viscii/XLC_LOCALE
+usr/X11R6/lib/X11/locale/zh_CN.UTF-8/XLC_LOCALE
usr/X11R6/lib/X11/locale/zh_CN.gbk/Compose
usr/X11R6/lib/X11/locale/zh_CN.gbk/XI18N_OBJS
usr/X11R6/lib/X11/locale/zh_CN.gbk/XLC_LOCALE
Modified: trunk/debian/MANIFEST.arm.in
===================================================================
--- trunk/debian/MANIFEST.arm.in 2004-07-21 21:01:00 UTC (rev 1682)
+++ trunk/debian/MANIFEST.arm.in 2004-07-22 02:28:26 UTC (rev 1683)
@@ -1394,6 +1394,7 @@
usr/X11R6/lib/X11/locale/vi_VN.viscii/Compose
usr/X11R6/lib/X11/locale/vi_VN.viscii/XI18N_OBJS
usr/X11R6/lib/X11/locale/vi_VN.viscii/XLC_LOCALE
+usr/X11R6/lib/X11/locale/zh_CN.UTF-8/XLC_LOCALE
usr/X11R6/lib/X11/locale/zh_CN.gbk/Compose
usr/X11R6/lib/X11/locale/zh_CN.gbk/XI18N_OBJS
usr/X11R6/lib/X11/locale/zh_CN.gbk/XLC_LOCALE
Modified: trunk/debian/MANIFEST.hppa.in
===================================================================
--- trunk/debian/MANIFEST.hppa.in 2004-07-21 21:01:00 UTC (rev 1682)
+++ trunk/debian/MANIFEST.hppa.in 2004-07-22 02:28:26 UTC (rev 1683)
@@ -1394,6 +1394,7 @@
usr/X11R6/lib/X11/locale/vi_VN.viscii/Compose
usr/X11R6/lib/X11/locale/vi_VN.viscii/XI18N_OBJS
usr/X11R6/lib/X11/locale/vi_VN.viscii/XLC_LOCALE
+usr/X11R6/lib/X11/locale/zh_CN.UTF-8/XLC_LOCALE
usr/X11R6/lib/X11/locale/zh_CN.gbk/Compose
usr/X11R6/lib/X11/locale/zh_CN.gbk/XI18N_OBJS
usr/X11R6/lib/X11/locale/zh_CN.gbk/XLC_LOCALE
Modified: trunk/debian/MANIFEST.hurd-i386.in
===================================================================
--- trunk/debian/MANIFEST.hurd-i386.in 2004-07-21 21:01:00 UTC (rev 1682)
+++ trunk/debian/MANIFEST.hurd-i386.in 2004-07-22 02:28:26 UTC (rev 1683)
@@ -1270,6 +1270,7 @@
usr/X11R6/lib/X11/locale/vi_VN.viscii/Compose
usr/X11R6/lib/X11/locale/vi_VN.viscii/XI18N_OBJS
usr/X11R6/lib/X11/locale/vi_VN.viscii/XLC_LOCALE
+usr/X11R6/lib/X11/locale/zh_CN.UTF-8/XLC_LOCALE
usr/X11R6/lib/X11/locale/zh_CN.gbk/Compose
usr/X11R6/lib/X11/locale/zh_CN.gbk/XI18N_OBJS
usr/X11R6/lib/X11/locale/zh_CN.gbk/XLC_LOCALE
Modified: trunk/debian/MANIFEST.i386.in
===================================================================
--- trunk/debian/MANIFEST.i386.in 2004-07-21 21:01:00 UTC (rev 1682)
+++ trunk/debian/MANIFEST.i386.in 2004-07-22 02:28:26 UTC (rev 1683)
@@ -1396,6 +1396,7 @@
usr/X11R6/lib/X11/locale/vi_VN.viscii/Compose
usr/X11R6/lib/X11/locale/vi_VN.viscii/XI18N_OBJS
usr/X11R6/lib/X11/locale/vi_VN.viscii/XLC_LOCALE
+usr/X11R6/lib/X11/locale/zh_CN.UTF-8/XLC_LOCALE
usr/X11R6/lib/X11/locale/zh_CN.gbk/Compose
usr/X11R6/lib/X11/locale/zh_CN.gbk/XI18N_OBJS
usr/X11R6/lib/X11/locale/zh_CN.gbk/XLC_LOCALE
Modified: trunk/debian/MANIFEST.ia64.in
===================================================================
--- trunk/debian/MANIFEST.ia64.in 2004-07-21 21:01:00 UTC (rev 1682)
+++ trunk/debian/MANIFEST.ia64.in 2004-07-22 02:28:26 UTC (rev 1683)
@@ -1396,6 +1396,7 @@
usr/X11R6/lib/X11/locale/vi_VN.viscii/Compose
usr/X11R6/lib/X11/locale/vi_VN.viscii/XI18N_OBJS
usr/X11R6/lib/X11/locale/vi_VN.viscii/XLC_LOCALE
+usr/X11R6/lib/X11/locale/zh_CN.UTF-8/XLC_LOCALE
usr/X11R6/lib/X11/locale/zh_CN.gbk/Compose
usr/X11R6/lib/X11/locale/zh_CN.gbk/XI18N_OBJS
usr/X11R6/lib/X11/locale/zh_CN.gbk/XLC_LOCALE
Modified: trunk/debian/MANIFEST.m68k.in
===================================================================
--- trunk/debian/MANIFEST.m68k.in 2004-07-21 21:01:00 UTC (rev 1682)
+++ trunk/debian/MANIFEST.m68k.in 2004-07-22 02:28:26 UTC (rev 1683)
@@ -1394,6 +1394,7 @@
usr/X11R6/lib/X11/locale/vi_VN.viscii/Compose
usr/X11R6/lib/X11/locale/vi_VN.viscii/XI18N_OBJS
usr/X11R6/lib/X11/locale/vi_VN.viscii/XLC_LOCALE
+usr/X11R6/lib/X11/locale/zh_CN.UTF-8/XLC_LOCALE
usr/X11R6/lib/X11/locale/zh_CN.gbk/Compose
usr/X11R6/lib/X11/locale/zh_CN.gbk/XI18N_OBJS
usr/X11R6/lib/X11/locale/zh_CN.gbk/XLC_LOCALE
Modified: trunk/debian/MANIFEST.mips.in
===================================================================
--- trunk/debian/MANIFEST.mips.in 2004-07-21 21:01:00 UTC (rev 1682)
+++ trunk/debian/MANIFEST.mips.in 2004-07-22 02:28:26 UTC (rev 1683)
@@ -1395,6 +1395,7 @@
usr/X11R6/lib/X11/locale/vi_VN.viscii/Compose
usr/X11R6/lib/X11/locale/vi_VN.viscii/XI18N_OBJS
usr/X11R6/lib/X11/locale/vi_VN.viscii/XLC_LOCALE
+usr/X11R6/lib/X11/locale/zh_CN.UTF-8/XLC_LOCALE
usr/X11R6/lib/X11/locale/zh_CN.gbk/Compose
usr/X11R6/lib/X11/locale/zh_CN.gbk/XI18N_OBJS
usr/X11R6/lib/X11/locale/zh_CN.gbk/XLC_LOCALE
Modified: trunk/debian/MANIFEST.mipsel.in
===================================================================
--- trunk/debian/MANIFEST.mipsel.in 2004-07-21 21:01:00 UTC (rev 1682)
+++ trunk/debian/MANIFEST.mipsel.in 2004-07-22 02:28:26 UTC (rev 1683)
@@ -1395,6 +1395,7 @@
usr/X11R6/lib/X11/locale/vi_VN.viscii/Compose
usr/X11R6/lib/X11/locale/vi_VN.viscii/XI18N_OBJS
usr/X11R6/lib/X11/locale/vi_VN.viscii/XLC_LOCALE
+usr/X11R6/lib/X11/locale/zh_CN.UTF-8/XLC_LOCALE
usr/X11R6/lib/X11/locale/zh_CN.gbk/Compose
usr/X11R6/lib/X11/locale/zh_CN.gbk/XI18N_OBJS
usr/X11R6/lib/X11/locale/zh_CN.gbk/XLC_LOCALE
Modified: trunk/debian/MANIFEST.powerpc.in
===================================================================
--- trunk/debian/MANIFEST.powerpc.in 2004-07-21 21:01:00 UTC (rev 1682)
+++ trunk/debian/MANIFEST.powerpc.in 2004-07-22 02:28:26 UTC (rev 1683)
@@ -1394,6 +1394,7 @@
usr/X11R6/lib/X11/locale/vi_VN.viscii/Compose
usr/X11R6/lib/X11/locale/vi_VN.viscii/XI18N_OBJS
usr/X11R6/lib/X11/locale/vi_VN.viscii/XLC_LOCALE
+usr/X11R6/lib/X11/locale/zh_CN.UTF-8/XLC_LOCALE
usr/X11R6/lib/X11/locale/zh_CN.gbk/Compose
usr/X11R6/lib/X11/locale/zh_CN.gbk/XI18N_OBJS
usr/X11R6/lib/X11/locale/zh_CN.gbk/XLC_LOCALE
Modified: trunk/debian/MANIFEST.s390.in
===================================================================
--- trunk/debian/MANIFEST.s390.in 2004-07-21 21:01:00 UTC (rev 1682)
+++ trunk/debian/MANIFEST.s390.in 2004-07-22 02:28:26 UTC (rev 1683)
@@ -1324,6 +1324,7 @@
usr/X11R6/lib/X11/locale/vi_VN.viscii/Compose
usr/X11R6/lib/X11/locale/vi_VN.viscii/XI18N_OBJS
usr/X11R6/lib/X11/locale/vi_VN.viscii/XLC_LOCALE
+usr/X11R6/lib/X11/locale/zh_CN.UTF-8/XLC_LOCALE
usr/X11R6/lib/X11/locale/zh_CN.gbk/Compose
usr/X11R6/lib/X11/locale/zh_CN.gbk/XI18N_OBJS
usr/X11R6/lib/X11/locale/zh_CN.gbk/XLC_LOCALE
Modified: trunk/debian/MANIFEST.sparc.in
===================================================================
--- trunk/debian/MANIFEST.sparc.in 2004-07-21 21:01:00 UTC (rev 1682)
+++ trunk/debian/MANIFEST.sparc.in 2004-07-22 02:28:26 UTC (rev 1683)
@@ -1394,6 +1394,7 @@
usr/X11R6/lib/X11/locale/vi_VN.viscii/Compose
usr/X11R6/lib/X11/locale/vi_VN.viscii/XI18N_OBJS
usr/X11R6/lib/X11/locale/vi_VN.viscii/XLC_LOCALE
+usr/X11R6/lib/X11/locale/zh_CN.UTF-8/XLC_LOCALE
usr/X11R6/lib/X11/locale/zh_CN.gbk/Compose
usr/X11R6/lib/X11/locale/zh_CN.gbk/XI18N_OBJS
usr/X11R6/lib/X11/locale/zh_CN.gbk/XLC_LOCALE
Modified: trunk/debian/TODO
===================================================================
--- trunk/debian/TODO 2004-07-21 21:01:00 UTC (rev 1682)
+++ trunk/debian/TODO 2004-07-22 02:28:26 UTC (rev 1683)
@@ -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]
-* #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
cycle with simon@nuit.ca
* #255371: fix typos in XKB README.config document [Branden has a patch
Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog 2004-07-21 21:01:00 UTC (rev 1682)
+++ trunk/debian/changelog 2004-07-22 02:28:26 UTC (rev 1683)
@@ -114,6 +114,11 @@
manifest-install-reconcile, and document use of the script in the README
file.
+ * Grab from XFree86 CVS (no later than 2003-12-18) fixes to the ja_JP.UTF-8,
+ ko_KR.UTF-8, and zh_TW.UTF-8 XLC_LOCALE files to prefer ISO
+ 10646-1-encoded fonts less strongly. Add zh_CN.UTF-8 XLC_LOCALE file.
+ Update MANIFEST and .install files accordingly. (Closes: #255701)
+
Changes by Fabio M. Di Nitto and Branden Robinson:
* Support building only the parts of the source tree needed by
@@ -142,7 +147,7 @@
is used (ccache users might see even more improvement).
+ Make the buildd admins hate us less.
- -- Branden Robinson <branden@debian.org> Wed, 21 Jul 2004 15:58:11 -0500
+ -- Branden Robinson <branden@debian.org> Wed, 21 Jul 2004 19:27:57 -0500
xfree86 (4.3.0.dfsg.1-6) unstable; urgency=low
Modified: trunk/debian/patches/000_stolen_from_HEAD.diff
===================================================================
--- trunk/debian/patches/000_stolen_from_HEAD.diff 2004-07-21 21:01:00 UTC (rev 1682)
+++ trunk/debian/patches/000_stolen_from_HEAD.diff 2004-07-22 02:28:26 UTC (rev 1683)
@@ -239,6 +239,25 @@
C-style comments were being stripped by preprocessing.
[David Dawes]
+xc/nls/XLC_LOCALE/Imakefile @ 1.26
+xc/nls/XLC_LOCALE/ja_JP.UTF-8 @ 1.2
+xc/nls/XLC_LOCALE/ko_KR.UTF-8 @ 1.2
+xc/nls/XLC_LOCALE/zh_CN.UTF-8 @ 1.1
+xc/nls/XLC_LOCALE/zh_TW.UTF-8 @ 1.2
+ 349. Added XLC_LOCALE file for zh_CN.UTF-8, moved iso10646 encoding to the
+ end in ja_JP, ko_KR and zh_TW UTF-8 XLC_LOCALE files
+ (Bugzilla #544, Akira TAGOH).
+ [Egbert Eich]
+
+xc/nls/XLC_LOCALE/zh_CN.UTF-8 @ 1.2
+ Ident lines
+ [Marc Aurele La France]
+
+xc/nls/XLC_LOCALE/zh_CN.UTF-8 @ 1.3
+ 669. A new fixed version of the zh_CN.UTF-8 locale file (Bugzilla #991,
+ James Su).
+ [David Dawes]
+
diff -urN xc.orig/config/imake/imake.c xc/config/imake/imake.c
--- xc.orig/config/imake/imake.c 2002-12-17 09:48:27.000000000 +1100
+++ xc/config/imake/imake.c 2003-04-09 01:58:14.000000000 +1000
@@ -5623,3 +5642,484 @@
.SH AUTHOR
Jim Gettys, HP, and Keith Packard, member of the XFree86 Project, Inc. and
HP.
+Index: xc/nls/XLC_LOCALE/Imakefile
+===================================================================
+RCS file: /cvs/xc/nls/XLC_LOCALE/Imakefile,v
+retrieving revision 1.25
+retrieving revision 1.26
+diff -u -r1.25 -r1.26
+--- xc/nls/XLC_LOCALE/Imakefile 15 Jan 2003 03:59:47 -0000 1.25
++++ xc/nls/XLC_LOCALE/Imakefile 6 Aug 2003 14:04:00 -0000 1.26
+@@ -2,7 +2,7 @@
+
+
+
+-XCOMM $XFree86: xc/nls/XLC_LOCALE/Imakefile,v 1.25 2003/01/15 03:59:47 dawes Exp $
++XCOMM $XFree86: xc/nls/XLC_LOCALE/Imakefile,v 1.26 2003/08/06 14:04:00 eich Exp $
+
+ WCHAR32 = HasWChar32
+
+@@ -77,6 +77,7 @@
+ LTarget(vi_VN.viscii)
+ LTarget(zh_CN)
+ LTarget(zh_CN.gbk)
++LTarget(zh_CN.UTF-8)
+ LTarget(zh_HK.big5)
+ LTarget(zh_HK.big5hkscs)
+ LTarget(zh_TW)
+Index: xc/nls/XLC_LOCALE/ja_JP.UTF-8
+===================================================================
+RCS file: /cvs/xc/nls/XLC_LOCALE/ja_JP.UTF-8,v
+retrieving revision 1.1
+retrieving revision 1.2
+diff -u -r1.1 -r1.2
+--- xc/nls/XLC_LOCALE/ja_JP.UTF-8 17 Oct 2002 01:12:57 -0000 1.1
++++ xc/nls/XLC_LOCALE/ja_JP.UTF-8 6 Aug 2003 14:04:00 -0000 1.2
+@@ -1,4 +1,4 @@
+-XCOMM $XFree86: xc/nls/XLC_LOCALE/ja_JP.UTF-8,v 1.1 2002/10/17 01:12:57 dawes Exp $
++XCOMM $XFree86: xc/nls/XLC_LOCALE/ja_JP.UTF-8,v 1.2 2003/08/06 14:04:00 eich Exp $
+ XCOMM
+
+ XCOMM
+@@ -32,23 +32,8 @@
+ }
+ }
+
+-XCOMM ISO10646-1 is put after iso8859-1 to make usually better-looking
+-XCOMM iso8859-x fonts are picked up before iso10646-1 fonts.
+-XCOMM Moreover, some iso10646-1 fonts don't have any glyph at all
+-XCOMM in ISO8859-X ranges.
+-
+-XCOMM fs2 class
+-fs2 {
+- charset {
+- name ISO10646-1
+- }
+- font {
+- primary ISO10646-1
+- }
+-}
+-
+-XCOMM fs3 class (Kanji)
+-fs3 {
++XCOMM fs2 class (Kanji)
++fs2 {
+ charset {
+ name JISX0208.1983-0:GL
+ }
+@@ -57,8 +42,8 @@
+ }
+ }
+
+-XCOMM fs4 class (Korean Character)
+-fs4 {
++XCOMM fs3 class (Korean Character)
++fs3 {
+ charset {
+ name KSC5601.1987-0:GL
+ }
+@@ -67,8 +52,8 @@
+ }
+ }
+
+-XCOMM fs5 class (Chinese Han Character)
+-fs5 {
++XCOMM fs4 class (Chinese Han Character)
++fs4 {
+ charset {
+ name GB2312.1980-0:GL
+ }
+@@ -76,8 +61,8 @@
+ primary GB2312.1980-0:GL
+ }
+ }
+-XCOMM fs6 class (Half Kana)
+-fs6 {
++XCOMM fs5 class (Half Kana)
++fs5 {
+ charset {
+ name JISX0201.1976-0:GR
+ }
+@@ -86,6 +71,21 @@
+ vertical_rotate all
+ }
+ }
++XCOMM ISO10646-1 is put last to make usually better-looking
++XCOMM other fonts are picked up before iso10646-1 fonts.
++XCOMM Moreover, some iso10646-1 fonts don't have any glyph at all
++XCOMM in ISO8859-X ranges.
++
++XCOMM fs6 class
++fs6 {
++ charset {
++ name ISO10646-1
++ }
++ font {
++ primary ISO10646-1
++ }
++}
++
+ END XLC_FONTSET
+
+ XCOMM
+Index: xc/nls/XLC_LOCALE/ko_KR.UTF-8
+===================================================================
+RCS file: /cvs/xc/nls/XLC_LOCALE/ko_KR.UTF-8,v
+retrieving revision 1.1
+retrieving revision 1.2
+diff -u -r1.1 -r1.2
+--- xc/nls/XLC_LOCALE/ko_KR.UTF-8 17 Oct 2002 01:12:57 -0000 1.1
++++ xc/nls/XLC_LOCALE/ko_KR.UTF-8 6 Aug 2003 14:04:00 -0000 1.2
+@@ -1,4 +1,4 @@
+-XCOMM $XFree86: xc/nls/XLC_LOCALE/ko_KR.UTF-8,v 1.1 2002/10/17 01:12:57 dawes Exp $
++XCOMM $XFree86: xc/nls/XLC_LOCALE/ko_KR.UTF-8,v 1.2 2003/08/06 14:04:00 eich Exp $
+
+ XCOMM
+ XCOMM XLC_FONTSET category
+@@ -31,24 +31,8 @@
+ }
+ }
+
+-XCOMM ISO10646-1 is put after iso8859-1 to make usually better-looking
+-XCOMM iso8859-x fonts are picked up before iso10646-1 fonts.
+-XCOMM Moreover, some iso10646-1 fonts don't have any glyph at all
+-XCOMM in ISO8859-X ranges.
+-
+-XCOMM fs2 class
+-fs2 {
+- charset {
+- name ISO10646-1
+- }
+- font {
+- primary ISO10646-1
+- }
+-}
+-
+-
+-XCOMM fs3 class (Korean Character)
+-fs3 {
++XCOMM fs2 class (Korean Character)
++fs2 {
+ charset {
+ name KSC5601.1987-0:GL
+ }
+@@ -56,8 +40,8 @@
+ primary KSC5601.1987-0:GL
+ }
+ }
+-XCOMM fs4 class (Kanji)
+-fs4 {
++XCOMM fs3 class (Kanji)
++fs3 {
+ charset {
+ name JISX0208.1983-0:GL
+ }
+@@ -65,8 +49,8 @@
+ primary JISX0208.1983-0:GL
+ }
+ }
+-XCOMM fs5 class (Chinese Han Character)
+-fs5 {
++XCOMM fs4 class (Chinese Han Character)
++fs4 {
+ charset {
+ name GB2312.1980-0:GL
+ }
+@@ -74,8 +58,8 @@
+ primary GB2312.1980-0:GL
+ }
+ }
+-XCOMM fs6 class (Half Kana)
+-fs6 {
++XCOMM fs5 class (Half Kana)
++fs5 {
+ charset {
+ name JISX0201.1976-0:GR
+ }
+@@ -84,6 +68,22 @@
+ vertical_rotate all
+ }
+ }
++
++XCOMM ISO10646-1 is put last to make usually better-looking
++XCOMM other fonts are picked up before iso10646-1 fonts.
++XCOMM Moreover, some iso10646-1 fonts don't have any glyph at all
++XCOMM in ISO8859-X ranges.
++
++XCOMM fs6 class
++fs6 {
++ charset {
++ name ISO10646-1
++ }
++ font {
++ primary ISO10646-1
++ }
++}
++
+ END XLC_FONTSET
+
+ XCOMM
+Index: xc/nls/XLC_LOCALE/zh_CN.UTF-8
+===================================================================
+RCS file: zh_CN.UTF-8
+diff -N zh_CN.UTF-8
+--- /dev/null 1 Jan 1970 00:00:00 -0000
++++ xc/nls/XLC_LOCALE/zh_CN.UTF-8 18 Dec 2003 04:18:00 -0000 1.3
+@@ -0,0 +1,139 @@
++XCOMM XFree86 NLS for Chinese locale zh_CN.UTF-8
++XCOMM Modified from xc/nls/XLC_LOCALE/en_US.UTF-8
++XCOMM by James Su <suzhe@turbolinux.com.cn>
++XCOMM
++XCOMM $XFree86: xc/nls/XLC_LOCALE/zh_CN.UTF-8,v 1.3 2003/12/18 04:18:00 dawes Exp $
++
++XCOMM
++XCOMM XLC_FONTSET category
++XCOMM
++XLC_FONTSET
++
++on_demand_loading True
++
++object_name generic
++
++XCOMM We leave the legacy encodings in for the moment, because we don't
++XCOMM have that many ISO10646 fonts yet.
++XCOMM fs0 class (7 bit ASCII)
++fs0 {
++ charset {
++ name ISO8859-1:GL
++ }
++ font {
++ primary ISO8859-1:GL
++ vertical_rotate all
++ }
++}
++
++XCOMM fs1 class (ISO8859 families)
++fs1 {
++ charset {
++ name ISO8859-1:GR
++ }
++ font {
++ primary ISO8859-1:GR
++ }
++}
++
++XCOMM fs2 class (Chinese Han Character)
++fs2 {
++ charset {
++ name GB2312.1980-0:GL
++ }
++ font {
++ primary GB2312.1980-0:GL
++ }
++}
++
++XCOMM fs3 class (Chinese Han Character GBK)
++fs3 {
++ charset {
++ name GBK-0:GLGR
++ }
++ font {
++ primary GBK-0:GLGR
++ substitute GB13000.1993-1:GLGR
++ }
++}
++
++XCOMM fs4 class (Kanji)
++fs4 {
++ charset {
++ name JISX0208.1983-0:GL
++ }
++ font {
++ primary JISX0208.1983-0:GL
++ }
++}
++
++XCOMM fs5 class (Korean Character)
++fs5 {
++ charset {
++ name KSC5601.1987-0:GL
++ }
++ font {
++ primary KSC5601.1987-0:GL
++ }
++}
++
++XCOMM fs6 class (Half Kana)
++fs6 {
++ charset {
++ name JISX0201.1976-0:GR
++ }
++ font {
++ primary JISX0201.1976-0:GR
++ vertical_rotate all
++ }
++}
++
++XCOMM fs7 class
++fs7 {
++ charset {
++ name ISO10646-1
++ }
++ font {
++ primary ISO10646-1
++ }
++}
++END XLC_FONTSET
++
++XCOMM
++XCOMM XLC_XLOCALE category
++XCOMM
++XLC_XLOCALE
++
++encoding_name UTF-8
++mb_cur_max 6
++state_depend_encoding False
++
++XCOMM cs0 class
++cs0 {
++ side GL:Default
++ length 1
++ ct_encoding ISO8859-1:GL
++}
++
++XCOMM cs1 class
++cs1 {
++ side GR:Default
++ length 1
++ ct_encoding ISO8859-1:GR
++}
++
++XCOMM cs2 class
++cs2 {
++ side GR
++ length 2
++ ct_encoding GB2312.1980-0:GL; GB2312.1980-0:GR
++}
++
++XCOMM cs3 class
++cs3 {
++ side none
++ ct_encoding ISO10646-1
++}
++
++END XLC_XLOCALE
++
+Index: xc/nls/XLC_LOCALE/zh_TW.UTF-8
+===================================================================
+RCS file: /cvs/xc/nls/XLC_LOCALE/zh_TW.UTF-8,v
+retrieving revision 1.1
+retrieving revision 1.2
+diff -u -r1.1 -r1.2
+--- xc/nls/XLC_LOCALE/zh_TW.UTF-8 15 Jan 2003 03:59:47 -0000 1.1
++++ xc/nls/XLC_LOCALE/zh_TW.UTF-8 6 Aug 2003 14:04:00 -0000 1.2
+@@ -1,4 +1,4 @@
+-XCOMM $XFree86: xc/nls/XLC_LOCALE/zh_TW.UTF-8,v 1.1 2003/01/15 03:59:47 dawes Exp $
++XCOMM $XFree86: xc/nls/XLC_LOCALE/zh_TW.UTF-8,v 1.2 2003/08/06 14:04:00 eich Exp $
+ XCOMM XLocale Database Sample for zh_TW.UTF-8
+ XCOMM
+
+@@ -11,19 +11,10 @@
+
+ object_name generic
+
+-XCOMM fs0 class
+-fs0 {
+- charset {
+- name ISO10646-1
+- }
+- font {
+- primary ISO10646-1
+- }
+-}
+ XCOMM We leave the legacy encodings in for the moment, because we don't
+ XCOMM have that many ISO10646 fonts yet.
+-XCOMM fs1 class (7 bit ASCII)
+-fs1 {
++XCOMM fs0 class (7 bit ASCII)
++fs0 {
+ charset {
+ name ISO8859-1:GL
+ }
+@@ -32,8 +23,8 @@
+ vertical_rotate all
+ }
+ }
+-XCOMM fs2 class (ISO8859 families)
+-fs2 {
++XCOMM fs1 class (ISO8859 families)
++fs1 {
+ charset {
+ name ISO8859-1:GR
+ }
+@@ -41,8 +32,8 @@
+ primary ISO8859-1:GR
+ }
+ }
+-XCOMM fs3 class (Chinese Han Character (Traditional))
+-fs3 {
++XCOMM fs2 class (Chinese Han Character (Traditional))
++fs2 {
+ charset {
+ name BIG5-0:GLGR
+ }
+@@ -51,8 +42,8 @@
+ substitute BIG5-0:GLGR
+ }
+ }
+-XCOMM fs4 class (Kanji)
+-fs4 {
++XCOMM fs3 class (Kanji)
++fs3 {
+ charset {
+ name JISX0208.1983-0:GL
+ }
+@@ -60,8 +51,8 @@
+ primary JISX0208.1983-0:GL
+ }
+ }
+-XCOMM fs5 class (Korean Character)
+-fs5 {
++XCOMM fs4 class (Korean Character)
++fs4 {
+ charset {
+ name KSC5601.1987-0:GL
+ }
+@@ -69,8 +60,8 @@
+ primary KSC5601.1987-0:GL
+ }
+ }
+-XCOMM fs6 class (Chinese Han Character)
+-fs6 {
++XCOMM fs5 class (Chinese Han Character)
++fs5 {
+ charset {
+ name GB2312.1980-0:GL
+ }
+@@ -78,8 +69,8 @@
+ primary GB2312.1980-0:GL
+ }
+ }
+-XCOMM fs7 class (Half Kana)
+-fs7 {
++XCOMM fs6 class (Half Kana)
++fs6 {
+ charset {
+ name JISX0201.1976-0:GR
+ }
+@@ -88,6 +79,15 @@
+ vertical_rotate all
+ }
+ }
++XCOMM fs7 class
++fs7 {
++ charset {
++ name ISO10646-1
++ }
++ font {
++ primary ISO10646-1
++ }
++}
+ END XLC_FONTSET
+
+ XCOMM
Modified: trunk/debian/xlibs-data.install
===================================================================
--- trunk/debian/xlibs-data.install 2004-07-21 21:01:00 UTC (rev 1682)
+++ trunk/debian/xlibs-data.install 2004-07-22 02:28:26 UTC (rev 1683)
@@ -354,6 +354,7 @@
usr/X11R6/lib/X11/locale/vi_VN.viscii/Compose
usr/X11R6/lib/X11/locale/vi_VN.viscii/XI18N_OBJS
usr/X11R6/lib/X11/locale/vi_VN.viscii/XLC_LOCALE
+usr/X11R6/lib/X11/locale/zh_CN.UTF-8/XLC_LOCALE
usr/X11R6/lib/X11/locale/zh_CN.gbk/Compose
usr/X11R6/lib/X11/locale/zh_CN.gbk/XI18N_OBJS
usr/X11R6/lib/X11/locale/zh_CN.gbk/XLC_LOCALE
Modified: trunk/debian/xlibs-data.install.s390
===================================================================
--- trunk/debian/xlibs-data.install.s390 2004-07-21 21:01:00 UTC (rev 1682)
+++ trunk/debian/xlibs-data.install.s390 2004-07-22 02:28:26 UTC (rev 1683)
@@ -333,6 +333,7 @@
usr/X11R6/lib/X11/locale/vi_VN.viscii/Compose
usr/X11R6/lib/X11/locale/vi_VN.viscii/XI18N_OBJS
usr/X11R6/lib/X11/locale/vi_VN.viscii/XLC_LOCALE
+usr/X11R6/lib/X11/locale/zh_CN.UTF-8/XLC_LOCALE
usr/X11R6/lib/X11/locale/zh_CN.gbk/Compose
usr/X11R6/lib/X11/locale/zh_CN.gbk/XI18N_OBJS
usr/X11R6/lib/X11/locale/zh_CN.gbk/XLC_LOCALE
Reply to: