diff -Nru im-config-0.27/debian/changelog im-config-0.27/debian/changelog --- im-config-0.27/debian/changelog 2015-03-15 07:16:29.000000000 +0800 +++ im-config-0.27/debian/changelog 2015-03-19 17:35:59.000000000 +0800 @@ -1,3 +1,10 @@ +im-config (0.27-1ubuntu8) vivid; urgency=medium + + * Restore the priorities of ibus and fcitx + * Set fcitx as per-locale default for zh_* + + -- Aron Xu Thu, 19 Mar 2015 17:35:06 +0800 + im-config (0.27-1ubuntu7) vivid; urgency=medium * Handle the situation that LC_CTYPE is set through variable diff -Nru im-config-0.27/debian/patches/02_ubuntu-locale-prefs.patch im-config-0.27/debian/patches/02_ubuntu-locale-prefs.patch --- im-config-0.27/debian/patches/02_ubuntu-locale-prefs.patch 2015-03-13 04:49:10.000000000 +0800 +++ im-config-0.27/debian/patches/02_ubuntu-locale-prefs.patch 2015-03-19 17:37:21.000000000 +0800 @@ -1,7 +1,7 @@ -Index: im-config-0.27/share/locale_prefs.conf +Index: im-config-0.27/share/locale_prefs =================================================================== ---- im-config-0.27.orig/share/locale_prefs.conf -+++ im-config-0.27/share/locale_prefs.conf +--- im-config-0.27.orig/share/locale_prefs ++++ im-config-0.27/share/locale_prefs @@ -5,3 +5,8 @@ # locale name and preferred IM name; # 2) Add multiple lines for as many locales as desired; diff -Nru im-config-0.27/debian/patches/series im-config-0.27/debian/patches/series --- im-config-0.27/debian/patches/series 2015-03-13 05:53:44.000000000 +0800 +++ im-config-0.27/debian/patches/series 2015-03-19 17:36:59.000000000 +0800 @@ -1 +1,2 @@ 01_preferred-im-by-locale.patch +02_ubuntu-locale-prefs.patch diff -Nru im-config-0.27/debian/rules im-config-0.27/debian/rules --- im-config-0.27/debian/rules 2015-03-13 05:50:04.000000000 +0800 +++ im-config-0.27/debian/rules 2015-03-19 17:35:03.000000000 +0800 @@ -4,13 +4,7 @@ override_dh_install: dh_install - # Adjust priority for each distribution. - # Debian: ibus (21) fcitx(22) - # Ubuntu: fcitx(20) ibus (21) if dpkg-vendor --is ubuntu; then \ - cd debian/im-config/usr/share/im-config/data ; \ - mv 22_fcitx.conf 20_fcitx.conf ; \ - mv 22_fcitx.rc 20_fcitx.rc ; \ cd $(CURDIR) ; \ echo "OnlyShowIn=KDE;GNOME;" >> debian/im-config/usr/share/applications/im-config.desktop ;\ fi