summaryrefslogtreecommitdiffstats
path: root/dilos
diff options
context:
space:
mode:
authorSlávek Banko <slavek.banko@axis.cz>2023-11-27 12:15:04 +0100
committerSlávek Banko <slavek.banko@axis.cz>2023-11-27 12:22:55 +0100
commit55fbcd419d4291d8234ec10577436c5c30dbff61 (patch)
tree0c26ffd217f11d591728f67aafc301048fcd73f3 /dilos
parent80ece3509cb91ebac8702d11bfd717c2e3637845 (diff)
downloadtde-packaging-55fbcd419d4291d8234ec10577436c5c30dbff61.tar.gz
tde-packaging-55fbcd419d4291d8234ec10577436c5c30dbff61.zip
DEB tdebase: Prevent unwanted restarting TDM service during upgrade.
This made it possible to add #DEBHELPER# back to TDM prerm script. This resolves issue TDE/tdebase#409. Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
Diffstat (limited to 'dilos')
-rwxr-xr-xdilos/core/tdebase/debian/rules3
-rw-r--r--dilos/core/tdebase/debian/tdm-trinity.postrm3
-rw-r--r--dilos/core/tdebase/debian/tdm-trinity.prerm2
3 files changed, 5 insertions, 3 deletions
diff --git a/dilos/core/tdebase/debian/rules b/dilos/core/tdebase/debian/rules
index ebe24bc5c..be14bbeab 100755
--- a/dilos/core/tdebase/debian/rules
+++ b/dilos/core/tdebase/debian/rules
@@ -91,6 +91,9 @@ DEB_DH_STRIP_ARGS := --dbg-package=tdebase-trinity-dbg \
-Xtdm -Xtdm_config -Xtdm_greet -Xtdmctl -Xtwin -Xtwin_killer_helper \
-Xtwin_resumer_helper -Xtwin_rules_dialog
+DEB_DH_INSTALLINIT_ARGS := --no-start --no-stop-on-upgrade --no-restart-after-upgrade
+DEB_DH_SYSTEMD_START_ARGS := --no-start --no-stop-on-upgrade --no-restart-after-upgrade
+
DOC_HTML_PRUNE := ksplashml kcontrol khelpcenter tdesu knetattach tdeioslave kxkb tdedebugdialog kdcop
PACKAGES_WITH_LIBS := kate-trinity kcontrol-trinity tdebase-trinity-bin kicker-trinity konqueror-trinity ksplash-trinity \
diff --git a/dilos/core/tdebase/debian/tdm-trinity.postrm b/dilos/core/tdebase/debian/tdm-trinity.postrm
index 2454461f4..881d73298 100644
--- a/dilos/core/tdebase/debian/tdm-trinity.postrm
+++ b/dilos/core/tdebase/debian/tdm-trinity.postrm
@@ -42,9 +42,6 @@ fi
# update-rc.d tdm remove >/dev/null || true
# fi
#fi
-#if [ -d /run/systemd/system ] ; then
-# systemctl --system daemon-reload >/dev/null || true
-#fi
#DEBHELPER#
diff --git a/dilos/core/tdebase/debian/tdm-trinity.prerm b/dilos/core/tdebase/debian/tdm-trinity.prerm
index 0c1ee9e5d..a5c530e08 100644
--- a/dilos/core/tdebase/debian/tdm-trinity.prerm
+++ b/dilos/core/tdebase/debian/tdm-trinity.prerm
@@ -184,4 +184,6 @@ if [ "$1" = "remove" -o "$1" = "deconfigure" ]; then
fi
fi
+#DEBHELPER#
+
exit 0