diff -ru im-config-0.29.orig/debian/changelog im-config-0.29/debian/changelog --- im-config-0.29.orig/debian/changelog 2016-02-29 10:19:54.000000000 +0100 +++ im-config-0.29/debian/changelog 2016-03-08 01:25:29.892048038 +0100 @@ -1,3 +1,13 @@ +im-config (0.29-1ubuntu10) xenial; urgency=medium + + * debian/patches/01-ubuntu-locale-override.patch: + Exempt GNOME desktops from modifying auto mode for CJKV locales + (LP: #1551283). + * debian/patches/02-ubuntu-system-default.patch: + Make "auto" the system default for Ubuntu GNOME (LP: #1551283). + + -- Gunnar Hjalmarsson Tue, 08 Mar 2016 01:25:00 +0100 + im-config (0.29-1ubuntu9) xenial; urgency=medium * debian/patches/02-ubuntu-system-default.patch: diff -ru im-config-0.29.orig/debian/patches/01-ubuntu-locale-override.patch im-config-0.29/debian/patches/01-ubuntu-locale-override.patch --- im-config-0.29.orig/debian/patches/01-ubuntu-locale-override.patch 2015-06-13 19:19:50.000000000 +0200 +++ im-config-0.29/debian/patches/01-ubuntu-locale-override.patch 2016-03-08 00:43:55.731708912 +0100 @@ -2,12 +2,14 @@ =================================================================== --- im-config-0.29.orig/default/im-config +++ im-config-0.29/default/im-config -@@ -6,7 +6,7 @@ IM_CONFIG_DEFAULT_MODE=auto +@@ -6,7 +6,9 @@ #IM_CONFIG_DEFAULT_MODE=cjkv # Set locale dependent preferred IM over standard auto mode -IM_CONFIG_PREFERRED_RULE="zh_CN,fcitx:zh_TW,fcitx:zh_HK,fcitx:zh_SG,fcitx" -+IM_CONFIG_PREFERRED_RULE="zh_CN,fcitx:zh_TW,fcitx:zh_HK,fcitx:zh_SG,fcitx:ja_JP,fcitx:ko_KR,fcitx:vi_VN,fcitx" ++if [ "${XDG_CURRENT_DESKTOP##*:}" != 'GNOME' -a "${XDG_CURRENT_DESKTOP%%:*}" != 'GNOME-Flashback' ]; then ++ IM_CONFIG_PREFERRED_RULE="zh_CN,fcitx:zh_TW,fcitx:zh_HK,fcitx:zh_SG,fcitx:ja_JP,fcitx:ko_KR,fcitx:vi_VN,fcitx" ++fi # User and system wide configuration is normally done via im-config program. # The above IM_CONFIG_PREFERRED_RULE sets locale dependent preferred IM diff -ru im-config-0.29.orig/debian/patches/02-ubuntu-system-default.patch im-config-0.29/debian/patches/02-ubuntu-system-default.patch --- im-config-0.29.orig/debian/patches/02-ubuntu-system-default.patch 2016-02-26 17:27:54.150889140 +0100 +++ im-config-0.29/debian/patches/02-ubuntu-system-default.patch 2016-03-08 01:18:04.399984529 +0100 @@ -1,8 +1,8 @@ Description: Modify the system default - While the upstream default "auto" is believed to work best on Unity and - MATE, "cjkv" makes sure on other desktops that IBus or fcitx is not - started by default for all users. -Bug-Ubuntu: https://launchpad.net/bugs/1481025, https://launchpad.net/bugs/1550325 + While the upstream default "auto" is believed to work best on Unity, + MATE and Ubuntu GNOME, "cjkv" makes sure on other desktops that IBus + or fcitx is not started by default for all users. +Bug-Ubuntu: https://launchpad.net/bugs/1481025, https://launchpad.net/bugs/1550325, https://launchpad.net/bugs/1551283 Author: Gunnar Hjalmarsson Forwarded: not-needed @@ -15,7 +15,7 @@ -IM_CONFIG_DEFAULT_MODE=auto -# Start best input method only if CJKV environment -#IM_CONFIG_DEFAULT_MODE=cjkv -+if [ "$XDG_CURRENT_DESKTOP" = 'Unity' -o "$XDG_CURRENT_DESKTOP" = 'MATE' ]; then ++if [ "$XDG_CURRENT_DESKTOP" = 'Unity' -o "$XDG_CURRENT_DESKTOP" = 'MATE' -o "${XDG_CURRENT_DESKTOP##*:}" = 'GNOME' ]; then + # Start best input method unless overridden below + IM_CONFIG_DEFAULT_MODE=auto +else @@ -24,4 +24,4 @@ +fi # Set locale dependent preferred IM over standard auto mode - IM_CONFIG_PREFERRED_RULE="zh_CN,fcitx:zh_TW,fcitx:zh_HK,fcitx:zh_SG,fcitx:ja_JP,fcitx:ko_KR,fcitx:vi_VN,fcitx" + if [ "${XDG_CURRENT_DESKTOP##*:}" != 'GNOME' -a "${XDG_CURRENT_DESKTOP%%:*}" != 'GNOME-Flashback' ]; then