diff -Nru language-selector-0.124/debian/changelog language-selector-0.126/debian/changelog --- language-selector-0.124/debian/changelog 2014-03-19 01:07:07.000000000 +0000 +++ language-selector-0.126/debian/changelog 2014-03-27 14:09:13.000000000 +0000 @@ -1,3 +1,17 @@ +language-selector (0.126) trusty; urgency=medium + + * LanguageSelector/ImConfig.py: + Make fcitx the system default if installed (LP: #1297831). + + -- Gunnar Hjalmarsson Thu, 27 Mar 2014 15:09:00 +0100 + +language-selector (0.125) trusty; urgency=medium + + * fontconfig/69-language-selector-zh-*.conf: + Added 'binding="strong"' when missing (LP: #1227034). + + -- Gunnar Hjalmarsson Thu, 27 Mar 2014 11:38:00 +0100 + language-selector (0.124) trusty; urgency=medium * LanguageSelector/gtk/GtkLanguageSelector.py: diff -Nru language-selector-0.124/fontconfig/69-language-selector-zh-cn.conf language-selector-0.126/fontconfig/69-language-selector-zh-cn.conf --- language-selector-0.124/fontconfig/69-language-selector-zh-cn.conf 2013-11-06 13:39:56.000000000 +0000 +++ language-selector-0.126/fontconfig/69-language-selector-zh-cn.conf 2014-03-27 10:16:36.000000000 +0000 @@ -9,7 +9,7 @@ serif - + HYSong AR PL UMing CN AR PL UMing HK @@ -26,7 +26,7 @@ zh-cn - + Droid Sans Fallback WenQuanYi Zen Hei HYSong @@ -44,7 +44,7 @@ zh-cn - + Droid Sans Fallback WenQuanYi Zen Hei Mono HYSong diff -Nru language-selector-0.124/fontconfig/69-language-selector-zh-hk.conf language-selector-0.126/fontconfig/69-language-selector-zh-hk.conf --- language-selector-0.124/fontconfig/69-language-selector-zh-hk.conf 2014-01-21 21:11:16.000000000 +0000 +++ language-selector-0.126/fontconfig/69-language-selector-zh-hk.conf 2014-03-27 10:17:09.000000000 +0000 @@ -9,7 +9,7 @@ zh-hk - + AR PL UMing HK AR PL New Sung HYSong @@ -25,7 +25,7 @@ zh-hk - + Droid Sans Fallback AR PL UMing HK AR PL New Sung @@ -41,7 +41,7 @@ zh-hk - + Droid Sans Fallback AR PL UMing HK AR PL New Sung diff -Nru language-selector-0.124/fontconfig/69-language-selector-zh-mo.conf language-selector-0.126/fontconfig/69-language-selector-zh-mo.conf --- language-selector-0.124/fontconfig/69-language-selector-zh-mo.conf 2014-01-21 21:12:32.000000000 +0000 +++ language-selector-0.126/fontconfig/69-language-selector-zh-mo.conf 2014-03-27 10:17:43.000000000 +0000 @@ -9,7 +9,7 @@ zh-mo - + AR PL UMing HK AR PL New Sung HYSong @@ -25,7 +25,7 @@ zh-mo - + Bitstream Vera Sans Droid Sans Fallback AR PL UMing HK @@ -42,7 +42,7 @@ zh-mo - + Bitstream Vera Sans Mono Droid Sans Fallback AR PL UMing HK diff -Nru language-selector-0.124/fontconfig/69-language-selector-zh-sg.conf language-selector-0.126/fontconfig/69-language-selector-zh-sg.conf --- language-selector-0.124/fontconfig/69-language-selector-zh-sg.conf 2013-11-06 13:41:15.000000000 +0000 +++ language-selector-0.126/fontconfig/69-language-selector-zh-sg.conf 2014-03-27 10:18:15.000000000 +0000 @@ -9,7 +9,7 @@ zh-sg - + HYSong AR PL UMing CN AR PL UMing HK @@ -26,7 +26,7 @@ zh-sg - + Droid Sans Fallback WenQuanYi Zen Hei HYSong @@ -44,7 +44,7 @@ zh-sg - + Droid Sans Fallback WenQuanYi Zen Hei Mono HYSong diff -Nru language-selector-0.124/LanguageSelector/ImConfig.py language-selector-0.126/LanguageSelector/ImConfig.py --- language-selector-0.124/LanguageSelector/ImConfig.py 2014-01-27 05:23:48.000000000 +0000 +++ language-selector-0.126/LanguageSelector/ImConfig.py 2014-03-27 14:00:21.000000000 +0000 @@ -30,7 +30,10 @@ let's ask the system and save the system configuration as the user ditto """ system_conf = '' - if systemConfig == 'default': + if os.path.exists('/usr/bin/fcitx'): + # Ubuntu Kylin special + system_conf = 'fcitx' + elif systemConfig == 'default': # Using the autoConfig value might be incorrect if the mode in # /etc/default/im-config is 'cjkv'. However, as from im-config 0.24-1ubuntu1 # the mode is 'auto' for all users of language-selector-gnome.