diff --git a/debian/changelog b/debian/changelog index f90ae0c..c97cc31 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +dde-session (1.2.12) unstable; urgency=medium + + * fix deepin-kwin shortcuts + + -- Dingyuan Zhang Wed, 3 Jul 2024 14:42:06 +0800 + dde-session (1.2.11) unstable; urgency=medium * release 1.2.11 diff --git a/systemd/dde-session-pre.target.wants/dde-session@x11.service b/systemd/dde-session-pre.target.wants/dde-session@x11.service index 8d8c556..ba93060 100644 --- a/systemd/dde-session-pre.target.wants/dde-session@x11.service +++ b/systemd/dde-session-pre.target.wants/dde-session@x11.service @@ -21,6 +21,7 @@ Type=notify # kind of painful as systemd had a bug where it retries the condition. # Only start if the template instance matches the session type. ExecCondition=/bin/sh -c 'test "$XDG_SESSION_TYPE" = "%I" || exit 2' +ExecStartPre=-/bin/sh -c 'cp /etc/xdg/kglobalshortcutsrc $HOME/.config/kglobalshortcutsrc' ExecStart=/usr/bin/deepin-kwin_x11 --replace # Exit code 1 means we are probably *not* dealing with an extension failure SuccessExitStatus=1