Drop the Budgie exception

Closes: #972600

debian/README.Debian

@@ -174,15 +174,13 @@ qualify are defined in CJKV_LOCALES variable.
 
 With this, the default IM mode choices were: cjkv, auto, none
 
-Since modern DEs such as GNOME (both classic X and new wayland excluding
-Budgie) integrate ibus as IM while providing panel GUI in its own
-gnome-shell, im-config hook scripts needs to be disabled for ibus on
+Since modern DEs such as GNOME (both classic X and new wayland)
+integrate ibus as IM while providing panel GUI in its own desktop
+environment, im-config hook scripts needs to be disabled for ibus on
 such DEs.  Such DEs to keep hands off are defined in DESKTOP_SETUP_IBUS
 variable in the /etc/default/im-config.
 
-DESKTOP_SETUP_IBUS='-Budgie:GNOME'
-
-Here, "-Budgie" is needed to exclude Budgie.
+DESKTOP_SETUP_IBUS='GNOME'
 
 The locale dependent package priority order override for auto mode is
 provided via IM_CONFIG_PREFERRED_RULE variable in the
@@ -217,7 +215,6 @@ Initialization system for IM:
     MATE            im-config hooks     im-config hooks
     UKUI            im-config hooks     im-config hooks
     Unity           im-config hooks     im-config hooks
-    Budgie:GNOME    im-config hooks     im-config hooks
     KDE             im-config hooks     im-config hooks
     LXQt            im-config hooks     im-config hooks
     XFCE            im-config hooks     im-config hooks
@@ -233,7 +230,6 @@ IM package activation priority for auto mode:
     MATE            fcitx -> ibus       ibus -> fcitx
     UKUI            fcitx -> ibus       ibus -> fcitx
     Unity           fcitx -> ibus       ibus -> fcitx
-    Budgie:GNOME    fcitx -> ibus       ibus -> fcitx
     KDE             fcitx -> ibus       ibus -> fcitx
     LXQt            fcitx -> ibus       ibus -> fcitx
     XFCE            fcitx -> ibus       ibus -> fcitx
@@ -254,10 +250,9 @@ cjkv mode (Ubuntu default) behavior:
     MATE            none            auto            auto
     UKUI            none            auto            auto
     Unity           none            auto            auto
-    Budgie:GNOME    none            auto            auto
-    KDE             none            none            auto
+    KDE             none            auto            auto
     LXQt            none            none            auto
-    XFCE            none            none            auto
+    XFCE            none            auto            auto
 
  -- This is set by CJKV_LOCALES, CJKV_DEFAULT_DESKTOP
     in mode_cjkv function of xinputrc.common file

debian/changelog

@@ -3,6 +3,7 @@ im-config (0.46-1) UNRELEASED; urgency=medium
   [ Gunnar Hjalmarsson ]
   * default/im-config-Ubuntu:
     - Drop KDE and XFCE from the CJKV_DEFAULT_DESKTOP list
+  * Drop the Budgie exception (closes: #972600)
 
  -- Gunnar Hjalmarsson <gunnarhj@ubuntu.com>  Wed, 16 Sep 2020 12:18:00 +0200
 

default/im-config-Debian

@@ -38,9 +38,8 @@ IM_CONFIG_PREFERRED_RULE="zh_CN,fcitx:zh_TW,fcitx:zh_HK,fcitx:zh_SG,fcitx"
 # add :ja_JP,uim at the end of the above list. (Marked by "!" in GUI)
 
 # List of desktop systems which starts ibus if available
-#   "-" preceded entries are force to be excluded
 #   Applicable desktops are excluded for applying IM_CONFIG_PREFERRED_RULE
-DESKTOP_SETUP_IBUS="-Budgie:GNOME"
+DESKTOP_SETUP_IBUS="GNOME"
 
 # Trace commands for debug
 # (This may cause problem configuration file generated under console mode)

default/im-config-Ubuntu

@@ -38,9 +38,8 @@ IM_CONFIG_PREFERRED_RULE="zh_CN,fcitx:zh_TW,fcitx:zh_HK,fcitx:zh_SG,fcitx"
 # add :ja_JP,uim at the end of the above list. (Marked by "!" in GUI)
 
 # List of desktop systems which starts ibus if available
-#   "-" preceded entries are force to be excluded
 #   Applicable desktops are excluded for applying IM_CONFIG_PREFERRED_RULE
-DESKTOP_SETUP_IBUS="-Budgie:GNOME"
+DESKTOP_SETUP_IBUS="GNOME"
 
 # Trace commands for debug
 # (This may cause problem configuration file generated under console mode)

share/xinputrc.common.in

@@ -152,8 +152,6 @@ find_match () {
                 if [ "*" = "$Y" ]; then
                     R=0
                     break 2
-                elif [ "-$X" = "$Y" ]; then
-                    break 2
                 elif [ "$X" = "$Y" ]; then
                     R=0
                     break 2