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>

8 files changed, 15 insertions, 6 deletions

diff --git a/debian/_base/core/tdebase/debian/rules b/debian/_base/core/tdebase/debian/rules
index ebcb8a186..f7d58351a 100755
--- a/debian/_base/core/tdebase/debian/rules
+++ b/debian/_base/core/tdebase/debian/rules
@@ -74,6 +74,9 @@ DEB_FIXPERMS_EXCLUDE := \
 
 DEB_DH_STRIP_ARGS  := --dbg-package=tdebase-trinity-dbg
 
+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/debian/_base/core/tdebase/debian/tdm-trinity.postrm b/debian/_base/core/tdebase/debian/tdm-trinity.postrm
index f20297bab..478413e3d 100644
--- a/debian/_base/core/tdebase/debian/tdm-trinity.postrm
+++ b/debian/_base/core/tdebase/debian/tdm-trinity.postrm
@@ -38,9 +38,6 @@ if [ "$1" = "purge" ] ; then
         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/debian/_base/core/tdebase/debian/tdm-trinity.prerm b/debian/_base/core/tdebase/debian/tdm-trinity.prerm
index eeecadfc5..34604ee00 100644
--- a/debian/_base/core/tdebase/debian/tdm-trinity.prerm
+++ b/debian/_base/core/tdebase/debian/tdm-trinity.prerm
@@ -178,4 +178,6 @@ if [ "$1" = "remove" -o "$1" = "deconfigure" ]; then
   fi
 fi
 
+#DEBHELPER#
+
 exit 0
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
diff --git a/ubuntu/_base/core/tdebase/debian/rules b/ubuntu/_base/core/tdebase/debian/rules
index df3327542..cbfa1c395 100755
--- a/ubuntu/_base/core/tdebase/debian/rules
+++ b/ubuntu/_base/core/tdebase/debian/rules
@@ -74,6 +74,9 @@ DEB_FIXPERMS_EXCLUDE := \
 
 DEB_DH_STRIP_ARGS  := --dbg-package=tdebase-trinity-dbg
 
+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/ubuntu/_base/core/tdebase/debian/tdm-trinity.prerm b/ubuntu/_base/core/tdebase/debian/tdm-trinity.prerm
index 23de3a247..d51bcd8dc 100644
--- a/ubuntu/_base/core/tdebase/debian/tdm-trinity.prerm
+++ b/ubuntu/_base/core/tdebase/debian/tdm-trinity.prerm
@@ -172,4 +172,6 @@ if [ "$1" = "remove" -o "$1" = "deconfigure" ]; then
   fi
 fi
 
+#DEBHELPER#
+
 exit 0