add us to XkbLayout no matter which language is detected.

diff --git a/debian/changelog b/debian/changelog
index b89627d..98fe444 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+grml-x (0.3-15) unstable; urgency=low
+
+  * Add 'us' to XkbLayout no matter which language is detected.
+
+ -- Michael Prokop <mika@grml.org>  Sat, 20 Jan 2007 10:43:04 +0100
+
 grml-x (0.3-14) unstable; urgency=low
 
   * Use "Architecture: all" in debian/control to support architectures

diff --git a/grml-x b/grml-x
index 2501639..c5ccd34 100755 (executable)
--- a/grml-x
+++ b/grml-x
@@ -4,7 +4,7 @@
 # Authors:       grml-team (grml.org), (c) Michael Prokop <mika@grml.org>
 # Bug-Reports:   see http://grml.org/bugs/
 # License:       This file is licensed under the GPL v2.
-# Latest change: Sam Aug 05 08:38:49 CEST 2006 [mika]
+# Latest change: Sam Jän 20 10:42:37 CET 2007 [mika]
 ################################################################################
 
 # some zsh-stuff {{{
@@ -410,17 +410,17 @@ parse_options()
       KEYBOARD="Driver      \"keyboard\"
         Option      \"XkbRules\" \"xfree86\"
         Option      \"XkbModel\" \"pc105\"
-        Option      \"XkbLayout\" \"${XKEYBOARD}\"
-        #Option      \"XkbVariant\" \"nodeadkeys\""
+        Option      \"XkbLayout\" \"${XKEYBOARD},us\"
+        # Option      \"XkbVariant\" \"nodeadkeys\""
    elif [[ -n $(X -version 2>&1 | grep -e 'X\.Org' -e 'Version 7\.') || "$XSERVER" == Xorg ]] ; then
       XSERVER="Xorg"
       XCONFIG='/etc/X11/xorg.conf'
       KEYBOARD="Driver      \"kbd\"
-        #Option      \"XkbRules\"   \"xfree86\"
+        # Option      \"XkbRules\"   \"xfree86\"
         Option      \"XkbRules\"   \"xorg\"
         Option      \"XkbModel\"   \"pc105\"
-        Option      \"XkbLayout\"  \"${XKEYBOARD}\"
-        #Option      \"XkbVariant\" \"nodeadkeys\""
+        Option      \"XkbLayout\"  \"${XKEYBOARD},us\"
+        # Option      \"XkbVariant\" \"nodeadkeys\""
    fi
 
    # check for font path
@@ -621,6 +621,7 @@ Section "InputDevice"
         Identifier  "Keyboard0"
         Option      "CoreKeyboard"
         $KEYBOARD
+       # Option      "XkbOptions" "ctrl:swapcaps,grp:alt_shift_toggle,grp_led:scroll,compose:menu"
 EndSection
 
 # More information: http://ftp.x.org/pub/X11R7.0/doc/html/mouse.html