Index: xc/ChangeLog =================================================================== RCS file: /cvs/xorg/xc/ChangeLog,v retrieving revision 1.511 diff -u -2 -0 -r1.511 ChangeLog --- xc/ChangeLog 8 Nov 2004 21:38:55 -0000 1.511 +++ xc/ChangeLog 9 Nov 2004 00:52:02 -0000 @@ -1,21 +1,31 @@ 2004-11-08 Roland Mainz + * xc/nls/compose.dir + * xc/nls/locale.alias + * xc/nls/locale.dir + * xc/programs/Xserver/XpConfig/Imakefile + Bugzilla #1544 (https://freedesktop.org/bugzilla/show_bug.cgi?id=1544): + Adding support for the si_LK (si, sinhala, si_LK, si_LK.UTF-8) + locale. + Patch by Anuradha Ratnaweera . + +2004-11-08 Roland Mainz * xc/programs/xpr/x2jet.c * xc/programs/xpr/xpr.c Bugzilla #1795 (https://freedesktop.org/bugzilla/show_bug.cgi?id=1795): Fix build bustage caused by bug 1779, patch by Bernhard Rosenkraenzer . 2004-11-08 Roland Mainz * xc/programs/xpr/x2jet.c * xc/programs/xpr/x2pmp.c * xc/programs/xpr/xpr.c * xc/programs/xpr/xpr.h Bugzilla #1779 (https://freedesktop.org/bugzilla/show_bug.cgi?id=1779): Fix various warnings, build problems in "xpr" and convert the whole source from K&R style to ANSI-C. 2004-11-08 Fabio M. Di Nitto * programs/Xserver/hw/darwin/Imakefile * programs/Xserver/hw/darwin/quartz/Imakefile * programs/Xserver/hw/xfree86/common/Imakefile Index: xc/nls/compose.dir =================================================================== RCS file: /cvs/xorg/xc/nls/compose.dir,v retrieving revision 1.5 diff -u -2 -0 -r1.5 compose.dir --- xc/nls/compose.dir 5 Nov 2004 00:58:49 -0000 1.5 +++ xc/nls/compose.dir 9 Nov 2004 00:52:16 -0000 @@ -324,39 +324,40 @@ en_US.UTF-8/Compose: mi_NZ.UTF-8 en_US.UTF-8/Compose: mk_MK.UTF-8 en_US.UTF-8/Compose: ms_MY.UTF-8 en_US.UTF-8/Compose: nl_BE.UTF-8 en_US.UTF-8/Compose: nl_NL.UTF-8 en_US.UTF-8/Compose: no_NO.UTF-8 en_US.UTF-8/Compose: nb_NO.UTF-8 en_US.UTF-8/Compose: ny_NO.UTF-8 en_US.UTF-8/Compose: oc_FR.UTF-8 en_US.UTF-8/Compose: pa_IN.UTF-8 en_US.UTF-8/Compose: pd_DE.UTF-8 en_US.UTF-8/Compose: pd_US.UTF-8 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 en_US.UTF-8/Compose: pt_BR.UTF-8 en_US.UTF-8/Compose: pt_PT.UTF-8 en_US.UTF-8/Compose: ro_RO.UTF-8 en_US.UTF-8/Compose: ru_RU.UTF-8 en_US.UTF-8/Compose: ru_UA.UTF-8 +en_US.UTF-8/Compose: si_LK.UTF-8 en_US.UTF-8/Compose: sk_SK.UTF-8 en_US.UTF-8/Compose: sl_SI.UTF-8 en_US.UTF-8/Compose: sq_AL.UTF-8 en_US.UTF-8/Compose: sr_YU.UTF-8 en_US.UTF-8/Compose: sv_FI.UTF-8 en_US.UTF-8/Compose: sv_SE.UTF-8 en_US.UTF-8/Compose: ta_IN.UTF-8 en_US.UTF-8/Compose: tg_TJ.UTF-8 en_US.UTF-8/Compose: th_TH.UTF-8 en_US.UTF-8/Compose: tl_PH.UTF-8 en_US.UTF-8/Compose: tr_TR.UTF-8 en_US.UTF-8/Compose: tt_RU.UTF-8 en_US.UTF-8/Compose: uk_UA.UTF-8 en_US.UTF-8/Compose: ur_PK.UTF-8 en_US.UTF-8/Compose: uz_UZ.UTF-8 en_US.UTF-8/Compose: vi_VN.UTF-8 en_US.UTF-8/Compose: wa_BE.UTF-8 en_US.UTF-8/Compose: yi_US.UTF-8 en_US.UTF-8/Compose: zh_TW.UTF-8 Index: xc/nls/locale.alias =================================================================== RCS file: /cvs/xorg/xc/nls/locale.alias,v retrieving revision 1.5 diff -u -2 -0 -r1.5 locale.alias --- xc/nls/locale.alias 5 Nov 2004 00:58:49 -0000 1.5 +++ xc/nls/locale.alias 9 Nov 2004 00:52:17 -0000 @@ -697,40 +697,42 @@ ru_RU.MICROSOFT-CP1251: ru_RU.CP1251 #if defined(INCLUDE_ru_SU) XCOMM ru_SU is redundant now ru_SU: ru_RU.KOI8-R ru_SU.ISO8859-5: ru_RU.ISO8859-5 ru_SU.KOI8-R: ru_RU.KOI8-R #endif ru_UA: ru_UA.KOI8-U ru_UA.koi8u: ru_UA.KOI8-U ru_UA.cp1251: ru_UA.CP1251 ru_UA.microsoftcp1251: ru_UA.CP1251 ru_UA.microsoft-cp1251: ru_UA.CP1251 ru_UA.MICROSOFT-CP1251: ru_UA.CP1251 se_NO: se_NO.UTF-8 se_NO.utf8: se_NO.UTF-8 sh: sh_YU.ISO8859-2 sh_HR.iso88592: sh_HR.ISO8859-2 sh_SP: sh_YU.ISO8859-2 sh_YU: sh_YU.ISO8859-2 sh_YU.utf8: sh_YU.UTF-8 +si: si_LK.UTF-8 +si_LK: si_LK.UTF-8 sk: sk_SK.ISO8859-2 sk_SK: sk_SK.ISO8859-2 sk_SK.iso88592: sk_SK.ISO8859-2 sk_SK.ISO-8859-2: sk_SK.ISO8859-2 sk_SK.utf8: sk_SK.UTF-8 sl: sl_SI.ISO8859-2 sl_SI: sl_SI.ISO8859-2 sl_SI.iso88592: sl_SI.ISO8859-2 sl_SI.ISO-8859-2: sl_SI.ISO8859-2 sl_SI.utf8: sl_SI.UTF-8 sp: sp_YU.ISO8859-5 sp_YU: sp_YU.ISO8859-5 sq: sq_AL.ISO8859-2 sq_AL: sq_AL.ISO8859-2 sq_AL.iso88592: sq_AL.ISO8859-2 sq_AL.utf8: sq_AL.UTF-8 sr_SP: sr_SP.ISO8859-2 sr: sr_YU.ISO8859-5 sr_YU: sr_YU.ISO8859-5 sr_YU.iso88592: sr_YU.ISO8859-2 @@ -901,40 +903,41 @@ hungarian: hu_HU.ISO8859-2 icelandic.iso88591: is_IS.ISO8859-1 icelandic: is_IS.ISO8859-1 italian: it_IT.ISO8859-1 italian.iso88591: it_IT.ISO8859-1 japanese: ja_JP.eucJP japanese.euc: ja_JP.eucJP japanese.sjis: ja_JP.SJIS korean: ko_KR.eucKR korean.euc: ko_KR.eucKR lithuanian: lt_LT.ISO8859-13 norwegian: no_NO.ISO8859-1 norwegian.iso88591: no_NO.ISO8859-1 polish: pl_PL.ISO8859-2 portuguese: pt_PT.ISO8859-1 portuguese.iso88591: pt_PT.ISO8859-1 romanian: ro_RO.ISO8859-2 rumanian: ro_RO.ISO8859-2 russian: ru_RU.ISO8859-5 serbocroatian: sh_YU.ISO8859-2 +sinhala: si_LK.UTF-8 slovak: sk_SK.ISO8859-2 slovene: sl_SI.ISO8859-2 slovenian: sl_SI.ISO8859-2 spanish: es_ES.ISO8859-1 spanish.iso88591: es_ES.ISO8859-1 swedish: sv_SE.ISO8859-1 swedish.iso88591: sv_SE.ISO8859-1 turkish: tr_TR.ISO8859-9 turkish.iso88599: tr_TR.ISO8859-9 thai: th_TH.ISO8859-11 univ.utf8: en_US.UTF-8 XCOMM Digital Unix utf universal.utf8@ucs4: en_US.UTF-8 XCOMM Solaris and SunOS have iso_8859_1 and iso_8859_15 LC_CTYPES XCOMM to augment LANG=C iso_8859_1: en_US.ISO8859-1 iso_8859_15: en_US.ISO8859-15 #ifdef WIN32 XCOMM Microsoft Windows/NT 4.0 SP3 XCOMM parser doesn't grok embedded spaces in locale name Index: xc/nls/locale.dir =================================================================== RCS file: /cvs/xorg/xc/nls/locale.dir,v retrieving revision 1.4 diff -u -2 -0 -r1.4 locale.dir --- xc/nls/locale.dir 5 Nov 2004 00:58:49 -0000 1.4 +++ xc/nls/locale.dir 9 Nov 2004 00:52:17 -0000 @@ -349,40 +349,41 @@ en_US.UTF-8/XLC_LOCALE: nl_BE.UTF-8 en_US.UTF-8/XLC_LOCALE: nl_NL.UTF-8 en_US.UTF-8/XLC_LOCALE: nb_NO.UTF-8 en_US.UTF-8/XLC_LOCALE: nn_NO.UTF-8 en_US.UTF-8/XLC_LOCALE: no_NO.UTF-8 en_US.UTF-8/XLC_LOCALE: ny_NO.UTF-8 en_US.UTF-8/XLC_LOCALE: oc_FR.UTF-8 en_US.UTF-8/XLC_LOCALE: pa_IN.UTF-8 en_US.UTF-8/XLC_LOCALE: pd_DE.UTF-8 en_US.UTF-8/XLC_LOCALE: pd_US.UTF-8 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 en_US.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 en_US.UTF-8/XLC_LOCALE: ru_UA.UTF-8 en_US.UTF-8/XLC_LOCALE: se_NO.UTF-8 en_US.UTF-8/XLC_LOCALE: sh_YU.UTF-8 +en_US.UTF-8/XLC_LOCALE: si_LK.UTF-8 en_US.UTF-8/XLC_LOCALE: sk_SK.UTF-8 en_US.UTF-8/XLC_LOCALE: sl_SI.UTF-8 en_US.UTF-8/XLC_LOCALE: sq_AL.UTF-8 en_US.UTF-8/XLC_LOCALE: sr_YU.UTF-8 en_US.UTF-8/XLC_LOCALE: sv_FI.UTF-8 en_US.UTF-8/XLC_LOCALE: sv_SE.UTF-8 en_US.UTF-8/XLC_LOCALE: ta_IN.UTF-8 en_US.UTF-8/XLC_LOCALE: tg_TJ.UTF-8 th_TH.UTF-8/XLC_LOCALE: th_TH.UTF-8 en_US.UTF-8/XLC_LOCALE: ti_ER.UTF-8 en_US.UTF-8/XLC_LOCALE: ti_ET.UTF-8 en_US.UTF-8/XLC_LOCALE: tl_PH.UTF-8 en_US.UTF-8/XLC_LOCALE: tr_TR.UTF-8 en_US.UTF-8/XLC_LOCALE: tt_RU.UTF-8 en_US.UTF-8/XLC_LOCALE: uk_UA.UTF-8 en_US.UTF-8/XLC_LOCALE: ur_PK.UTF-8 en_US.UTF-8/XLC_LOCALE: uz_UZ.UTF-8 en_US.UTF-8/XLC_LOCALE: vi_VN.UTF-8 en_US.UTF-8/XLC_LOCALE: wa_BE.UTF-8 en_US.UTF-8/XLC_LOCALE: yi_US.UTF-8 Index: xc/programs/Xserver/XpConfig/Imakefile =================================================================== RCS file: /cvs/xorg/xc/programs/Xserver/XpConfig/Imakefile,v retrieving revision 1.3 diff -u -2 -0 -r1.3 Imakefile --- xc/programs/Xserver/XpConfig/Imakefile 5 Nov 2004 00:58:49 -0000 1.3 +++ xc/programs/Xserver/XpConfig/Imakefile 9 Nov 2004 00:52:17 -0000 @@ -491,40 +491,44 @@ ru \ ru.ISO8859-5 \ ru.UTF-8 \ ru.ansi1251 \ ru.koi8-r \ ru_SU \ russian \ ru_RU \ ru_RU.ANSI1251 \ ru_RU.ISO8859-5 \ ru_RU.KOI8-R \ ru_RU.UTF-8 \ ru_RU.iso88595 \ ru_RU.koi8r \ ru_RU.utf8 \ ru_UA \ ru_UA.koi8u \ romanian \ se_NO \ se_NO.utf8 \ + si \ + sinhala \ + si_LK \ + si_LK.UTF8 \ sk \ sk.ISO8859-2 \ slovak \ slovene \ slovenian \ spanish \ sk_SK \ sk_SK.ISO8859-2 \ sk_SK.iso88592 \ sk_SK.utf8 \ sh \ sh.ISO8859-2 \ sh_BA.ISO8859-2@bosnia \ sh_YU \ sh_YU.iso88592 \ sh_YU.utf8 \ sl_SI \ sl_SI.ISO8859-2 \ sl_SI.iso88592 \ sl_SI.utf8 \