diff --git a/debian/changelog b/debian/changelog index c3de491..92710b4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +dde-session (1.2.7) unstable; urgency=medium + + * chore: dde-shell replace dde-dock + + -- tsic404 Fri, 29 Mar 2024 10:18:05 +0800 + dde-session (1.2.6) unstable; urgency=medium * fix: dock will flash when logout diff --git a/systemd/CMakeLists.txt b/systemd/CMakeLists.txt index 7c369c4..caaf2b2 100644 --- a/systemd/CMakeLists.txt +++ b/systemd/CMakeLists.txt @@ -31,7 +31,7 @@ set(DDE_SESSION_PRE_WANTS install(DIRECTORY DESTINATION lib/systemd/user/dde-session-initialized.target.wants/) set(DDE_SESSION_INITIALIZED_WANTS dde-session-initialized.target.wants/dde-desktop.service - dde-session-initialized.target.wants/dde-dock.service + dde-session-initialized.target.wants/dde-shell@DDE.service dde-session-initialized.target.wants/dde-lock.service dde-session-initialized.target.wants/dde-osd.service dde-session-initialized.target.wants/dde-osd.target @@ -42,7 +42,7 @@ install(FILES ${DDE_SESSION_PRE_WANTS} DESTINATION lib/systemd/user/) install(FILES ${DDE_SESSION_INITIALIZED_WANTS} DESTINATION lib/systemd/user/) install_symlink(dde-display.service dde-session-pre.target.wants) install_symlink(dde-desktop.service dde-session-initialized.target.wants) -install_symlink(dde-dock.service dde-session-initialized.target.wants) +install_symlink(dde-shell@DDE.service dde-session-initialized.target.wants) install_symlink(dde-lock.service dde-session-initialized.target.wants) install_symlink(dde-polkit-agent.service dde-session-initialized.target.wants) install_symlink(dde-osd.service dde-session-initialized.target.wants) diff --git a/systemd/dde-session-initialized.target.wants/dde-dock.service b/systemd/dde-session-initialized.target.wants/dde-shell@DDE.service similarity index 91% rename from systemd/dde-session-initialized.target.wants/dde-dock.service rename to systemd/dde-session-initialized.target.wants/dde-shell@DDE.service index 44ad964..eff72a3 100644 --- a/systemd/dde-session-initialized.target.wants/dde-dock.service +++ b/systemd/dde-session-initialized.target.wants/dde-shell@DDE.service @@ -1,5 +1,5 @@ [Unit] -Description=dde-dock service +Description=dde-shell for DDE service RefuseManualStart=no RefuseManualStop=no StartLimitBurst=3 @@ -28,7 +28,7 @@ After=org.dde.session.Daemon1.service [Service] Type=simple -ExecStart=/usr/bin/dde-dock +ExecStart=/usr/bin/dde-shell -C %I TimeoutStartSec=infinity Slice=session.slice Restart=on-failure