Bug#330144: xlibs-data from etch breaks cyrillic output in gtk1.2 apps
The source of problem is changed
/usr/X11R6/lib/X11/locale/en_US.UTF-8/XLC_LOCALE to which ru_RU.UTF-8
locale is aliased. The attached patch adds correct for russian
ru_RU.UTF-8/XLC_LOCALE (and necessaty ru_RU.UTF-8/XI18N_OBJS) and
aliases ru_RU.UTF-8 locale to it. It also update manifests and
xlibs-data.install* for shipping new files. This should solve the
problem for ru_RU.UTF-8. Probably, some other UTF-8 locales (which
fontsets aren't covered by iso8859-1 and CJK encodings) require similar
fix. Or en_US.UTF-8/XLC_LOCALE can be altered to include appropriate
encodings in fontset.
(The xfree 4.3 didn't have this problem because en_US.UTF-8 XLC_LOCALE
used iso10646-1 fonts for default fontset. But AIUI this is not the best
solution for the problem, that is why it was changed in xorg).
diff -Nru a/debian/MANIFEST.alpha.in b/debian/MANIFEST.alpha.in
--- a/debian/MANIFEST.alpha.in 2005-12-29 06:10:26.000000000 +0700
+++ b/debian/MANIFEST.alpha.in 2006-01-02 12:30:55.000000000 +0700
@@ -1415,6 +1416,8 @@
usr/X11R6/lib/X11/locale/pt_BR.UTF-8/Compose
usr/X11R6/lib/X11/locale/pt_BR.UTF-8/XI18N_OBJS
usr/X11R6/lib/X11/locale/pt_BR.UTF-8/XLC_LOCALE
+usr/X11R6/lib/X11/locale/ru_RU.UTF-8/XI18N_OBJS
+usr/X11R6/lib/X11/locale/ru_RU.UTF-8/XLC_LOCALE
usr/X11R6/lib/X11/locale/tatar-cyr/XI18N_OBJS
usr/X11R6/lib/X11/locale/tatar-cyr/XLC_LOCALE
usr/X11R6/lib/X11/locale/th_TH.UTF-8/XI18N_OBJS
diff -Nru a/debian/MANIFEST.amd64.in b/debian/MANIFEST.amd64.in
--- a/debian/MANIFEST.amd64.in 2006-01-01 04:20:50.000000000 +0700
+++ b/debian/MANIFEST.amd64.in 2006-01-02 12:30:48.000000000 +0700
@@ -1415,6 +1417,8 @@
usr/X11R6/lib/X11/locale/pt_BR.UTF-8/Compose
usr/X11R6/lib/X11/locale/pt_BR.UTF-8/XI18N_OBJS
usr/X11R6/lib/X11/locale/pt_BR.UTF-8/XLC_LOCALE
+usr/X11R6/lib/X11/locale/ru_RU.UTF-8/XI18N_OBJS
+usr/X11R6/lib/X11/locale/ru_RU.UTF-8/XLC_LOCALE
usr/X11R6/lib/X11/locale/tatar-cyr/XI18N_OBJS
usr/X11R6/lib/X11/locale/tatar-cyr/XLC_LOCALE
usr/X11R6/lib/X11/locale/th_TH.UTF-8/XI18N_OBJS
diff -Nru a/debian/MANIFEST.arm.in b/debian/MANIFEST.arm.in
--- a/debian/MANIFEST.arm.in 2005-07-28 12:30:44.000000000 +0800
+++ b/debian/MANIFEST.arm.in 2006-01-02 12:30:56.000000000 +0700
@@ -1430,6 +1430,8 @@
usr/X11R6/lib/X11/locale/pt_BR.UTF-8/Compose
usr/X11R6/lib/X11/locale/pt_BR.UTF-8/XI18N_OBJS
usr/X11R6/lib/X11/locale/pt_BR.UTF-8/XLC_LOCALE
+usr/X11R6/lib/X11/locale/ru_RU.UTF-8/XI18N_OBJS
+usr/X11R6/lib/X11/locale/ru_RU.UTF-8/XLC_LOCALE
usr/X11R6/lib/X11/locale/tatar-cyr/XI18N_OBJS
usr/X11R6/lib/X11/locale/tatar-cyr/XLC_LOCALE
usr/X11R6/lib/X11/locale/th_TH.UTF-8/XI18N_OBJS
diff -Nru a/debian/MANIFEST.hppa.in b/debian/MANIFEST.hppa.in
--- a/debian/MANIFEST.hppa.in 2005-12-29 06:10:26.000000000 +0700
+++ b/debian/MANIFEST.hppa.in 2006-01-02 12:30:49.000000000 +0700
@@ -1431,6 +1432,8 @@
usr/X11R6/lib/X11/locale/pt_BR.UTF-8/Compose
usr/X11R6/lib/X11/locale/pt_BR.UTF-8/XI18N_OBJS
usr/X11R6/lib/X11/locale/pt_BR.UTF-8/XLC_LOCALE
+usr/X11R6/lib/X11/locale/ru_RU.UTF-8/XI18N_OBJS
+usr/X11R6/lib/X11/locale/ru_RU.UTF-8/XLC_LOCALE
usr/X11R6/lib/X11/locale/tatar-cyr/XI18N_OBJS
usr/X11R6/lib/X11/locale/tatar-cyr/XLC_LOCALE
usr/X11R6/lib/X11/locale/th_TH.UTF-8/XI18N_OBJS
diff -Nru a/debian/MANIFEST.hurd-i386.in b/debian/MANIFEST.hurd-i386.in
--- a/debian/MANIFEST.hurd-i386.in 2005-09-30 09:04:37.000000000 +0800
+++ b/debian/MANIFEST.hurd-i386.in 2006-01-02 12:30:46.000000000 +0700
@@ -1429,6 +1429,8 @@
usr/X11R6/lib/X11/locale/pt_BR.UTF-8/Compose
usr/X11R6/lib/X11/locale/pt_BR.UTF-8/XI18N_OBJS
usr/X11R6/lib/X11/locale/pt_BR.UTF-8/XLC_LOCALE
+usr/X11R6/lib/X11/locale/ru_RU.UTF-8/XI18N_OBJS
+usr/X11R6/lib/X11/locale/ru_RU.UTF-8/XLC_LOCALE
usr/X11R6/lib/X11/locale/tatar-cyr/XI18N_OBJS
usr/X11R6/lib/X11/locale/tatar-cyr/XLC_LOCALE
usr/X11R6/lib/X11/locale/th_TH.UTF-8/XI18N_OBJS
diff -Nru a/debian/MANIFEST.i386.in b/debian/MANIFEST.i386.in
--- a/debian/MANIFEST.i386.in 2005-11-15 06:16:56.000000000 +0700
+++ b/debian/MANIFEST.i386.in 2006-01-02 12:30:48.000000000 +0700
@@ -1416,6 +1416,8 @@
usr/X11R6/lib/X11/locale/pt_BR.UTF-8/Compose
usr/X11R6/lib/X11/locale/pt_BR.UTF-8/XI18N_OBJS
usr/X11R6/lib/X11/locale/pt_BR.UTF-8/XLC_LOCALE
+usr/X11R6/lib/X11/locale/ru_RU.UTF-8/XI18N_OBJS
+usr/X11R6/lib/X11/locale/ru_RU.UTF-8/XLC_LOCALE
usr/X11R6/lib/X11/locale/tatar-cyr/XI18N_OBJS
usr/X11R6/lib/X11/locale/tatar-cyr/XLC_LOCALE
usr/X11R6/lib/X11/locale/th_TH.UTF-8/XI18N_OBJS
diff -Nru a/debian/MANIFEST.ia64.in b/debian/MANIFEST.ia64.in
--- a/debian/MANIFEST.ia64.in 2005-12-31 07:33:41.000000000 +0700
+++ b/debian/MANIFEST.ia64.in 2006-01-02 12:30:56.000000000 +0700
@@ -1415,6 +1417,8 @@
usr/X11R6/lib/X11/locale/pt_BR.UTF-8/Compose
usr/X11R6/lib/X11/locale/pt_BR.UTF-8/XI18N_OBJS
usr/X11R6/lib/X11/locale/pt_BR.UTF-8/XLC_LOCALE
+usr/X11R6/lib/X11/locale/ru_RU.UTF-8/XI18N_OBJS
+usr/X11R6/lib/X11/locale/ru_RU.UTF-8/XLC_LOCALE
usr/X11R6/lib/X11/locale/tatar-cyr/XI18N_OBJS
usr/X11R6/lib/X11/locale/tatar-cyr/XLC_LOCALE
usr/X11R6/lib/X11/locale/th_TH.UTF-8/XI18N_OBJS
diff -Nru a/debian/MANIFEST.kfreebsd-i386.in b/debian/MANIFEST.kfreebsd-i386.in
--- a/debian/MANIFEST.kfreebsd-i386.in 2005-08-02 09:08:36.000000000 +0800
+++ b/debian/MANIFEST.kfreebsd-i386.in 2006-01-02 12:30:55.000000000 +0700
@@ -1431,6 +1431,8 @@
usr/X11R6/lib/X11/locale/pt_BR.UTF-8/Compose
usr/X11R6/lib/X11/locale/pt_BR.UTF-8/XI18N_OBJS
usr/X11R6/lib/X11/locale/pt_BR.UTF-8/XLC_LOCALE
+usr/X11R6/lib/X11/locale/ru_RU.UTF-8/XI18N_OBJS
+usr/X11R6/lib/X11/locale/ru_RU.UTF-8/XLC_LOCALE
usr/X11R6/lib/X11/locale/tatar-cyr/XI18N_OBJS
usr/X11R6/lib/X11/locale/tatar-cyr/XLC_LOCALE
usr/X11R6/lib/X11/locale/th_TH.UTF-8/XI18N_OBJS
diff -Nru a/debian/MANIFEST.m68k.in b/debian/MANIFEST.m68k.in
--- a/debian/MANIFEST.m68k.in 2005-07-28 12:30:44.000000000 +0800
+++ b/debian/MANIFEST.m68k.in 2006-01-02 12:30:55.000000000 +0700
@@ -1429,6 +1429,8 @@
usr/X11R6/lib/X11/locale/pt_BR.UTF-8/Compose
usr/X11R6/lib/X11/locale/pt_BR.UTF-8/XI18N_OBJS
usr/X11R6/lib/X11/locale/pt_BR.UTF-8/XLC_LOCALE
+usr/X11R6/lib/X11/locale/ru_RU.UTF-8/XI18N_OBJS
+usr/X11R6/lib/X11/locale/ru_RU.UTF-8/XLC_LOCALE
usr/X11R6/lib/X11/locale/tatar-cyr/XI18N_OBJS
usr/X11R6/lib/X11/locale/tatar-cyr/XLC_LOCALE
usr/X11R6/lib/X11/locale/th_TH.UTF-8/XI18N_OBJS
diff -Nru a/debian/MANIFEST.mipsel.in b/debian/MANIFEST.mipsel.in
--- a/debian/MANIFEST.mipsel.in 2005-07-28 12:30:44.000000000 +0800
+++ b/debian/MANIFEST.mipsel.in 2006-01-02 12:30:45.000000000 +0700
@@ -1430,6 +1430,8 @@
usr/X11R6/lib/X11/locale/pt_BR.UTF-8/Compose
usr/X11R6/lib/X11/locale/pt_BR.UTF-8/XI18N_OBJS
usr/X11R6/lib/X11/locale/pt_BR.UTF-8/XLC_LOCALE
+usr/X11R6/lib/X11/locale/ru_RU.UTF-8/XI18N_OBJS
+usr/X11R6/lib/X11/locale/ru_RU.UTF-8/XLC_LOCALE
usr/X11R6/lib/X11/locale/tatar-cyr/XI18N_OBJS
usr/X11R6/lib/X11/locale/tatar-cyr/XLC_LOCALE
usr/X11R6/lib/X11/locale/th_TH.UTF-8/XI18N_OBJS
diff -Nru a/debian/MANIFEST.mips.in b/debian/MANIFEST.mips.in
--- a/debian/MANIFEST.mips.in 2005-07-28 12:30:44.000000000 +0800
+++ b/debian/MANIFEST.mips.in 2006-01-02 12:30:50.000000000 +0700
@@ -1430,6 +1430,8 @@
usr/X11R6/lib/X11/locale/pt_BR.UTF-8/Compose
usr/X11R6/lib/X11/locale/pt_BR.UTF-8/XI18N_OBJS
usr/X11R6/lib/X11/locale/pt_BR.UTF-8/XLC_LOCALE
+usr/X11R6/lib/X11/locale/ru_RU.UTF-8/XI18N_OBJS
+usr/X11R6/lib/X11/locale/ru_RU.UTF-8/XLC_LOCALE
usr/X11R6/lib/X11/locale/tatar-cyr/XI18N_OBJS
usr/X11R6/lib/X11/locale/tatar-cyr/XLC_LOCALE
usr/X11R6/lib/X11/locale/th_TH.UTF-8/XI18N_OBJS
diff -Nru a/debian/MANIFEST.powerpc.in b/debian/MANIFEST.powerpc.in
--- a/debian/MANIFEST.powerpc.in 2005-12-31 07:33:41.000000000 +0700
+++ b/debian/MANIFEST.powerpc.in 2006-01-02 12:30:49.000000000 +0700
@@ -1414,6 +1415,8 @@
usr/X11R6/lib/X11/locale/pt_BR.UTF-8/Compose
usr/X11R6/lib/X11/locale/pt_BR.UTF-8/XI18N_OBJS
usr/X11R6/lib/X11/locale/pt_BR.UTF-8/XLC_LOCALE
+usr/X11R6/lib/X11/locale/ru_RU.UTF-8/XI18N_OBJS
+usr/X11R6/lib/X11/locale/ru_RU.UTF-8/XLC_LOCALE
usr/X11R6/lib/X11/locale/tatar-cyr/XI18N_OBJS
usr/X11R6/lib/X11/locale/tatar-cyr/XLC_LOCALE
usr/X11R6/lib/X11/locale/th_TH.UTF-8/XI18N_OBJS
diff -Nru a/debian/MANIFEST.s390.in b/debian/MANIFEST.s390.in
--- a/debian/MANIFEST.s390.in 2005-12-31 07:33:41.000000000 +0700
+++ b/debian/MANIFEST.s390.in 2006-01-02 12:30:46.000000000 +0700
@@ -1339,6 +1354,8 @@
usr/X11R6/lib/X11/locale/pt_BR.UTF-8/Compose
usr/X11R6/lib/X11/locale/pt_BR.UTF-8/XI18N_OBJS
usr/X11R6/lib/X11/locale/pt_BR.UTF-8/XLC_LOCALE
+usr/X11R6/lib/X11/locale/ru_RU.UTF-8/XI18N_OBJS
+usr/X11R6/lib/X11/locale/ru_RU.UTF-8/XLC_LOCALE
usr/X11R6/lib/X11/locale/tatar-cyr/XI18N_OBJS
usr/X11R6/lib/X11/locale/tatar-cyr/XLC_LOCALE
usr/X11R6/lib/X11/locale/th_TH.UTF-8/XI18N_OBJS
diff -Nru a/debian/MANIFEST.sparc.in b/debian/MANIFEST.sparc.in
--- a/debian/MANIFEST.sparc.in 2005-12-31 07:33:41.000000000 +0700
+++ b/debian/MANIFEST.sparc.in 2006-01-02 12:30:49.000000000 +0700
@@ -1414,6 +1415,8 @@
usr/X11R6/lib/X11/locale/pt_BR.UTF-8/Compose
usr/X11R6/lib/X11/locale/pt_BR.UTF-8/XI18N_OBJS
usr/X11R6/lib/X11/locale/pt_BR.UTF-8/XLC_LOCALE
+usr/X11R6/lib/X11/locale/ru_RU.UTF-8/XI18N_OBJS
+usr/X11R6/lib/X11/locale/ru_RU.UTF-8/XLC_LOCALE
usr/X11R6/lib/X11/locale/tatar-cyr/XI18N_OBJS
usr/X11R6/lib/X11/locale/tatar-cyr/XLC_LOCALE
usr/X11R6/lib/X11/locale/th_TH.UTF-8/XI18N_OBJS
diff -Nru a/debian/patches/general/011b_ru_RU_UTF-8_XLC_LOCALE.diff b/debian/patches/general/011b_ru_RU_UTF-8_XLC_LOCALE.diff
--- a/debian/patches/general/011b_ru_RU_UTF-8_XLC_LOCALE.diff 1970-01-01 07:00:00.000000000 +0700
+++ b/debian/patches/general/011b_ru_RU_UTF-8_XLC_LOCALE.diff 2006-01-02 12:30:53.000000000 +0700
@@ -0,0 +1,223 @@
+Index: xorg-x11-6.8.99.902.dfsg.1/xc/nls/XLC_LOCALE/Imakefile
+===================================================================
+--- xorg-x11-6.8.99.902.dfsg.1.orig/xc/nls/XLC_LOCALE/Imakefile 2005-11-17 09:50:07.000000000 +0700
++++ xorg-x11-6.8.99.902.dfsg.1/xc/nls/XLC_LOCALE/Imakefile 2005-11-17 10:18:22.000000000 +0700
+@@ -71,6 +71,7 @@
+ LTarget(mulelao-1)
+ LTarget(nokhchi-1)
+ LTarget(pt_BR.UTF-8)
++LTarget(ru_RU.UTF-8)
+ LTarget(tatar-cyr)
+ LTarget(th_TH)
+ LTarget(th_TH.UTF-8)
+Index: xorg-x11-6.8.99.902.dfsg.1/xc/nls/locale.dir
+===================================================================
+--- xorg-x11-6.8.99.902.dfsg.1.orig/xc/nls/locale.dir 2005-11-17 10:18:22.000000000 +0700
++++ xorg-x11-6.8.99.902.dfsg.1/xc/nls/locale.dir 2005-11-17 10:18:22.000000000 +0700
+@@ -434,7 +434,7 @@
+ pt_BR.UTF-8/XLC_LOCALE: pt_BR.UTF-8
+ en_US.UTF-8/XLC_LOCALE: pt_PT.UTF-8
+ en_US.UTF-8/XLC_LOCALE: ro_RO.UTF-8
+-en_US.UTF-8/XLC_LOCALE: ru_RU.UTF-8
++ru_RU.UTF-8/XLC_LOCALE: ru_RU.UTF-8
+ en_US.UTF-8/XLC_LOCALE: ru_UA.UTF-8
+ en_US.UTF-8/XLC_LOCALE: rw_RW.UTF-8
+ en_US.UTF-8/XLC_LOCALE: se_NO.UTF-8
+Index: xorg-x11-6.8.99.902.dfsg.1/xc/nls/XLC_LOCALE/ru_RU.UTF-8
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ xorg-x11-6.8.99.902.dfsg.1/xc/nls/XLC_LOCALE/ru_RU.UTF-8 2005-11-17 10:18:22.000000000 +0700
+@@ -0,0 +1,169 @@
++XCOMM
++XCOMM XLocale Database Sample for ru_RU.UTF-8
++XCOMM Derived from en_US.UTF-8
++XCOMM
++
++XCOMM
++XCOMM XLC_FONTSET category
++XCOMM
++XLC_FONTSET
++
++on_demand_loading True
++
++object_name generic
++
++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 (KOI8-R)
++fs2 {
++ charset {
++ name KOI8-R:GR
++ }
++ font {
++ primary KOI8-R:GR
++ }
++}
++XCOMM fs3 class (MICROSOFT-CP1251)
++fs3 {
++ charset {
++ name MICROSOFT-CP1251:GR
++ }
++ font {
++ primary MICROSOFT-CP1251:GR
++ }
++}
++XCOMM fs4 class (ISO8859-5)
++fs4 {
++ charset {
++ name ISO8859-5:GR
++ }
++ font {
++ primary ISO8859-5:GR
++ }
++}
++XCOMM fs5 class (Kanji)
++fs5 {
++ charset {
++ name JISX0208.1983-0:GL
++ }
++ font {
++ primary JISX0208.1983-0:GL
++ }
++}
++XCOMM fs6 class (Korean Character)
++fs6 {
++ charset {
++ name KSC5601.1987-0:GL
++ }
++ font {
++ primary KSC5601.1987-0:GL
++ }
++}
++XCOMM fs7 class (Chinese Han Character)
++fs7 {
++ charset {
++ name GB2312.1980-0:GL
++ }
++ font {
++ primary GB2312.1980-0:GL
++ }
++}
++XCOMM fs8 class (Half Kana)
++fs8 {
++ charset {
++ name JISX0201.1976-0:GR
++ }
++ font {
++ primary JISX0201.1976-0:GR
++ vertical_rotate all
++ }
++}
++XCOMM ISO10646 should come last so the fonts above will actually be used
++XCOMM fs9 class
++fs9 {
++ 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 JISX0208.1983-0:GL; JISX0208.1983-0:GR; JISX0208.1983-1:GL; JISX0208.1983-1:GR
++
++}
++
++XCOMM cs3 class
++cs3 {
++ side GL
++ length 2
++ ct_encoding KSC5601.1987-0:GL; KSC5601.1987-0:GR; KSC5601.1987-1:GL; KSC5601.1987-1:GR
++
++}
++
++XCOMM cs4 class
++cs4 {
++ side GR
++ length 2
++ ct_encoding GB2312.1980-0:GL; GB2312.1980-0:GR
++}
++
++XCOMM cs5 class
++cs5 {
++ side GR
++ length 1
++ ct_encoding JISX0201.1976-0:GR
++}
++
++XCOMM cs6 class
++cs6 {
++ side none
++ ct_encoding ISO10646-1
++}
++
++END XLC_XLOCALE
+Index: xorg-x11-6.8.99.902.dfsg.1/xc/nls/XI18N_OBJS/Imakefile
+===================================================================
+--- xorg-x11-6.8.99.902.dfsg.1.orig/xc/nls/XI18N_OBJS/Imakefile 2005-11-12 08:54:51.000000000 +0700
++++ xorg-x11-6.8.99.902.dfsg.1/xc/nls/XI18N_OBJS/Imakefile 2005-11-17 10:20:47.000000000 +0700
+@@ -72,6 +72,7 @@
+ XI18NTarget(ja_JP.UTF-8)
+ XI18NTarget(ko_KR.UTF-8)
+ XI18NTarget(pt_BR.UTF-8)
++XI18NTarget(ru_RU.UTF-8)
+ XI18NTarget(th_TH.UTF-8)
+ XI18NTarget(zh_CN.UTF-8)
+ XI18NTarget(zh_HK.UTF-8)
+Index: xorg-x11-6.8.99.902.dfsg.1/xc/nls/XI18N_OBJS/ru_RU.UTF-8
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ xorg-x11-6.8.99.902.dfsg.1/xc/nls/XI18N_OBJS/ru_RU.UTF-8 2005-11-17 10:21:06.000000000 +0700
+@@ -0,0 +1,7 @@
++# CATEGORY(XLC|XIM|OM) SHARED_LIBRARY_NAME FUNCTION_NAME
++#
++# XI18N objects table for en_US.UTF-8 locale
++#
++XLC common/xlcUTF8Load _XlcUtf8Loader # XLC_open
++XIM common/ximcp _XimOpenIM _XimRegisterIMInstantiateCallback _XimUnRegisterIMInstantiateCallback # XIM_open XIM_register XIM_unregister
++XOM common/xomGeneric _XomGenericOpenOM # XOM_open
diff -Nru a/debian/patches/series b/debian/patches/series
--- a/debian/patches/series 2006-01-01 04:34:10.000000000 +0700
+++ b/debian/patches/series 2006-01-02 12:30:50.000000000 +0700
@@ -11,6 +11,7 @@
general/009_disable_Xprt.diff -p0
general/010_donot_build_XpConfig.diff -p0
general/011a_recognize_glibc_2.3.2_locale_names.diff -p0
+general/011b_ru_RU_UTF-8_XLC_LOCALE.diff
general/012_Xaw_StripChart_fix.diff -p0
general/013a_xkb_symbols_euro_support.diff -p0
general/014_startx_hostname_fix.diff -p0
diff -Nru a/debian/xlibs-data.install b/debian/xlibs-data.install
--- a/debian/xlibs-data.install 2006-01-01 03:54:55.000000000 +0700
+++ b/debian/xlibs-data.install 2006-01-02 12:30:55.000000000 +0700
@@ -374,6 +374,8 @@
usr/X11R6/lib/X11/locale/pt_BR.UTF-8/Compose
usr/X11R6/lib/X11/locale/pt_BR.UTF-8/XI18N_OBJS
usr/X11R6/lib/X11/locale/pt_BR.UTF-8/XLC_LOCALE
+usr/X11R6/lib/X11/locale/ru_RU.UTF-8/XI18N_OBJS
+usr/X11R6/lib/X11/locale/ru_RU.UTF-8/XLC_LOCALE
usr/X11R6/lib/X11/locale/tatar-cyr/XI18N_OBJS
usr/X11R6/lib/X11/locale/tatar-cyr/XLC_LOCALE
usr/X11R6/lib/X11/locale/th_TH.UTF-8/XI18N_OBJS
diff -Nru a/debian/xlibs-data.install.s390 b/debian/xlibs-data.install.s390
--- a/debian/xlibs-data.install.s390 2005-07-28 12:30:44.000000000 +0800
+++ b/debian/xlibs-data.install.s390 2006-01-02 12:30:55.000000000 +0700
@@ -317,6 +317,8 @@
usr/X11R6/lib/X11/locale/pt_BR.UTF-8/Compose
usr/X11R6/lib/X11/locale/pt_BR.UTF-8/XI18N_OBJS
usr/X11R6/lib/X11/locale/pt_BR.UTF-8/XLC_LOCALE
+usr/X11R6/lib/X11/locale/ru_RU.UTF-8/XI18N_OBJS
+usr/X11R6/lib/X11/locale/ru_RU.UTF-8/XLC_LOCALE
usr/X11R6/lib/X11/locale/tatar-cyr/XI18N_OBJS
usr/X11R6/lib/X11/locale/tatar-cyr/XLC_LOCALE
usr/X11R6/lib/X11/locale/th_TH.UTF-8/XI18N_OBJS
Reply to: