Merge lp:~hennekn/ubuntu/trusty/ibus/bug-1240198 into lp:ubuntu/trusty/ibus

[Hendrik Schrieber]

This patch is supposed to fix Bug#1240198 by adding an additional config file to set the default value of "use-system-keyboard-layout" to "true" and therefore prevent ibus from falling back to the en-us keyboard layout.

For the setting to take effect "dconf update" has to be run but based on other patches to IBus I suppose this happens automatically via triggers on install.

This is not easily testable since the bug is semi-random and ibus not working as a standalone app. Therefore it should be tested by a wider audience.

This is my first patch and I am not certain if this will work so any guidance or help would be appreciated.

[William Hua (attente)]

Hi, I haven't been able to replicate the original bug, but looking at the diff, I think you need to add 04_enable_system_layout.patch to EXTRA_DIST in data/dconf/Makefile.am.

[Aron Xu (happyaron)]

Agree with William, and also please clean up those .pc noise. Thanks!

review: Needs Fixing

[Sebastien Bacher (seb128)]

Changing to "work in progress" so it's out of the sponsoring queue until the pointed issues are resolved, change back to "needs review" then

Unmerged revisions

49. By Hendrik Knackstedt <hendrik@hendrik-Aspire-5750G> on 2014-05-23

Add patch to fix Bug #1240198 by adding a custom config to enable
the use of the system's keyboard layout by default.

=== added directory '.pc/04_enable_system_layout.patch'
=== added file '.pc/04_enable_system_layout.patch/.timestamp'
=== added directory '.pc/04_enable_system_layout.patch/data'
=== added directory '.pc/04_enable_system_layout.patch/data/dconf'
=== added file '.pc/04_enable_system_layout.patch/data/dconf/04_enable_system_layout'
=== modified file '.pc/applied-patches'
--- .pc/applied-patches	2014-03-19 14:08:29 +0000
+++ .pc/applied-patches	2014-05-23 18:56:50 +0000
@@ -11,3 +11,4 @@
 03_dont_run_dconf_update.patch
 ubuntu-disable-trigger.patch
 ubuntu-forward-panel-properties.patch
+04_enable_system_layout.patch

=== modified file 'debian/changelog'
--- debian/changelog	2014-03-19 14:08:29 +0000
+++ debian/changelog	2014-05-23 18:56:50 +0000
@@ -1,3 +1,9 @@
+ibus (1.5.5-1ubuntu4) UNRELEASED; urgency=medium
+
+  * Add patch to fix Bug #1240198
+
+ -- Hendrik Knackstedt <hendrik@hendrik-Aspire-5750G>  Fri, 23 May 2014 20:36:30 +0200
+
 ibus (1.5.5-1ubuntu3) trusty; urgency=medium
 
   * debian/patches/ubuntu-forward-panel-properties.patch:

=== added file 'debian/patches/04_enable_system_layout.patch'
--- debian/patches/04_enable_system_layout.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/04_enable_system_layout.patch	2014-05-23 18:56:50 +0000
@@ -0,0 +1,7 @@
+Index: ibus/data/dconf/04_enable_system_layout
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ ibus/data/dconf/04_enable_system_layout	2014-05-23 20:30:21.944418735 +0200
+@@ -0,0 +1,2 @@
++[desktop/ibus/general]
++use-system-keyboard-layout=true

=== modified file 'debian/patches/series'
--- debian/patches/series	2014-03-19 14:08:29 +0000
+++ debian/patches/series	2014-05-23 18:56:50 +0000
@@ -99,3 +99,4 @@
 03_dont_run_dconf_update.patch
 ubuntu-disable-trigger.patch
 ubuntu-forward-panel-properties.patch
+04_enable_system_layout.patch