chore: Change user unit orders

Bug: https://pms.uniontech.com/bug-view-271617.html
Log:
Signed-off-by: Yutao Meng <[email protected]>

debian/changelog

@@ -1,3 +1,10 @@
+dde-session (1.2.14) UNRELEASED; urgency=medium
+
+  * chore: Remove [email protected]'s dependency on dde-session-daemon (#91)
+  * chore: Change user unit orders
+
+ -- Yutao Meng <[email protected]>  Sat, 12 Oct 2024 15:54:13 +0800
+
 dde-session (1.2.13) unstable; urgency=medium
 
   * chore: 解决修改快捷键配置重启后恢复的问题

systemd/CMakeLists.txt

@@ -22,14 +22,14 @@ 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/[email protected]
     dde-session-pre.target.wants/dde-display.service
 )
 
 # dde-session-initialized.target.wants - TODO: 暂时先放这里，后续应该转移到对应服务
 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/[email protected]
     dde-session-initialized.target.wants/[email protected]
     dde-session-initialized.target.wants/dde-lock.service
     dde-session-initialized.target.wants/dde-osd.service
@@ -39,9 +39,9 @@ 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([email protected] dde-session-pre.target.wants)
 install_symlink(dde-display.service dde-session-pre.target.wants)
 install_symlink(dde-desktop.service dde-session-initialized.target.wants)
+install_symlink([email protected] dde-session-initialized.target.wants)
 install_symlink([email protected] 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)

systemd/dde-session-pre.target.wants/dde-session@x11.service → systemd/dde-session-initialized.target.wants/dde-session@x11.service

@@ -5,9 +5,9 @@ OnFailure=dde-session-shutdown.target
 OnFailureJobMode=replace
 CollectMode=inactive-or-failed
 
-Requisite=dde-session-pre.target
-PartOf=dde-session-pre.target
-Before=dde-session-pre.target
+Requisite=dde-session-initialized.target
+PartOf=dde-session-initialized.target
+Before=dde-session-initialized.target
 
 # Limit startup frequency more than the default
 StartLimitIntervalSec=15s