Package: release.debian.org
Severity: normal
Tags: bullseye
User: release.debian....@packages.debian.org
Usertags: pu
X-Debbugs-Cc: z...@debian.org
[ Reason ]
Two fixes related to Fcitx5, the Chinese/Japanese/Korean input method.
+ 990742
Fcitx5 should be preferred to Fcitx4. When upgrading from buster, which
installs Fcitx4 by default, the old version may still around. So when
both versions installed, the new one should be used.
+ 977203
The input method related env for Fcitx5 should be "fcitx", not "fcitx5".
Some property software may not recognize the "fcitx5" env, and results
poor experience since they may fallback to legacy "xim" mode.
[ Impact ]
Bad input experience.
[ Tests ]
These two changes are already included in testing for some days, and I
have using it daily without problems.
Though I tested the version in testing, the version in testing are
identical to this one, except one non-functional change in bug-script.
[ Risks ]
None, the change is trivial.
[ Checklist ]
[x] *all* changes are documented in the d/changelog
[x] I reviewed all changes and I approve them
[x] attach debdiff against the package in (old)stable
[x] the issue is verified as fixed in unstable
[ Changes ]
diff -Nru im-config-0.46/debian/changelog im-config-0.46/debian/changelog
--- im-config-0.46/debian/changelog 2020-12-18 17:38:00.000000000 +0800
+++ im-config-0.46/debian/changelog 2021-08-30 23:54:06.000000000 +0800
@@ -1,3 +1,17 @@
+im-config (0.46-1+deb11u1) bullseye; urgency=medium
+
+ * Team upload
+
+ [ Gunnar Hjalmarsson ]
+ * Replace "fcitx" with "fcitx5" in IM_CONFIG_PREFERRED_RULE variable
+ (closes: #990742)
+
+ [ Shengjing Zhu ]
+ * Change IM_MODULE env for fcitx5 to "fcitx" (closes: #977203,
+ LP: #1928360)
+
+ -- Shengjing Zhu <z...@debian.org> Mon, 30 Aug 2021 23:54:06 +0800
+
im-config (0.46-1) unstable; urgency=medium
* Team upload
diff -Nru
im-config-0.46/debian/patches/Change-IM_MODULE-env-for-fcitx5-to-fcitx.patch
im-config-0.46/debian/patches/Change-IM_MODULE-env-for-fcitx5-to-fcitx.patch
---
im-config-0.46/debian/patches/Change-IM_MODULE-env-for-fcitx5-to-fcitx.patch
1970-01-01 08:00:00.000000000 +0800
+++
im-config-0.46/debian/patches/Change-IM_MODULE-env-for-fcitx5-to-fcitx.patch
2021-08-30 23:54:06.000000000 +0800
@@ -0,0 +1,25 @@
+From: Gunnar Hjalmarsson <gunna...@debian.org>
+Date: Mon, 7 Jun 2021 09:29:12 +0200
+Subject: Change IM_MODULE env for fcitx5 to "fcitx"
+
+Closes: #977203
+Origin: https://salsa.debian.org/input-method-team/im-config/-/commit/53d6a32b
+---
+ data/23_fcitx5.rc | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/data/23_fcitx5.rc b/data/23_fcitx5.rc
+index e5e957b..c4a44cc 100644
+--- a/data/23_fcitx5.rc
++++ b/data/23_fcitx5.rc
+@@ -12,8 +12,8 @@ if [ "$IM_CONFIG_PHASE" = 1 ]; then
+ XMODIFIERS=@im=fcitx
+
+ # Let's assume all required modules are installed
+-GTK_IM_MODULE=fcitx5
+-QT_IM_MODULE=fcitx5
++GTK_IM_MODULE=fcitx
++QT_IM_MODULE=fcitx
+ CLUTTER_IM_MODULE=xim
+
+ fi
diff -Nru
im-config-0.46/debian/patches/Replace-fcitx-with-fcitx5-in-IM_CONFIG_PREFERRED_RULE.patch
im-config-0.46/debian/patches/Replace-fcitx-with-fcitx5-in-IM_CONFIG_PREFERRED_RULE.patch
---
im-config-0.46/debian/patches/Replace-fcitx-with-fcitx5-in-IM_CONFIG_PREFERRED_RULE.patch
1970-01-01 08:00:00.000000000 +0800
+++
im-config-0.46/debian/patches/Replace-fcitx-with-fcitx5-in-IM_CONFIG_PREFERRED_RULE.patch
2021-08-30 23:54:06.000000000 +0800
@@ -0,0 +1,37 @@
+From: Gunnar Hjalmarsson <gunna...@debian.org>
+Date: Mon, 16 Aug 2021 22:16:00 +0200
+Subject: Replace "fcitx" with "fcitx5" in IM_CONFIG_PREFERRED_RULE
+
+Closes: #990742
+Origin: https://salsa.debian.org/input-method-team/im-config/-/commit/e35ee1d2
+---
+ default/im-config-Debian | 2 +-
+ default/im-config-Ubuntu | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/default/im-config-Debian b/default/im-config-Debian
+index bb574de..6c53132 100644
+--- a/default/im-config-Debian
++++ b/default/im-config-Debian
+@@ -30,7 +30,7 @@ CJKV_DEFAULT_DESKTOP="*"
+ CJKV_LOCALES="zh_TW:zh_HK:zh_SG:zh_CN:ja_JP:ko_KR:vi_VN"
+
+ # Set locale dependent preferred IM over standard auto mode if not GNOME
+-IM_CONFIG_PREFERRED_RULE="zh_CN,fcitx:zh_TW,fcitx:zh_HK,fcitx:zh_SG,fcitx"
++IM_CONFIG_PREFERRED_RULE="zh_CN,fcitx5:zh_TW,fcitx5:zh_HK,fcitx5:zh_SG,fcitx5"
+
+ # User and system wide configuration is normally done via im-config program.
+ # The above IM_CONFIG_PREFERRED_RULE sets locale dependent preferred IM
+diff --git a/default/im-config-Ubuntu b/default/im-config-Ubuntu
+index dfd537c..6ef8373 100644
+--- a/default/im-config-Ubuntu
++++ b/default/im-config-Ubuntu
+@@ -30,7 +30,7 @@ CJKV_DEFAULT_DESKTOP="LXQt"
+ CJKV_LOCALES="zh_TW:zh_HK:zh_SG:zh_CN:ja_JP:ko_KR:vi_VN"
+
+ # Set locale dependent preferred IM over standard auto mode if not GNOME
+-IM_CONFIG_PREFERRED_RULE="zh_CN,fcitx:zh_TW,fcitx:zh_HK,fcitx:zh_SG,fcitx"
++IM_CONFIG_PREFERRED_RULE="zh_CN,fcitx5:zh_TW,fcitx5:zh_HK,fcitx5:zh_SG,fcitx5"
+
+ # User and system wide configuration is normally done via im-config program.
+ # The above IM_CONFIG_PREFERRED_RULE sets locale dependent preferred IM
diff -Nru im-config-0.46/debian/patches/series
im-config-0.46/debian/patches/series
--- im-config-0.46/debian/patches/series 2020-12-18 08:58:02.000000000
+0800
+++ im-config-0.46/debian/patches/series 2021-08-30 23:54:06.000000000
+0800
@@ -0,0 +1,2 @@
+Replace-fcitx-with-fcitx5-in-IM_CONFIG_PREFERRED_RULE.patch
+Change-IM_MODULE-env-for-fcitx5-to-fcitx.patch
[ Other info ]
No
