--- Begin Message ---
Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: unblock
Please unblock package im-config
(explain the reason for the unblock here)
Without this update, im-config doesn't work for uim which is required by
japanese-desktop-tasks
Bug discussion was on Japanese devel discussion.
(include/attach the debdiff against the package in testing)
$ debdiff im-config_0.38-1.dsc im-config_0.39-1.dsc
diff -Nru im-config-0.38/70-im-config im-config-0.39/70-im-config
--- im-config-0.38/70-im-config 1970-01-01 09:00:00.000000000 +0900
+++ im-config-0.39/70-im-config 2019-03-09 02:09:03.000000000 +0900
@@ -0,0 +1,8 @@
+#! /bin/sh
+
+if [ -r /etc/X11/Xsession.d/70im-config_launch ]; then
+ . /etc/X11/Xsession.d/70im-config_launch
+
+ # always export variables even for manual configuration.
+ env | grep -E '^(IM_CONFIG_PHASE|XMODIFIERS|GTK_IM_MODULE|QT_IM_MODULE|QT4_IM_MODULE|CLUTTER_IM_MODULE)='
+fi
diff -Nru im-config-0.38/70im-config_launch im-config-0.39/70im-config_launch
--- im-config-0.38/70im-config_launch 2018-08-03 22:18:44.000000000 +0900
+++ im-config-0.39/70im-config_launch 2019-03-09 02:09:03.000000000 +0900
@@ -11,6 +11,11 @@
IMLAUNCH=/usr/bin/im-launch
+if [ "$IM_CONFIG_PHASE" = 1 ]; then
+ IM_CONFIG_CHECK_ENV=1
+ export IM_CONFIG_CHECK_ENV
+fi
+
# If already tweaked, keep hands off :-)
# If im-config is removed but not purged, keep hands off :-)
if [ -z "$XMODIFIERS" ] && \
diff -Nru im-config-0.38/data/24_uim.rc im-config-0.39/data/24_uim.rc
--- im-config-0.38/data/24_uim.rc 2018-08-04 16:53:10.000000000 +0900
+++ im-config-0.39/data/24_uim.rc 2019-03-09 02:09:03.000000000 +0900
@@ -8,11 +8,11 @@
fi
# Starting GUI
if [ -x /usr/bin/uim-toolbar ]; then
- ( sleep 5 ; uim-toolbar ) &
+ ( sleep 5 ; env GDK_BACKEND=x11 uim-toolbar ) &
elif [ -x /usr/bin/uim-toolbar-gtk3 ]; then
- ( sleep 5 ; uim-toolbar-gtk3 ) &
+ ( sleep 5 ; env GDK_BACKEND=x11 uim-toolbar-gtk3 ) &
elif [ -x /usr/bin/uim-toolbar-gtk ]; then
- ( sleep 5 ; uim-toolbar-gtk ) &
+ ( sleep 5 ; env GDK_BACKEND=x11 uim-toolbar-gtk ) &
elif [ -x /usr/bin/uim-toolbar-qt4 ]; then
( sleep 5 ; uim-toolbar-qt4 ) &
elif [ -x /usr/bin/uim-toolbar-qt5 ]; then
diff -Nru im-config-0.38/debian/changelog im-config-0.39/debian/changelog
--- im-config-0.38/debian/changelog 2018-08-04 23:53:32.000000000 +0900
+++ im-config-0.39/debian/changelog 2019-03-09 02:09:41.000000000 +0900
@@ -1,3 +1,10 @@
+im-config (0.39-1) unstable; urgency=medium
+
+ [ YOSHINO Yoshihito ]
+ * Support GNOME Wayland with gdm3.
+
+ -- Osamu Aoki <osamu@debian.org> Sat, 09 Mar 2019 02:09:41 +0900
+
im-config (0.38-1) unstable; urgency=medium
* Switch from bash to sh for im-config.
diff -Nru im-config-0.38/debian/install im-config-0.39/debian/install
--- im-config-0.38/debian/install 2018-08-03 22:18:44.000000000 +0900
+++ im-config-0.39/debian/install 2019-03-09 02:09:03.000000000 +0900
@@ -1,9 +1,11 @@
+70-im-config usr/lib/systemd/user-environment-generators
70im-config_launch etc/X11/Xsession.d
data/* usr/share/im-config/data
default/im-config etc/default
im-config usr/bin
im-config.desktop usr/share/applications
im-launch usr/bin
+im-launch.desktop etc/xdg/autostart
po/locale/* usr/share/locale
share/im-config.common usr/share/im-config
share/xinputrc.common usr/share/im-config
diff -Nru im-config-0.38/debian/README.Debian im-config-0.39/debian/README.Debian
--- im-config-0.38/debian/README.Debian 2018-08-03 22:18:44.000000000 +0900
+++ im-config-0.39/debian/README.Debian 2018-08-05 01:26:03.000000000 +0900
@@ -162,6 +162,20 @@
package_menu return true if enough packages exist for menu listing 00-89
package_auto return true if enough packages exist for auto selection 10-79
-Please note these are different from im-switch configuration files.
+To test your proposed change, download the latest source by:
- -- Osamu Aoki <osamu@debian.org>, Thu, 24 Apr 2014 14:20:17 +0000
+ $ git clone --branch devel \
+ https://salsa.debian.org/input-method-team/im-config.git
+
+Here, the "devel" branch is meant for everyone to commit changes. "master",
+"upstream", and "pristine-tar" branches are used to record the uploaded
+package by the maintainer with:
+
+ $ gbp import-dsc --pristine-tar ../im-config*.dsc
+
+If you have debmake installed, you can make Debian package from "devel" branch
+with:
+
+ $ make package
+
+ -- Osamu Aoki <osamu@debian.org>, Sat, 04 Aug 2018 16:23:26 +0000
diff -Nru im-config-0.38/im-config.desktop im-config-0.39/im-config.desktop
--- im-config-0.38/im-config.desktop 2018-08-03 22:18:44.000000000 +0900
+++ im-config-0.39/im-config.desktop 2018-12-15 18:18:52.000000000 +0900
@@ -20,6 +20,8 @@
Comment[vi]=Chọn kiểu nhập bàn phím
Comment[uk]=Налаштування способу введення за допомогою клавіатури
Comment[ru]=Настройка метода ввода с клавиатуры
+Name[da]=Inputmetode
+Comment[da]=Indstil inputmetode for tastatur
Type=Application
Keywords=keyboard;input
Exec=im-config
diff -Nru im-config-0.38/im-launch im-config-0.39/im-launch
--- im-config-0.38/im-launch 2018-08-03 22:18:44.000000000 +0900
+++ im-config-0.39/im-launch 2019-03-09 02:09:03.000000000 +0900
@@ -13,6 +13,26 @@
exit 1
fi
+if [ "$IM_CONFIG_CHECK_ENV" = 1 ] && \
+ [ "$IM_CONFIG_PHASE" = 1 ]; then
+ # If tweaked, keep hands off :-)
+ if ! env -i \
+ IM_CONFIG_SET_XMODIFIERS="$XMODIFIERS" \
+ IM_CONFIG_SET_GTK_IM_MODULE="$GTK_IM_MODULE" \
+ IM_CONFIG_SET_QT_IM_MODULE="$QT_IM_MODULE" \
+ IM_CONFIG_SET_QT4_IM_MODULE="$QT4_IM_MODULE" \
+ IM_CONFIG_SET_CLUTTER_IM_MODULE="$CLUTTER_IM_MODULE" \
+ sh -c '. /etc/X11/Xsession.d/70im-config_launch
+ [ "$IM_CONFIG_SET_XMODIFIERS" = "$XMODIFIERS" ] &&
+ [ "$IM_CONFIG_SET_GTK_IM_MODULE" = "$GTK_IM_MODULE" ] && \
+ [ "$IM_CONFIG_SET_QT_IM_MODULE" = "$QT_IM_MODULE" ] && \
+ [ "$IM_CONFIG_SET_QT4_IM_MODULE" = "$QT4_IM_MODULE" ] && \
+ [ "$IM_CONFIG_SET_CLUTTER_IM_MODULE" = "$CLUTTER_IM_MODULE" ]'; then
+ unset IM_CONFIG_PHASE
+ fi
+ unset IM_CONFIG_CHECK_ENV
+fi
+
IM_START_SESSION="$@"
# If already tweaked, keep hands off :-)
diff -Nru im-config-0.38/im-launch.desktop im-config-0.39/im-launch.desktop
--- im-config-0.38/im-launch.desktop 1970-01-01 09:00:00.000000000 +0900
+++ im-config-0.39/im-launch.desktop 2019-03-09 02:09:03.000000000 +0900
@@ -0,0 +1,5 @@
+[Desktop Entry]
+Name=im-launch
+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
diff -Nru im-config-0.38/Makefile im-config-0.39/Makefile
--- im-config-0.38/Makefile 2018-08-05 00:27:45.000000000 +0900
+++ im-config-0.39/Makefile 2019-03-09 02:09:03.000000000 +0900
@@ -7,6 +7,7 @@
endif
FILES = \
+ 70-im-config \
70im-config_launch \
im-config \
im-launch \
unblock im-config/0.39-1
-- System Information:
Debian Release: buster/sid
APT prefers testing
APT policy: (500, 'testing'), (10, 'unstable')
Architecture: amd64 (x86_64)
Kernel: Linux 4.19.0-2-amd64 (SMP w/4 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8), LANGUAGE=en_US:en (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Init: systemd (via /run/systemd/system)
LSM: AppArmor: enabled
--- End Message ---