X Strike Force X.Org X11 SVN commit: r4003 - in trunk/lib/libx11/debian: . patches
Author: dparsons
Date: 2006-11-18 07:11:02 -0500 (Sat, 18 Nov 2006)
New Revision: 4003
Modified:
trunk/lib/libx11/debian/changelog
trunk/lib/libx11/debian/patches/015_russian_locale_alias.diff
Log:
015_russian_locale_alias.diff only changes russian to ru_RU.KOI8-R,
aligning with the glibc definition in /usr/share/locale/locale.alias.
Because of the constraint implosed by glibc in
/usr/share/i18n/locales/ru_RU, we cannot likewise change ru and ru_RU
away from ISO8859-5.
Modified: trunk/lib/libx11/debian/changelog
===================================================================
--- trunk/lib/libx11/debian/changelog 2006-11-18 09:21:43 UTC (rev 4002)
+++ trunk/lib/libx11/debian/changelog 2006-11-18 12:11:02 UTC (rev 4003)
@@ -1,14 +1,16 @@
libx11 (2:1.0.3-4) UNRELEASED; urgency=low
* Some patches got lost in the upgrade from 1.0.0 (2:1.0.0-9) to 1.0.3:
- - 015_russian_locale_alias.diff. For consistency, expand this
- patch to map the generic ru and ru_RU locales, as well as russian,
- to ru_RU.KOI8-R instead of ISO8859-5. But they really should be
- using UTF-8 you know. Closes: #368655.
+ - 015_russian_locale_alias.diff. Closes: #368655.
+ This aligns with the glibc russian definition of ru_RU.KOI8-R in
+ /usr/share/locale/locale.alias. Because of the
+ constraint implosed by glibc in /usr/share/i18n/locales/ru_RU,
+ we cannot likewise change ru and ru_RU away from ISO8859-5.
+ They really should be using ru_RU.UTF-8 anyway.
- 016_greek_polytonic_Compose.diff. Closes: #386471.
- 017_FTBFS_makekeys.diff can be left out since it is applied in 1.0.3.
- -- Drew Parsons <dparsons@debian.org> Sat, 18 Nov 2006 19:57:42 +1100
+ -- Drew Parsons <dparsons@debian.org> Sat, 18 Nov 2006 23:01:13 +1100
libx11 (2:1.0.3-3) unstable; urgency=high
Modified: trunk/lib/libx11/debian/patches/015_russian_locale_alias.diff
===================================================================
--- trunk/lib/libx11/debian/patches/015_russian_locale_alias.diff 2006-11-18 09:21:43 UTC (rev 4002)
+++ trunk/lib/libx11/debian/patches/015_russian_locale_alias.diff 2006-11-18 12:11:02 UTC (rev 4003)
@@ -1,24 +1,17 @@
Fix russian locale. Closes: #368655.
-Suggestion: can the russian default be changed to UTF-8 instead of
-KOI8-R? This will make it easier for russians to fit in with the rest of the
-world.
+This aligns with the glibc definition in /usr/share/locale/locale.alias.
+For the same glib reason, we cannot change ru and ru_RU away from ISO8859-5,
+since that encoding is enshrined in /usr/share/i18n/locales/ru_RU. Insert
+appropriate perjorative language here.
+Suggestion: can the russian default be changed to UTF-8 instead of KOI8-R?
+This will make it easier for russians to fit in with the rest of the world.
+
Index: libx11/nls/locale.alias.pre
===================================================================
---- libx11.orig/nls/locale.alias.pre 2006-11-18 19:51:47.000000000 +1100
-+++ libx11/nls/locale.alias.pre 2006-11-18 19:53:12.000000000 +1100
-@@ -881,8 +881,8 @@
- ro_RO.iso88592: ro_RO.ISO8859-2
- ro_RO.ISO-8859-2: ro_RO.ISO8859-2
- ro_RO.utf8: ro_RO.UTF-8
--ru: ru_RU.ISO8859-5
--ru_RU: ru_RU.ISO8859-5
-+ru: ru_RU.KOI8-R
-+ru_RU: ru_RU.KOI8-R
- ru_RU.iso88595: ru_RU.ISO8859-5
- ru_RU.ISO-8859-5: ru_RU.ISO8859-5
- ru_RU.koi8r: ru_RU.KOI8-R
+--- libx11.orig/nls/locale.alias.pre 2006-11-18 22:41:05.000000000 +1100
++++ libx11/nls/locale.alias.pre 2006-11-18 22:41:46.000000000 +1100
@@ -1183,7 +1183,7 @@
portuguese.iso88591: pt_PT.ISO8859-1
romanian: ro_RO.ISO8859-2
Reply to: