X Strike Force XFree86 SVN commit: r2241 - in trunk/debian: . patches
Author: barbier
Date: 2005-04-24 15:58:39 -0500 (Sun, 24 Apr 2005)
New Revision: 2241
Modified:
trunk/debian/CHANGESETS
trunk/debian/changelog
trunk/debian/patches/000_stolen_from_HEAD.diff
Log:
Revert XLC_LOCALE/zh_TW.UTF-8 to the version shipped in 4.3.0.dfsg.1-6.
Tetralet explained that Chinese users are likely to have the unifont
package installed because it is part of Chinese tasks, and this font
covers all needed glyphs. With this font, having ISO10646 listed first
in this file is harmless, whereas GTK1.2 apps are unreadable when it is
at the bottom of this file. (Closes: #296719)
Modified: trunk/debian/CHANGESETS
===================================================================
--- trunk/debian/CHANGESETS 2005-04-10 19:12:41 UTC (rev 2240)
+++ trunk/debian/CHANGESETS 2005-04-24 20:58:39 UTC (rev 2241)
@@ -87,4 +87,12 @@
(Closes: #303688)
2240
+Revert XLC_LOCALE/zh_TW.UTF-8 to the version shipped in 4.3.0.dfsg.1-6.
+Tetralet explained that Chinese users are likely to have the unifont
+package installed because it is part of Chinese tasks, and this font
+covers all needed glyphs. With this font, having ISO10646 listed first
+in this file is harmless, whereas GTK1.2 apps are unreadable when it is
+at the bottom of this file. (Closes: #296719)
+ 2241
+
vim:set ai et sts=4 sw=4 tw=80:
Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog 2005-04-10 19:12:41 UTC (rev 2240)
+++ trunk/debian/changelog 2005-04-24 20:58:39 UTC (rev 2241)
@@ -7,6 +7,13 @@
* Update Spanish debconf template translations (thanks, Javier
Fernández-Sanguino Peña). (Closes: #298538)
+ * Revert XLC_LOCALE/zh_TW.UTF-8 to the version shipped in 4.3.0.dfsg.1-6.
+ Tetralet explained that Chinese users are likely to have the unifont
+ package installed because it is part of Chinese tasks, and this font
+ covers all needed glyphs. With this font, having ISO10646 listed first
+ in this file is harmless, whereas GTK1.2 apps are unreadable when it is
+ at the bottom of this file. (Closes: #296719)
+
Changes by Branden Robinson:
* Fix CAN-2005-0605: libxpm4's scan.c file may allow attackers to execute
Modified: trunk/debian/patches/000_stolen_from_HEAD.diff
===================================================================
--- trunk/debian/patches/000_stolen_from_HEAD.diff 2005-04-10 19:12:41 UTC (rev 2240)
+++ trunk/debian/patches/000_stolen_from_HEAD.diff 2005-04-24 20:58:39 UTC (rev 2241)
@@ -246,7 +246,8 @@
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]
+ [Egbert Eich] [Update 2005-04-24 Denis Barbier: zh_TW.UTF-8 is
+ reverted to 1.1 as requested by Tetralet, see discussions in #296719]
xc/nls/XLC_LOCALE/zh_CN.UTF-8 @ 1.2
Ident lines
@@ -6362,124 +6363,6 @@
+
+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
Index: xc/lib/X11/lcPrTxt.c
===================================================================
RCS file: /cvs/xc/lib/X11/lcPrTxt.c,v
Reply to: