Comment 11 for bug 985065

Reverting previous by running `setxkbmap us`, and then using the GUI keyboard config:

--- us.txt 2012-04-18 20:03:29.294915791 -0700
+++ gnome.fr_oss.txt 2012-04-18 20:03:29.274915733 -0700
@@ -12,27 +12,27 @@ LANGUAGE=en_US:en

 xprop -root | grep XKB
 _XKB_RULES_NAMES_BACKUP(STRING) = "evdev", "pc105", "us", "", ""
-_XKB_RULES_NAMES(STRING) = "evdev", "pc105", "us", "", "compose:ralt"
+_XKB_RULES_NAMES(STRING) = "evdev", "pc105", "fr,us", "oss,", ""

 gconftool-2 -R /desktop/gnome/peripherals/keyboard/kbd
  options = []
- layouts = [us]
+ layouts = [fr oss,us]
  model =

 setxkbmap -print
 xkb_keymap {
- xkb_keycodes { include "evdev+aliases(qwerty)" };
+ xkb_keycodes { include "evdev+aliases(azerty)" };
  xkb_types { include "complete" };
  xkb_compat { include "complete" };
- xkb_symbols { include "pc+us+inet(evdev)+compose(ralt)" };
+ xkb_symbols { include "pc+fr(oss)+us:2+inet(evdev)" };
  xkb_geometry { include "pc(pc105)" };
 };

 xkbcomp :0 -w0 - | grep ^xkb_
 xkb_keymap {
-xkb_keycodes "evdev+aliases(qwerty)" {
+xkb_keycodes "evdev+aliases(azerty)" {
 xkb_types "complete" {
 xkb_compatibility "complete" {
-xkb_symbols "pc+us+inet(evdev)+compose(ralt)" {
+xkb_symbols "pc+fr(oss)+us:2+inet(evdev)" {
 xkb_geometry "pc(pc105)" {

With these settings, the keyboard isn't set to fr oss but rather to us.