[Git][debian-proftpd-team/proftpd][master] Clean {post, pre}{inst, rm}, leave job to debhelper.

[Hilmar Preuße]

Hilmar Preuße pushed to branch master at Debian ProFTPD Team / proftpd


Commits:
b65ec120 by Hilmar Preusse at 2020-09-14T23:29:15+02:00
Clean {post,pre}{inst,rm}, leave job to debhelper.

- - - - -


5 changed files:

- debian/changelog
- debian/proftpd-basic.postinst
- debian/proftpd-basic.postrm
- − debian/proftpd-basic.prerm
- debian/rules


Changes:

=====================================
debian/changelog
=====================================
@@ -20,6 +20,7 @@ proftpd-dfsg (1.3.7a-2) UNRELEASED; urgency=medium
   * Add patch from Andreas Trottmann <andreas.trottmann at werft22.com> to
     reintroduce "SQLAUthTypes Backend" with MySQL database
     (Closes: #965077).
+  * Clean {post,pre}{inst,rm}, leave job to debhelper.
   * Disable MultilineRFC2228 per
     https://github.com/proftpd/proftpd/issues/1085 in config template.
   * Enclose "IdentLookups off" in <IfModule mod_ident.c><IfModule> in sample


=====================================
debian/proftpd-basic.postinst
=====================================
@@ -186,12 +186,10 @@ if [ "$1" = "configure" ]; then
 fi
 
 if [ -e "/etc/init.d/proftpd" ]; then
-    update-rc.d proftpd defaults >/dev/null
     set +e 
     proftpd -t >/dev/null 2>&1
     if [ $? = 0 ]; then
 	set -e
-	invoke-rc.d proftpd start || true
     else
 	echo "Cannot start proftpd, please check syntax of your configuration file $CONF"
     fi


=====================================
debian/proftpd-basic.postrm
=====================================
@@ -18,7 +18,6 @@ then
     rm -f /etc/logrotate.d/proftpd-basic
     userdel --remove --force proftpd || true
     userdel ftp || true
-    update-rc.d proftpd remove >/dev/null || exit $?
 fi
 
 #DEBHELPER#


=====================================
debian/proftpd-basic.prerm deleted
=====================================
@@ -1,7 +0,0 @@
-#!/bin/sh
-
-set -e
-
-invoke-rc.d proftpd stop || true
-
-#DEBHELPER#


=====================================
debian/rules
=====================================
@@ -139,7 +139,8 @@ binary-arch: checkroot build install
 	
 	# TODO: cleanup {pre|post}{install|rm} scripts; remove
 	# --no-scripts statement.
-	dh_installinit -a --name=proftpd --no-scripts
+	#dh_installinit -a --name=proftpd --no-scripts
+	dh_installinit -a --name=proftpd
 	# dh_installdebconf -a
 	dh_compress -a
 	dh_fixperms -a



View it on GitLab: https://salsa.debian.org/debian-proftpd-team/proftpd/-/commit/b65ec1207913a1dfae044c25e16613ce020e33a5

-- 
View it on GitLab: https://salsa.debian.org/debian-proftpd-team/proftpd/-/commit/b65ec1207913a1dfae044c25e16613ce020e33a5
You're receiving this email because of your account on salsa.debian.org.