Import Debian version 9

mcs-config-session (9) 2014; urgency=medium
.
  * Tell ibus to use the system keyboard layout by default, rather than
    assuming English (US).  In the common-case of just using standard
    input, this otherwise causes the keyboard to always behave as English (US)
    rather than whatever is actually configured!
    Note that this won't force-override any user-specified settings; it
    may be that end-users will need to use something like dconf-editor
    to flip the configuration bit stored in their personal dconf DB.

debian/changelog

+mcs-config-session (9) 2014; urgency=medium
+
+  * Tell ibus to use the system keyboard layout by default, rather than 
+    assuming English (US).  In the common-case of just using standard
+    input, this otherwise causes the keyboard to always behave as English (US)
+    rather than whatever is actually configured!
+    Note that this won't force-override any user-specified settings; it 
+    may be that end-users will need to use something like dconf-editor
+    to flip the configuration bit stored in their personal dconf DB.
+
+ -- David McBride <dwm37@cam.ac.uk>  Thu, 17 Jul 2014 16:41:44 +0100
+
 mcs-config-session (8) 2014;
 
   * Add gedit to launcher.

debian/gsettings-override

@@ -19,3 +19,11 @@ display-available-apps=false
 [org.gnome.desktop.lockdown]
 disable-user-switching=true
 disable-lock-screen=true
+
+# Force the ibus subsystem to use the system keyboard layout,
+# rather than just assuming English (US).
+[org.freedesktop.ibus.general]
+# Note that the headers above use the "id", not the "path" field
+# in the GSettings schema files.  Thus, we should use the name
+# under org.freedesktop.ibus, not under desktop.ibus.
+use-system-keyboard-layout=true