X Strike Force X.Org X11 SVN commit: r1188 - trunk/debian

[X Strike Force SVN Repository Admin <branden+svnadmin@deadbeast.net>]

Author: barbier
Date: 2006-02-10 07:12:09 -0500 (Fri, 10 Feb 2006)
New Revision: 1188

Modified:
   trunk/debian/xserver-xorg.config.in
Log:
Apply another chunk sent to #348027


Modified: trunk/debian/xserver-xorg.config.in
===================================================================
--- trunk/debian/xserver-xorg.config.in	2006-02-10 05:20:12 UTC (rev 1187)
+++ trunk/debian/xserver-xorg.config.in	2006-02-10 12:12:09 UTC (rev 1188)
@@ -1259,6 +1259,17 @@
   TR_VARIANT="$RET"
 
   case ",$TR_VARIANT," in
+    *,q,*|*,tr_q,*)
+      # For extra sanity, remove bogus "tr_q" or "q" variants.
+      if [ -e "$TR_KEYMAP" ] &&
+        grep -q "^[[:space:]]*xkb_symbols[[:space:]]*\"q\"" $TR_KEYMAP; then
+        SANITIZED_TR_VARIANT="q"
+      else
+        # There is no such variant at least in X.Org <= 7.0.  Default variant
+        # "basic" points to the Q layout in these versions.
+        SANITIZED_TR_VARIANT="basic"
+      fi
+      ;;
     *,f,*|*,tr_f,*)
       # X.Org version < 6.9 uses "tr_f", while >= 6.9 uses only "f"
       if [ -e "$TR_KEYMAP" ] &&
@@ -1282,8 +1293,8 @@
   if [ -n "$SANITIZED_TR_VARIANT" ]; then
     # remove the unsanitized variant
     TR_VARIANT=$(echo $TR_VARIANT | \
-                 sed -e "s/\<\(tr_\)*\(f\|alt\)[[:space:]]*,//g" \
-                     -e "s/\(^\|,\)[[:space:]]*\(tr_\)*\(f\|alt\)[[:space:]]*$//g")
+                 sed -e "s/\<\(tr_\)*\(q\|f\|alt\)[[:space:]]*,//g" \
+                     -e "s/\(^\|,\)[[:space:]]*\(tr_\)*\(q\|f\|alt\)[[:space:]]*$//g")
 
     # add the sanitized variant
     if [ -n "$TR_VARIANT" ]; then