Comment 12 for bug 985065

Difference between the above two:

--- us_diff_fr_oss.txt 2012-04-18 20:06:56.015521896 -0700
+++ us_diff_gnome_fr_oss.txt 2012-04-18 20:07:11.255566849 -0700
@@ -1,15 +1,17 @@
 --- us.txt 2012-04-18 20:03:29.294915791 -0700
-+++ fr_oss.txt 2012-04-18 20:03:29.270915721 -0700
-@@ -12,7 +12,7 @@ LANGUAGE=en_US:en
++++ 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", "oss", "compose:ralt"
++_XKB_RULES_NAMES(STRING) = "evdev", "pc105", "fr,us", "oss,", ""

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

  setxkbmap -print
  xkb_keymap {
@@ -18,7 +20,7 @@
   xkb_types { include "complete" };
   xkb_compat { include "complete" };
 - xkb_symbols { include "pc+us+inet(evdev)+compose(ralt)" };
-+ xkb_symbols { include "pc+fr(oss)+inet(evdev)+compose(ralt)" };
++ xkb_symbols { include "pc+fr(oss)+us:2+inet(evdev)" };
   xkb_geometry { include "pc(pc105)" };
  };

@@ -29,6 +31,6 @@
  xkb_types "complete" {
  xkb_compatibility "complete" {
 -xkb_symbols "pc+us+inet(evdev)+compose(ralt)" {
-+xkb_symbols "pc+fr(oss)+inet(evdev)+compose(ralt)" {
++xkb_symbols "pc+fr(oss)+us:2+inet(evdev)" {
  xkb_geometry "pc(pc105)" {