diff --git a/debian/control b/debian/control index d5b89b8..93ca32e 100644 --- a/debian/control +++ b/debian/control @@ -23,7 +23,7 @@ Architecture: any Depends: jq, sed (>= 4), - startdde (>= 6.0.11), + dde-daemon (>= 6.1.26), systemd, ${misc:Depends}, ${shlibs:Depends}, diff --git a/systemd/CMakeLists.txt b/systemd/CMakeLists.txt index b86015c..cae5987 100644 --- a/systemd/CMakeLists.txt +++ b/systemd/CMakeLists.txt @@ -23,7 +23,6 @@ install(FILES ${SERVICES} DESTINATION lib/systemd/user/) install(DIRECTORY DESTINATION lib/systemd/user/dde-session-pre.target.wants/) set(DDE_SESSION_PRE_WANTS dde-session-pre.target.wants/dde-session@x11.service - dde-session-pre.target.wants/dde-display.service ) # dde-session-initialized.target.wants - TODO: 暂时先放这里,后续应该转移到对应服务 @@ -38,7 +37,6 @@ set(DDE_SESSION_INITIALIZED_WANTS install(FILES ${DDE_SESSION_PRE_WANTS} DESTINATION lib/systemd/user/) install(FILES ${DDE_SESSION_INITIALIZED_WANTS} DESTINATION lib/systemd/user/) install_symlink(dde-session@x11.service dde-session-pre.target.wants) -install_symlink(dde-display.service dde-session-pre.target.wants) install_symlink(dde-shell-plugin@org.deepin.ds.desktop.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) diff --git a/systemd/dde-session-pre.target.wants/dde-display.service b/systemd/dde-session-pre.target.wants/dde-display.service deleted file mode 100644 index 285c34f..0000000 --- a/systemd/dde-session-pre.target.wants/dde-display.service +++ /dev/null @@ -1,24 +0,0 @@ -[Unit] -Description=dde-display service - -Requires=dbus.socket -After=dbus.socket - -Requisite=dde-session-pre.target -PartOf=dde-session-pre.target -Before=dde-session-pre.target - -Before=dde-session@x11.service - -Wants=treeland-xwayland.service -After=treeland-xwayland.service - -[Service] -Type=notify -NotifyAccess=all -ExecCondition=/bin/sh -c 'test "$DISPLAY" != "" || exit 2' -ExecStart=/usr/bin/startdde -TimeoutStartSec=infinity -Slice=session.slice -Restart=on-failure -RestartSec=1s