Author: branden
Date: 2004-08-21 21:36:00 -0500 (Sat, 21 Aug 2004)
New Revision: 1744
Modified:
trunk/debian/CHANGESETS
trunk/debian/changelog
trunk/debian/patches/011a_recognize_glibc_2.3.2_locale_names.diff
Log:
Alias "fi" and "fi_FI" to use ISO 8859-1, not ISO 8859-15, for
compatiblity with glibc (thanks, Jukka Suomela). (Closes: #266834)
Modified: trunk/debian/CHANGESETS
===================================================================
--- trunk/debian/CHANGESETS 2004-08-22 02:24:03 UTC (rev 1743)
+++ trunk/debian/CHANGESETS 2004-08-22 02:36:00 UTC (rev 1744)
@@ -337,6 +337,8 @@
+ Remove bogus "ee" locales for Estonian (et).
+ Remove ISO 8859-15 support for languages that don't use that character
set according to glibc.
++ Alias "fi" and "fi_FI" to use ISO 8859-1, not ISO 8859-15, for
+ compatiblity with glibc (thanks, Jukka Suomela). (Closes: #266834)
+ Remove @euro modifier support from locales that don't use that currency
(i.e., countries not in the Euro zone).
+ Ensure we support the @euro modifier for all locales that use it
@@ -347,10 +349,10 @@
drove these changes.
+ Resync patch #096.
+ Fix a few Debian bugs in the process:
- - en_GB.ISO-8859-15 is supported. (Closes: #122039)
- - et_EE.ISO-8859-15 is supported. (Closes: #258223)
- - sv_SE.ISO-8859-15 is supported. (Closes: #243237)
- 1731
+ - en_GB.ISO-8859-15 is now supported. (Closes: #122039)
+ - et_EE.ISO-8859-15 is now supported. (Closes: #258223)
+ - sv_SE.ISO-8859-15 is now supported. (Closes: #243237)
+ 1731, 1744
Apply patch to savage driver to turn off RandR extension when driver's
"Rotate" option is used, preventing screen garbling (patch #099f; thanks,
Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog 2004-08-22 02:24:03 UTC (rev 1743)
+++ trunk/debian/changelog 2004-08-22 02:36:00 UTC (rev 1744)
@@ -253,6 +253,8 @@
+ Remove bogus "ee" locales for Estonian (et).
+ Remove ISO 8859-15 support for languages that don't use that character
set according to glibc.
+ + Alias "fi" and "fi_FI" to use ISO 8859-1, not ISO 8859-15, for
+ compatiblity with glibc (thanks, Jukka Suomela). (Closes: #266834)
+ Remove @euro modifier support from locales that don't use that currency
(i.e., countries not in the Euro zone).
+ Ensure we support the @euro modifier for all locales that use it
@@ -263,9 +265,9 @@
drove these changes.
+ Resync patch #096.
+ Fix a few Debian bugs in the process:
- - en_GB.ISO-8859-15 is supported. (Closes: #122039)
- - et_EE.ISO-8859-15 is supported. (Closes: #258223)
- - sv_SE.ISO-8859-15 is supported. (Closes: #243237)
+ - en_GB.ISO-8859-15 is now supported. (Closes: #122039)
+ - et_EE.ISO-8859-15 is now supported. (Closes: #258223)
+ - sv_SE.ISO-8859-15 is now supported. (Closes: #243237)
* Apply patch to savage driver to turn off RandR extension when driver's
"Rotate" option is used, preventing screen garbling (patch #099f; thanks,
@@ -336,7 +338,7 @@
autodetection would cause the script to think it had detected one X server
or XFree86 video driver instead ($(echo "" | wc -l) is "1", not "0").
- -- Branden Robinson <[EMAIL PROTECTED]> Sat, 21 Aug 2004 02:42:05 -0500
+ -- Branden Robinson <[EMAIL PROTECTED]> Sat, 21 Aug 2004 21:33:19 -0500
xfree86 (4.3.0.dfsg.1-6) unstable; urgency=low
Modified: trunk/debian/patches/011a_recognize_glibc_2.3.2_locale_names.diff
===================================================================
--- trunk/debian/patches/011a_recognize_glibc_2.3.2_locale_names.diff
2004-08-22 02:24:03 UTC (rev 1743)
+++ trunk/debian/patches/011a_recognize_glibc_2.3.2_locale_names.diff
2004-08-22 02:36:00 UTC (rev 1744)
@@ -44,6 +44,9 @@
(according to glibc), even if the codeset is explicitly specified. See
Debian #208137.
+* Alias "fi" and "fi_FI" to "fi_FI.ISO8559-1", not "fi_FI.ISO8859-15", for
+ compatibility with the GNU C Library. See Debian #266834.
+
* Rewrite some comments to be in grammatical English.
This patch by Branden Robinson.
@@ -51,8 +54,8 @@
Not submitted to XFree86.
diff -urN xc/nls~/compose.dir xc/nls/compose.dir
---- xc/nls~/compose.dir 2004-08-11 17:14:48.000000000 -0500
-+++ xc/nls/compose.dir 2004-08-12 01:09:09.000000000 -0500
+--- xc/nls~/compose.dir 2004-08-21 21:25:01.000000000 -0500
++++ xc/nls/compose.dir 2004-08-21 21:26:58.000000000 -0500
@@ -1,14 +1,22 @@
XCOMM $Xorg: compose.dir,v 1.3 2000/08/17 19:46:48 cpqbld Exp $
XCOMM
@@ -467,8 +470,8 @@
+en_US.UTF-8/Compose: zh_TW.UTF-8
+en_US.UTF-8/Compose: zu_ZA.UTF-8
diff -urN xc/nls~/locale.alias xc/nls/locale.alias
---- xc/nls~/locale.alias 2004-08-11 17:15:26.000000000 -0500
-+++ xc/nls/locale.alias 2004-08-12 01:54:26.000000000 -0500
+--- xc/nls~/locale.alias 2004-08-21 21:25:01.000000000 -0500
++++ xc/nls/locale.alias 2004-08-21 21:27:07.000000000 -0500
@@ -16,30 +16,90 @@
Cextend: en_US.ISO8859-1
Cextend.en: en_US.ISO8859-1
@@ -803,7 +806,7 @@
es_ES: es_ES.ISO8859-1
es_ES.88591: es_ES.ISO8859-1
es_ES.88591.en: es_ES.ISO8859-1
-@@ -204,53 +331,79 @@
+@@ -204,89 +331,127 @@
es_ES.ISO-8859-1: es_ES.ISO8859-1
es_ES.ISO_8859-1: es_ES.ISO8859-1
es_ES.iso885915: es_ES.ISO8859-15
@@ -891,7 +894,14 @@
fa: fa_IR.UTF-8
fa_IR: fa_IR.UTF-8
fa_IR.isiri3342: fa_IR.ISIRI-3342
-@@ -263,30 +416,42 @@
+ fa_IR.utf8: fa_IR.UTF-8
+-fi: fi_FI.ISO8859-15
+-fi_FI: fi_FI.ISO8859-15
++fi: fi_FI.ISO8859-1
++fi_FI: fi_FI.ISO8859-1
+ fi_FI.88591: fi_FI.ISO8859-1
+ fi_FI.88591.en: fi_FI.ISO8859-1
+ fi_FI.iso88591: fi_FI.ISO8859-1
fi_FI.ISO-8859-1: fi_FI.ISO8859-1
fi_FI.ISO_8859-1: fi_FI.ISO8859-1
fi_FI.iso885915: fi_FI.ISO8859-15
@@ -1604,8 +1614,8 @@
XCOMM Other miscellaneous locale names
ISO8859-1: en_US.ISO8859-1
diff -urN xc/nls~/locale.dir xc/nls/locale.dir
---- xc/nls~/locale.dir 2004-08-11 17:14:48.000000000 -0500
-+++ xc/nls/locale.dir 2004-08-12 01:09:09.000000000 -0500
+--- xc/nls~/locale.dir 2004-08-21 21:25:01.000000000 -0500
++++ xc/nls/locale.dir 2004-08-21 21:26:58.000000000 -0500
@@ -8,8 +8,13 @@
XCOMM
