TDE
/
tde-packaging
mirror of https://mirror.git.trinitydesktop.org/gitea/TDE/tde-packaging
1
0
Fork 0
Code Issues Releases Wiki Activity

DEB tdebase: Systemd unit file tdm.service has been moved to the main tree.

Browse Source 
Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
pull/72/head
Slávek Banko 3 years ago
parent b15c4fb7e0
commit 36b0e78940
No known key found for this signature in database
GPG Key ID: 608F5293A04BE668
8 changed files with 8 additions and 41 deletions
Show Stats Download Patch File Download Diff File

4
debian/_base/core/tdebase/debian/rules vendored
Unescape View File

@ -30,10 +30,12 @@ DEB_CMAKE_EXTRA_FLAGS := \
-DCMAKE_BUILD_TYPE=RelWithDebInfo \
-DCMAKE_SKIP_RPATH="OFF" \
-DBUILD_ALL="ON" \
-DWITH_GCC_VISIBILITY="ON" \
-DBUILD_TDM_SYSTEMD_UNIT_FILE="ON" \
-DSYSTEMDSYSTEMUNITDIR="/lib/systemd/system" \
-DKCHECKPASS_PAM_SERVICE="kcheckpass-trinity" \
-DTDM_PAM_SERVICE="tdm-trinity" \
-DTDESCREENSAVER_PAM_SERVICE="tdescreensaver-trinity" \
-DWITH_GCC_VISIBILITY="ON" \
-DWITH_USBIDS="/usr/share/misc/usb.ids" \
-DWITH_ARTS="ON" \
-DWITH_PAM="ON" \

2
debian/_base/core/tdebase/debian/tdm-trinity.install vendored
Unescape View File

@ -1,5 +1,5 @@
debian/local/tdm.options etc/trinity/tdm/
debian/tdm.service lib/systemd/system/
debian/tmp/lib/systemd/system/tdm.service
debian/tmp/etc/trinity/tdm/tdmrc
debian/tmp/etc/trinity/tdm/Xaccess
debian/tmp/etc/trinity/tdm/Xreset

12
debian/_base/core/tdebase/debian/tdm.service vendored
Unescape View File

@ -1,12 +0,0 @@
[Unit]
Description=Trinity Display Manager
Documentation=man:tdm-trinity(1)
Conflicts=getty@tty7.service plymouth-quit.service
After=systemd-user-sessions.service getty@tty7.service plymouth-quit.service
[Service]
# temporary safety check until all DMs are converted to correct
# display-manager.service symlink handling
ExecStartPre=/bin/sh -c '[ "$(basename $(cat /etc/X11/default-display-manager 2>/dev/null))" = "tdm" ]'
ExecStart=/opt/trinity/bin/tdm
Restart=always

1
dilos/core/tdebase/debian/tdm-trinity.install
Unescape View File

@ -1,5 +1,4 @@
debian/local/tdm.options etc/trinity/tdm/
#debian/tdm.service lib/systemd/system/
debian/tmp/etc/trinity/tdm/tdmrc
debian/tmp/etc/trinity/tdm/Xaccess
debian/tmp/etc/trinity/tdm/Xreset

12
dilos/core/tdebase/debian/tdm.service.2
Unescape View File

@ -1,12 +0,0 @@
[Unit]
Description=Trinity Display Manager
Documentation=man:tdm-trinity(1)
Conflicts=getty@tty7.service plymouth-quit.service
After=systemd-user-sessions.service getty@tty7.service plymouth-quit.service
[Service]
# temporary safety check until all DMs are converted to correct
# display-manager.service symlink handling
ExecStartPre=/bin/sh -c '[ "$(basename $(cat /etc/X11/default-display-manager 2>/dev/null))" = "tdm" ]'
ExecStart=/opt/trinity/bin/tdm
Restart=always

4
ubuntu/_base/core/tdebase/debian/rules
Unescape View File

@ -30,10 +30,12 @@ DEB_CMAKE_EXTRA_FLAGS := \
-DCMAKE_BUILD_TYPE=RelWithDebInfo \
-DCMAKE_SKIP_RPATH="OFF" \
-DBUILD_ALL="ON" \
-DWITH_GCC_VISIBILITY="ON" \
-DBUILD_TDM_SYSTEMD_UNIT_FILE="ON" \
-DSYSTEMDSYSTEMUNITDIR="/lib/systemd/system" \
-DKCHECKPASS_PAM_SERVICE="kcheckpass-trinity" \
-DTDM_PAM_SERVICE="tdm-trinity" \
-DTDESCREENSAVER_PAM_SERVICE="tdescreensaver-trinity" \
-DWITH_GCC_VISIBILITY="ON" \
-DWITH_USBIDS="/usr/share/misc/usb.ids" \
-DWITH_ARTS="ON" \
-DWITH_PAM="ON" \

2
ubuntu/_base/core/tdebase/debian/tdm-trinity.install
Unescape View File

@ -1,5 +1,5 @@
debian/local/tdm.options etc/trinity/tdm/
debian/tdm.service lib/systemd/system/
debian/tmp/lib/systemd/system/tdm.service
debian/tmp/etc/trinity/tdm/tdmrc
debian/tmp/etc/trinity/tdm/Xaccess
debian/tmp/etc/trinity/tdm/Xreset

12
ubuntu/_base/core/tdebase/debian/tdm.service
Unescape View File

@ -1,12 +0,0 @@
[Unit]
Description=Trinity Display Manager
Documentation=man:tdm-trinity(1)
Conflicts=getty@tty7.service plymouth-quit.service
After=systemd-user-sessions.service getty@tty7.service plymouth-quit.service
[Service]
# temporary safety check until all DMs are converted to correct
# display-manager.service symlink handling
ExecStartPre=/bin/sh -c '[ "$(basename $(cat /etc/X11/default-display-manager 2>/dev/null))" = "tdm" ]'
ExecStart=/opt/trinity/bin/tdm
Restart=always
Write Preview
Loading…
Cancel
Save