X Strike Force X.Org X11 SVN commit: r1204 - in trunk/debian: . patches patches/general
Author: dnusinow
Date: 2006-02-14 00:42:12 -0500 (Tue, 14 Feb 2006)
New Revision: 1204
Added:
trunk/debian/patches/general/011b_ru_RU_UTF-8_XLC_LOCALE.diff
Modified:
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.kfreebsd-i386.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/changelog
trunk/debian/patches/series
trunk/debian/xlibs-data.install
trunk/debian/xlibs-data.install.s390
Log:
* Correct the ru_RU.UTF-8 locale alias. This adds
general/011b_ru_RU_UTF-8_XLC_LOCALE.diff (closes: #330144)
Modified: trunk/debian/MANIFEST.alpha.in
===================================================================
--- trunk/debian/MANIFEST.alpha.in 2006-02-14 03:37:50 UTC (rev 1203)
+++ trunk/debian/MANIFEST.alpha.in 2006-02-14 05:42:12 UTC (rev 1204)
@@ -1415,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
Modified: trunk/debian/MANIFEST.amd64.in
===================================================================
--- trunk/debian/MANIFEST.amd64.in 2006-02-14 03:37:50 UTC (rev 1203)
+++ trunk/debian/MANIFEST.amd64.in 2006-02-14 05:42:12 UTC (rev 1204)
@@ -1415,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
Modified: trunk/debian/MANIFEST.arm.in
===================================================================
--- trunk/debian/MANIFEST.arm.in 2006-02-14 03:37:50 UTC (rev 1203)
+++ trunk/debian/MANIFEST.arm.in 2006-02-14 05:42:12 UTC (rev 1204)
@@ -1414,6 +1414,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
Modified: trunk/debian/MANIFEST.hppa.in
===================================================================
--- trunk/debian/MANIFEST.hppa.in 2006-02-14 03:37:50 UTC (rev 1203)
+++ trunk/debian/MANIFEST.hppa.in 2006-02-14 05:42:12 UTC (rev 1204)
@@ -1414,6 +1414,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
Modified: trunk/debian/MANIFEST.hurd-i386.in
===================================================================
--- trunk/debian/MANIFEST.hurd-i386.in 2006-02-14 03:37:50 UTC (rev 1203)
+++ trunk/debian/MANIFEST.hurd-i386.in 2006-02-14 05:42:12 UTC (rev 1204)
@@ -1413,6 +1413,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
Modified: trunk/debian/MANIFEST.i386.in
===================================================================
--- trunk/debian/MANIFEST.i386.in 2006-02-14 03:37:50 UTC (rev 1203)
+++ trunk/debian/MANIFEST.i386.in 2006-02-14 05:42:12 UTC (rev 1204)
@@ -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
Modified: trunk/debian/MANIFEST.ia64.in
===================================================================
--- trunk/debian/MANIFEST.ia64.in 2006-02-14 03:37:50 UTC (rev 1203)
+++ trunk/debian/MANIFEST.ia64.in 2006-02-14 05:42:12 UTC (rev 1204)
@@ -1415,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
Modified: trunk/debian/MANIFEST.kfreebsd-i386.in
===================================================================
--- trunk/debian/MANIFEST.kfreebsd-i386.in 2006-02-14 03:37:50 UTC (rev 1203)
+++ trunk/debian/MANIFEST.kfreebsd-i386.in 2006-02-14 05:42:12 UTC (rev 1204)
@@ -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
Modified: trunk/debian/MANIFEST.m68k.in
===================================================================
--- trunk/debian/MANIFEST.m68k.in 2006-02-14 03:37:50 UTC (rev 1203)
+++ trunk/debian/MANIFEST.m68k.in 2006-02-14 05:42:12 UTC (rev 1204)
@@ -1413,6 +1413,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
Modified: trunk/debian/MANIFEST.mips.in
===================================================================
--- trunk/debian/MANIFEST.mips.in 2006-02-14 03:37:50 UTC (rev 1203)
+++ trunk/debian/MANIFEST.mips.in 2006-02-14 05:42:12 UTC (rev 1204)
@@ -1414,6 +1414,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
Modified: trunk/debian/MANIFEST.mipsel.in
===================================================================
--- trunk/debian/MANIFEST.mipsel.in 2006-02-14 03:37:50 UTC (rev 1203)
+++ trunk/debian/MANIFEST.mipsel.in 2006-02-14 05:42:12 UTC (rev 1204)
@@ -1414,6 +1414,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
Modified: trunk/debian/MANIFEST.powerpc.in
===================================================================
--- trunk/debian/MANIFEST.powerpc.in 2006-02-14 03:37:50 UTC (rev 1203)
+++ trunk/debian/MANIFEST.powerpc.in 2006-02-14 05:42:12 UTC (rev 1204)
@@ -1414,6 +1414,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
Modified: trunk/debian/MANIFEST.s390.in
===================================================================
--- trunk/debian/MANIFEST.s390.in 2006-02-14 03:37:50 UTC (rev 1203)
+++ trunk/debian/MANIFEST.s390.in 2006-02-14 05:42:12 UTC (rev 1204)
@@ -1339,6 +1339,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
Modified: trunk/debian/MANIFEST.sparc.in
===================================================================
--- trunk/debian/MANIFEST.sparc.in 2006-02-14 03:37:50 UTC (rev 1203)
+++ trunk/debian/MANIFEST.sparc.in 2006-02-14 05:42:12 UTC (rev 1204)
@@ -1414,6 +1414,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
Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog 2006-02-14 03:37:50 UTC (rev 1203)
+++ trunk/debian/changelog 2006-02-14 05:42:12 UTC (rev 1204)
@@ -35,8 +35,12 @@
* Add extra compose sequences for euro sign in iso8859-15/Compose.
Thanks Bas Zoetekouw (closes: #127609)
- -- David Nusinow <dnusinow@debian.org> Mon, 13 Feb 2006 22:36:32 -0500
+ [ Eugene Konev ]
+ * Correct the ru_RU.UTF-8 locale alias. This adds
+ general/011b_ru_RU_UTF-8_XLC_LOCALE.diff (closes: #330144)
+ -- David Nusinow <dnusinow@debian.org> Tue, 14 Feb 2006 00:22:03 -0500
+
xorg-x11 (6.9.0.dfsg.1-4) unstable; urgency=low
[ David Martínez Moreno ]
Added: trunk/debian/patches/general/011b_ru_RU_UTF-8_XLC_LOCALE.diff
===================================================================
--- trunk/debian/patches/general/011b_ru_RU_UTF-8_XLC_LOCALE.diff 2006-02-14 03:37:50 UTC (rev 1203)
+++ trunk/debian/patches/general/011b_ru_RU_UTF-8_XLC_LOCALE.diff 2006-02-14 05:42:12 UTC (rev 1204)
@@ -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
Modified: trunk/debian/patches/series
===================================================================
--- trunk/debian/patches/series 2006-02-14 03:37:50 UTC (rev 1203)
+++ trunk/debian/patches/series 2006-02-14 05:42:12 UTC (rev 1204)
@@ -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/013_xkb_drop_rules_xorg_duplicates.diff -p0
general/013a_xkb_symbols_euro_support.diff -p0
Modified: trunk/debian/xlibs-data.install
===================================================================
--- trunk/debian/xlibs-data.install 2006-02-14 03:37:50 UTC (rev 1203)
+++ trunk/debian/xlibs-data.install 2006-02-14 05:42:12 UTC (rev 1204)
@@ -338,6 +338,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
Modified: trunk/debian/xlibs-data.install.s390
===================================================================
--- trunk/debian/xlibs-data.install.s390 2006-02-14 03:37:50 UTC (rev 1203)
+++ trunk/debian/xlibs-data.install.s390 2006-02-14 05:42:12 UTC (rev 1204)
@@ -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: