From b77485e5b08af0231d2ba5138595774325ae0138 Mon Sep 17 00:00:00 2001
From: Frank Brehm <frank@brehm-online.com>
Date: Wed, 16 Sep 2020 08:51:12 +0200
Subject: [PATCH] committing changes in /etc made by "/usr/bin/apt full-upgrade
 -y"

Package changes:
-bsdutils 1:2.34-0.1ubuntu9 amd64
+bsdutils 1:2.34-0.1ubuntu9.1 amd64
-fdisk 2.34-0.1ubuntu9 amd64
+fdisk 2.34-0.1ubuntu9.1 amd64
-grub-common 2.04-1ubuntu26.3 amd64
+grub-common 2.04-1ubuntu26.4 amd64
-grub-pc 2.04-1ubuntu26.3 amd64
-grub-pc-bin 2.04-1ubuntu26.3 amd64
-grub2-common 2.04-1ubuntu26.3 amd64
+grub-pc 2.04-1ubuntu26.4 amd64
+grub-pc-bin 2.04-1ubuntu26.4 amd64
+grub2-common 2.04-1ubuntu26.4 amd64
-im-config 0.44-1ubuntu1.1 all
+im-config 0.44-1ubuntu1.2 all
-initramfs-tools 0.136ubuntu6.2 all
-initramfs-tools-bin 0.136ubuntu6.2 amd64
-initramfs-tools-core 0.136ubuntu6.2 all
+initramfs-tools 0.136ubuntu6.3 all
+initramfs-tools-bin 0.136ubuntu6.3 amd64
+initramfs-tools-core 0.136ubuntu6.3 all
-libblkid1 2.34-0.1ubuntu9 amd64
+libblkid1 2.34-0.1ubuntu9.1 amd64
-libcephfs2 15.2.3-0ubuntu0.20.04.1 amd64
+libcephfs2 15.2.3-0ubuntu0.20.04.2 amd64
-libfdisk1 2.34-0.1ubuntu9 amd64
+libfdisk1 2.34-0.1ubuntu9.1 amd64
-libmount1 2.34-0.1ubuntu9 amd64
+libmount1 2.34-0.1ubuntu9.1 amd64
-librados2 15.2.3-0ubuntu0.20.04.1 amd64
+librados2 15.2.3-0ubuntu0.20.04.2 amd64
-librbd1 15.2.3-0ubuntu0.20.04.1 amd64
+librbd1 15.2.3-0ubuntu0.20.04.2 amd64
-libsmartcols1 2.34-0.1ubuntu9 amd64
+libsmartcols1 2.34-0.1ubuntu9.1 amd64
-libuuid1 2.34-0.1ubuntu9 amd64
+libuuid1 2.34-0.1ubuntu9.1 amd64
-mount 2.34-0.1ubuntu9 amd64
+mount 2.34-0.1ubuntu9.1 amd64
-qemu-block-extra 1:4.2-3ubuntu6.4 amd64
-qemu-kvm 1:4.2-3ubuntu6.4 amd64
-qemu-system-common 1:4.2-3ubuntu6.4 amd64
-qemu-system-data 1:4.2-3ubuntu6.4 all
-qemu-system-x86 1:4.2-3ubuntu6.4 amd64
-qemu-utils 1:4.2-3ubuntu6.4 amd64
+qemu-block-extra 1:4.2-3ubuntu6.5 amd64
+qemu-kvm 1:4.2-3ubuntu6.5 amd64
+qemu-system-common 1:4.2-3ubuntu6.5 amd64
+qemu-system-data 1:4.2-3ubuntu6.5 all
+qemu-system-x86 1:4.2-3ubuntu6.5 amd64
+qemu-utils 1:4.2-3ubuntu6.5 amd64
-rfkill 2.34-0.1ubuntu9 amd64
+rfkill 2.34-0.1ubuntu9.1 amd64
-util-linux 2.34-0.1ubuntu9 amd64
-uuid-runtime 2.34-0.1ubuntu9 amd64
+util-linux 2.34-0.1ubuntu9.1 amd64
+uuid-runtime 2.34-0.1ubuntu9.1 amd64
---
 .etckeeper                      |  1 +
 profile.d/im-config_wayland.sh  | 12 ++++++++++++
 xdg/autostart/im-launch.desktop |  2 +-
 3 files changed, 14 insertions(+), 1 deletion(-)
 create mode 100644 profile.d/im-config_wayland.sh

diff --git a/.etckeeper b/.etckeeper
index 516460c..e19fa6c 100755
--- a/.etckeeper
+++ b/.etckeeper
@@ -2606,6 +2606,7 @@ maybe chmod 0644 'profile.d/fbrehm.sh'
 maybe chmod 0644 'profile.d/flatpak.sh'
 maybe chmod 0644 'profile.d/gawk.csh'
 maybe chmod 0644 'profile.d/gawk.sh'
+maybe chmod 0644 'profile.d/im-config_wayland.sh'
 maybe chmod 0644 'profile.d/libvirt-uri.sh'
 maybe chmod 0644 'profile.d/vte-2.91.sh'
 maybe chmod 0644 'profile.d/vte.csh'
diff --git a/profile.d/im-config_wayland.sh b/profile.d/im-config_wayland.sh
new file mode 100644
index 0000000..bdbf709
--- /dev/null
+++ b/profile.d/im-config_wayland.sh
@@ -0,0 +1,12 @@
+# /etc/profile.d/im-config_wayland.sh
+#
+# This sets the IM variables on Wayland.
+
+test "$XDG_SESSION_TYPE" = 'wayland' || return
+
+# don't do anything if im-config was removed but not purged
+test -r /usr/share/im-config/xinputrc.common || return
+
+if [ -r /etc/X11/Xsession.d/70im-config_launch ]; then
+    . /etc/X11/Xsession.d/70im-config_launch
+fi
diff --git a/xdg/autostart/im-launch.desktop b/xdg/autostart/im-launch.desktop
index 579c976..055b2d2 100644
--- a/xdg/autostart/im-launch.desktop
+++ b/xdg/autostart/im-launch.desktop
@@ -1,5 +1,5 @@
 [Desktop Entry]
 Name=im-launch
-Exec=sh -c 'if ! [ -e "/usr/bin/ibus-daemon" ] && [ "x$XDG_SESSION_TYPE" = "xwayland" ] ; then exec env IM_CONFIG_CHECK_ENV=1 im-launch true; fi'
+Exec=sh -c 'if [ "x$XDG_SESSION_TYPE" = "xwayland" ] ; then exec env IM_CONFIG_CHECK_ENV=1 im-launch true; fi'
 TryExec=im-launch
 Type=Application
-- 
2.39.5