=== modified file 'debian/changelog'
--- debian/changelog	2014-03-19 14:08:29 +0000
+++ debian/changelog	2014-06-18 21:49:52 +0000
@@ -1,3 +1,11 @@
+ibus (1.5.5-1ubuntu4) trusty; urgency=medium
+
+  * debian/patches/ibus-use-system-keyboard.patch:
+    - change dconf default of use-system-keyboard-layout to true
+      (LP: #1240198)
+
+ -- Matthias Niess <mniess@gmail.com>  Wed, 18 Jun 2014 23:36:45 +0200
+
 ibus (1.5.5-1ubuntu3) trusty; urgency=medium
 
   * debian/patches/ubuntu-forward-panel-properties.patch:

=== added file 'debian/patches/ibus-use-system-keyboard.patch'
--- debian/patches/ibus-use-system-keyboard.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/ibus-use-system-keyboard.patch	2014-06-18 21:49:52 +0000
@@ -0,0 +1,19 @@
+Description: change dconf default setting that caused keyboard
+ layouts to be randomly reset to US english
+Author: Matthias Niess
+Origin: https://bugs.launchpad.net/ubuntu/+source/indicator-keyboard/+bug/1240198/comments/19
+Ubuntu-Bug: https://bugs.launchpad.net/ubuntu/+source/indicator-keyboard/+bug/1240198
+
+Index: fix-lp1240198/data/dconf/00-upstream-settings
+===================================================================
+--- fix-lp1240198.orig/data/dconf/00-upstream-settings	2014-06-18 23:32:39.031968000 +0200
++++ fix-lp1240198/data/dconf/00-upstream-settings	2014-06-18 23:36:40.875127516 +0200
+@@ -14,7 +14,7 @@
+ preload-engines=@as []
+ switcher-delay-time=400
+ use-global-engine=true
+-use-system-keyboard-layout=false
++use-system-keyboard-layout=true
+ version=''
+ 
+ [desktop/ibus/general/hotkey]

=== modified file 'debian/patches/series'
--- debian/patches/series	2014-03-19 14:08:29 +0000
+++ debian/patches/series	2014-06-18 21:49:52 +0000
@@ -99,3 +99,4 @@
 03_dont_run_dconf_update.patch
 ubuntu-disable-trigger.patch
 ubuntu-forward-panel-properties.patch
+ibus-use-system-keyboard.patch

