X Strike Force SVN commit: rev 545 - in branches/4.3.0/sid/debian: . patches
Author: branden
Date: 2003-09-17 23:21:24 -0500 (Wed, 17 Sep 2003)
New Revision: 545
Modified:
branches/4.3.0/sid/debian/TODO
branches/4.3.0/sid/debian/patches/096_Xlib_l10n_pt_BR.UTF-8.diff
Log:
debian/patches/096_Xlib_l10n_pt_BR.UTF-8.diff: properly forward-port this
patch to XFree86 4.3.0
debian/TODO: update patch status to reflect the above
Modified: branches/4.3.0/sid/debian/TODO
===================================================================
--- branches/4.3.0/sid/debian/TODO 2003-09-18 04:19:43 UTC (rev 544)
+++ branches/4.3.0/sid/debian/TODO 2003-09-18 04:21:24 UTC (rev 545)
@@ -157,7 +157,7 @@
092_ati_radeon_9100.support.diff
093_SECURITY_xterm_window_title_reporting_fix.diff
094_SECURITY_xterm_DEC_UDK_sequence_DoS_fix.diff
-096_Xlib_l10n_pt_BR.UTF-8.diff
+096_Xlib_l10n_pt_BR.UTF-8.diff merged
097_mouse_zaxis_mapping_pushes_up_buttons.diff
100_sparc_pci_domains.diff
101_sparc_4m_hw_mult_fix.diff
Modified: branches/4.3.0/sid/debian/patches/096_Xlib_l10n_pt_BR.UTF-8.diff
===================================================================
--- branches/4.3.0/sid/debian/patches/096_Xlib_l10n_pt_BR.UTF-8.diff 2003-09-18 04:19:43 UTC (rev 544)
+++ branches/4.3.0/sid/debian/patches/096_Xlib_l10n_pt_BR.UTF-8.diff 2003-09-18 04:21:24 UTC (rev 545)
@@ -1,3 +1,5 @@
+$Id$
+
These patches tell Xlib to recognize the pt_BR.UTF-8 as something other
than an alias for en_US.UTF-8.
@@ -6,12 +8,10 @@
Not submitted upstream yet.
-$Id$
-
diff -urN xc/nls~/Compose/Imakefile xc/nls/Compose/Imakefile
---- xc/nls~/Compose/Imakefile 2001-11-02 18:29:28.000000000 -0500
-+++ xc/nls/Compose/Imakefile 2003-08-23 20:38:38.000000000 -0500
-@@ -65,6 +65,7 @@
+--- xc/nls~/Compose/Imakefile 2002-06-03 17:19:43.000000000 -0500
++++ xc/nls/Compose/Imakefile 2003-09-17 22:42:16.000000000 -0500
+@@ -55,6 +55,7 @@
ComposeTarget(koi8-u)
ComposeTarget(koi8-c)
ComposeTarget(mulelao-1)
@@ -21,7 +21,7 @@
ComposeTarget(zh_CN)
diff -urN xc/nls~/Compose/pt_BR.UTF-8 xc/nls/Compose/pt_BR.UTF-8
--- xc/nls~/Compose/pt_BR.UTF-8 1969-12-31 19:00:00.000000000 -0500
-+++ xc/nls/Compose/pt_BR.UTF-8 2003-08-23 20:41:07.000000000 -0500
++++ xc/nls/Compose/pt_BR.UTF-8 2003-09-17 22:42:16.000000000 -0500
@@ -0,0 +1,5541 @@
+# UTF-8 (Unicode) compose sequence
+# David.Monniaux@ens.fr
@@ -5565,19 +5565,19 @@
+<Multi_key> <U1d1bc> <U1d16f> : "퇀" U1D1C0 # MUSICAL SYMBOL FUSA BLACK
+<Multi_key> <U1d1ba> <U1d165> <U1d16f> : "퇀" U1D1C0 # MUSICAL SYMBOL FUSA BLACK
diff -urN xc/nls~/XI18N_OBJS/Imakefile xc/nls/XI18N_OBJS/Imakefile
---- xc/nls~/XI18N_OBJS/Imakefile 2003-08-23 18:00:05.000000000 -0500
-+++ xc/nls/XI18N_OBJS/Imakefile 2003-08-23 20:38:59.000000000 -0500
-@@ -60,6 +60,7 @@
- XI18NTarget(zh_TW.big5)
- XI18NTarget(th_TH)
+--- xc/nls~/XI18N_OBJS/Imakefile 2003-01-14 22:59:47.000000000 -0500
++++ xc/nls/XI18N_OBJS/Imakefile 2003-09-17 22:43:01.000000000 -0500
+@@ -68,6 +68,7 @@
XI18NTarget(en_US.UTF-8)
+ XI18NTarget(ja_JP.UTF-8)
+ XI18NTarget(ko_KR.UTF-8)
+XI18NTarget(pt_BR.UTF-8)
+ XI18NTarget(th_TH.UTF-8)
+ XI18NTarget(zh_TW.UTF-8)
#ifdef UXPArchitecture
- XI18NTarget(ja.U90)
- XI18NTarget(ja.S90)
diff -urN xc/nls~/XI18N_OBJS/pt_BR.UTF-8 xc/nls/XI18N_OBJS/pt_BR.UTF-8
--- xc/nls~/XI18N_OBJS/pt_BR.UTF-8 1969-12-31 19:00:00.000000000 -0500
-+++ xc/nls/XI18N_OBJS/pt_BR.UTF-8 2003-08-23 20:41:25.000000000 -0500
++++ xc/nls/XI18N_OBJS/pt_BR.UTF-8 2003-09-17 22:42:16.000000000 -0500
@@ -0,0 +1,7 @@
+# CATEGORY(XLC|XIM|OM) SHARED_LIBRARY_NAME FUNCTION_NAME
+#
@@ -5587,19 +5587,19 @@
+XIM common/ximcp _XimOpenIM _XimRegisterIMInstantiateCallback _XimUnRegisterIMInstantiateCallback # XIM_open XIM_register XIM_unregister
+XOM common/xomGeneric _XomGenericOpenOM # XOM_open
diff -urN xc/nls~/XLC_LOCALE/Imakefile xc/nls/XLC_LOCALE/Imakefile
---- xc/nls~/XLC_LOCALE/Imakefile 2001-11-01 18:35:28.000000000 -0500
-+++ xc/nls/XLC_LOCALE/Imakefile 2003-08-23 20:39:24.000000000 -0500
-@@ -92,6 +92,7 @@
- LTarget(zh_TW.big5)
+--- xc/nls~/XLC_LOCALE/Imakefile 2003-01-14 22:59:47.000000000 -0500
++++ xc/nls/XLC_LOCALE/Imakefile 2003-09-17 22:44:03.000000000 -0500
+@@ -69,6 +69,7 @@
+ LTarget(microsoft-cp1256)
+ LTarget(mulelao-1)
+ LTarget(nokhchi-1)
++LTarget(pt_BR.UTF-8)
+ LTarget(tatar-cyr)
LTarget(th_TH)
- LTarget(en_US.UTF-8)
-+LTarget(pt_BR.UTF-8)
- #ifdef UXPArchitecture
- LTarget(ja.U90)
- LTarget(ja.S90)
+ LTarget(th_TH.UTF-8)
diff -urN xc/nls~/XLC_LOCALE/pt_BR.UTF-8 xc/nls/XLC_LOCALE/pt_BR.UTF-8
--- xc/nls~/XLC_LOCALE/pt_BR.UTF-8 1969-12-31 19:00:00.000000000 -0500
-+++ xc/nls/XLC_LOCALE/pt_BR.UTF-8 2003-08-23 20:41:54.000000000 -0500
++++ xc/nls/XLC_LOCALE/pt_BR.UTF-8 2003-09-17 22:42:16.000000000 -0500
@@ -0,0 +1,143 @@
+# XLocale Database Sample for pt_BR.UTF-8
+#
@@ -5745,9 +5745,9 @@
+
+END XLC_XLOCALE
diff -urN xc/nls~/compose.dir xc/nls/compose.dir
---- xc/nls~/compose.dir 2001-11-21 17:29:11.000000000 -0500
-+++ xc/nls/compose.dir 2003-08-23 20:37:05.000000000 -0500
-@@ -323,7 +323,7 @@
+--- xc/nls~/compose.dir 2002-12-09 23:23:51.000000000 -0500
++++ xc/nls/compose.dir 2003-09-17 22:42:16.000000000 -0500
+@@ -326,7 +326,7 @@
en_US.UTF-8/Compose: ph_PH.UTF-8
en_US.UTF-8/Compose: pl_PL.UTF-8
en_US.UTF-8/Compose: pp_AN.UTF-8
@@ -5757,9 +5757,9 @@
en_US.UTF-8/Compose: ro_RO.UTF-8
en_US.UTF-8/Compose: ru_RU.UTF-8
diff -urN xc/nls~/locale.dir xc/nls/locale.dir
---- xc/nls~/locale.dir 2003-08-23 18:00:10.000000000 -0500
-+++ xc/nls/locale.dir 2003-08-23 20:38:05.000000000 -0500
-@@ -336,7 +336,7 @@
+--- xc/nls~/locale.dir 2003-01-14 22:59:46.000000000 -0500
++++ xc/nls/locale.dir 2003-09-17 22:42:16.000000000 -0500
+@@ -343,7 +343,7 @@
en_US.UTF-8/XLC_LOCALE: ph_PH.UTF-8
en_US.UTF-8/XLC_LOCALE: pl_PL.UTF-8
en_US.UTF-8/XLC_LOCALE: pp_AN.UTF-8
Reply to: