r547 - in x86/branches/utf8: etc/X11 packages/lfs-bootscripts

alexander at linuxfromscratch.org alexander at linuxfromscratch.org
Thu Aug 4 02:33:35 PDT 2005


Author: alexander
Date: 2005-08-04 03:33:33 -0600 (Thu, 04 Aug 2005)
New Revision: 547

Modified:
   x86/branches/utf8/etc/X11/xorg.conf
   x86/branches/utf8/packages/lfs-bootscripts/lang.dat
   x86/branches/utf8/packages/lfs-bootscripts/langconf
Log:
Fixed some bugs in language configurator. Enabled the Compose (=menu) key by default.

Modified: x86/branches/utf8/etc/X11/xorg.conf
===================================================================
--- x86/branches/utf8/etc/X11/xorg.conf	2005-08-04 06:19:01 UTC (rev 546)
+++ x86/branches/utf8/etc/X11/xorg.conf	2005-08-04 09:33:33 UTC (rev 547)
@@ -28,12 +28,9 @@
 	Driver		"kbd"
 	Option		"CoreKeyboard"
 	Option		"XkbRules"	"xorg"
-	Option		"XkbModel"	"pc104"
-	# Adjust the layout for your country
-	Option		"XkbLayout"	"us"
-	# Example for Russia:
-	# Option	"XkbLayout"	"us,ru(winkeys)"
-	# Option	"XkbOptions"	"grp:alt_shift_toggle,grp_led:scroll"
+	Option		"XkbModel"	"pc105"
+	Option		"XkbLayout"	"en_US"
+	Option	"XkbOptions"	"grp:alt_shift_toggle,compose:menu,grp_led:scroll"
 EndSection
 
 Section "InputDevice"

Modified: x86/branches/utf8/packages/lfs-bootscripts/lang.dat
===================================================================
--- x86/branches/utf8/packages/lfs-bootscripts/lang.dat	2005-08-04 06:19:01 UTC (rev 546)
+++ x86/branches/utf8/packages/lfs-bootscripts/lang.dat	2005-08-04 09:33:33 UTC (rev 547)
@@ -1,18 +1,18 @@
 # DESCRIPTION				LANG		KEYMAP		FONT	LEGACY_CHARSET	XKEYMAP
-Default/Other				C		""		""	""		"us"
-English,_USA_(ISO-8859-1)		en_US		""		""	""		"us"
-English,_USA_(UTF-8)			en_US.UTF-8	""		""	"iso-8859-1"	"us"
+Default/Other				C		""		""	""		"en_US"
+English,_USA_(ISO-8859-1)		en_US		""		""	""		"en_US"
+English,_USA_(UTF-8)			en_US.UTF-8	""		""	"iso-8859-1"	"en_US"
 English,_GB_(ISO-8859-1)		en_GB		"gb"		""	""		"uk"
 English,_GB_(UTF-8)			en_GB.UTF-8	"gb"		""	"iso-8859-1"	"uk"
-English,_Australia_(ISO-8859-1)		en_AU		""		""	""		"us"
-English,_Australia_(UTF-8)		en_AU.UTF-8	""		""	"iso-8859-1"	"us"
+English,_Australia_(ISO-8859-1)		en_AU		""		""	""		"en_US"
+English,_Australia_(UTF-8)		en_AU.UTF-8	""		""	"iso-8859-1"	"en_US"
 
-Belarusian_(CP1251)			be_BY		"by2_win"	""	""		"us,by(winkeys)"
-Belarusian_(UTF-8)			be_BY.UTF-8	"by"		""	"iso-8859-5"	"us,by(winkeys)"
+Belarusian_(CP1251)			be_BY		"by2_win"	""	""		"en_US,by(winkeys)"
+Belarusian_(UTF-8)			be_BY.UTF-8	"by"		""	"iso-8859-5"	"en_US,by(winkeys)"
 Brazilian,_ABNT2_keymap_(ISO-8859-1)	pt_BR		"br-abnt2"	""	""		"br-abnt2"
 Brazilian,_ABNT2_keymap_(UTF-8)		pt_BR.UTF-8	"br-abnt2"	""	"iso-8859-1"	"br-abnt2"
-Bulgarian_(CP1251)			bg_BG		"bg_bds-cp1251"	""	""		"us,bds_enhanced"
-Bulgarian_(UTF-8)			bg_BG.UTF-8	"bg_bds-utf8"	""	""		"us,bds_enhanced"
+Bulgarian_(CP1251)			bg_BG		"bg_bds-cp1251"	""	""		"en_US,bds_enhanced"
+Bulgarian_(UTF-8)			bg_BG.UTF-8	"bg_bds-utf8"	""	""		"en_US,bds_enhanced"
 French,_Canada_(ISO-8859-1)		fr_CA		"cf"		""	""		"ca_enhanced"
 French,_Canada_(UTF-8)			fr_CA.UTF-8	"cf"		""	"iso-8859-1"	"ca_enhanced"
 Czech_(ISO-8859-2)			cs_CZ		"cz"		""	""		"cz"
@@ -28,8 +28,8 @@
 German_(ISO-8859-1)			de_DE		"de-latin1"	""	""		"de"
 German_(ISO-8859-15)			de_DE at euro	"de-latin1+euro2" ""	""		"de"
 German_(UTF-8)				de_DE.UTF-8	"de-latin1+euro2" ""	"iso-8859-15"	"de"
-Greek_(ISO-8859-7)			el_GR		"gr"		""	""		"us,el"
-Greek_(UTF-8)				el_GR.UTF-8	"gr"		"iso07u-16" "iso-8859-7" "us,el"
+Greek_(ISO-8859-7)			el_GR		"gr"		""	""		"en_US,el"
+Greek_(UTF-8)				el_GR.UTF-8	"gr"		"iso07u-16" "iso-8859-7" "en_US,el"
 Hungarian_(ISO-8859-2)			hu_HU		"hu101"		""	""		"hu"
 Hungarian_(UTF-8)			hu_HU.UTF-8	"hu101"		""	"iso-8859-2"	"hu"
 Icelandic_(ISO-8859-1)			is_IS		"is-latin1"	""	""		"is"
@@ -43,9 +43,9 @@
 Portuguese_(ISO-8859-1)			pt_PT		"pt-latin1"	""	""		"pt"
 Portuguese_(ISO-8859-15)		pt_PT at euro	"pt-latin9"	""	""		"pt"
 Portuguese_(UTF-8)			pt_PT.UTF-8	"pt-latin9"	""	"iso-8859-15"	"pt"
-Russian_(CP1251)			ru_RU.CP1251	"ru_win"	""	""		"us,ru(winkeys)"
-Russian_(KOI8-R)			ru_RU.KOI8-R	"ru_ms"		""	""		"us,ru(winkeys)"
-Russian_(UTF-8)				ru_RU.UTF-8	"ru_ms"		""	"koi8-r"	"us,ru(winkeys)"
+Russian_(CP1251)			ru_RU.CP1251	"ru_win"	""	""		"en_US,ru(winkeys)"
+Russian_(KOI8-R)			ru_RU.KOI8-R	"ru-ms"		""	""		"en_US,ru(winkeys)"
+Russian_(UTF-8)				ru_RU.UTF-8	"ru-ms"		""	"koi8-r"	"en_US,ru(winkeys)"
 Slovak,_QWERTZ_keyboard_(ISO-8859-2)	sk_SK		"sk-qwertz"	""	""		"sk"
 Slovak,_QWERTZ_keyboard_(UTF-8)		sk_SK.UTF-8	"sk-qwertz"	""	"iso-8859-2"	"sk"
 Slovak,_QWERTY_keyboard_(ISO-8859-2)	sk_SK		"sk-qwerty"	""	""		"sk_qwerty"
@@ -57,5 +57,5 @@
 Spanish,_Mexico_(UTF-8)			es_MX.UTF-8	"la-latin1"	""	"iso-8859-1"	"la"
 Swedish_(ISO-8859-1)			sv_SE		"sv-latin1"	""	""		"se"
 Swedish_(UTF-8)				sv_SE.UTF-8	"sv-latin1"	""	"iso-8859-1"	"se"
-Ukrainian_(KOI8-U)			uk_UA		"ua-ws"		""	""		"us,ua(winkeys)"
-Ukrainian_(UTF-8)			uk_UA.UTF-8	"ua-utf-ws"	""	""		"us,ua(winkeys)"
+Ukrainian_(KOI8-U)			uk_UA		"ua-ws"		""	""		"en_US,ua(winkeys)"
+Ukrainian_(UTF-8)			uk_UA.UTF-8	"ua-utf-ws"	""	""		"en_US,ua(winkeys)"

Modified: x86/branches/utf8/packages/lfs-bootscripts/langconf
===================================================================
--- x86/branches/utf8/packages/lfs-bootscripts/langconf	2005-08-04 06:19:01 UTC (rev 546)
+++ x86/branches/utf8/packages/lfs-bootscripts/langconf	2005-08-04 09:33:33 UTC (rev 547)
@@ -167,4 +167,4 @@
 	echo "FONT=\"$F_FONT\"" >>/etc/sysconfig/console
 fi
 
-sed -i "s/\"us\"/\"$F_XKEYMAP\"/" /etc/X11/xorg.conf
+sed -i "s/\"en_US\"/\"$F_XKEYMAP\"/" /etc/X11/xorg.conf




More information about the livecd mailing list