[Git][debian-proftpd-team/proftpd][master] 2 commits: Annotated for template renaming

[Francesco Paolo Lovergine]

Francesco Paolo Lovergine pushed to branch master at Debian ProFTPD Team / proftpd


Commits:
1fc7c9a8 by Francesco Paolo Lovergine at 2021-01-04T10:20:35+01:00
Annotated for template renaming

- - - - -
4138e686 by Francesco Paolo Lovergine at 2021-01-04T11:13:08+01:00
Removed systemctl direct call and using init-systems-helper instead.

- - - - -


5 changed files:

- debian/changelog
- debian/control
- debian/control.in
- debian/proftpd-core.postinst
- debian/proftpd-core.preinst


Changes:

=====================================
debian/changelog
=====================================
@@ -10,6 +10,10 @@ proftpd-dfsg (1.3.7a+dfsg-9) UNRELEASED; urgency=medium
     the d/install file.
   * Now in preinst move past existing logrotate file to the new name.
   * Removed spurious exit in preinst that prevented run of dh section.
+  * Renamed mod_snmp.conf => snmp.conf for uniformity in naming.
+  * Using deb-systemd-invoke instead of systemctl in postinst and
+    added a pre-depends on that basis to pre-dep on a recent version
+    of init-system-helpers. Thanks lintian!
 
  -- Hilmar Preusse <hille42 at web.de>  Sat, 02 Jan 2021 20:30:00 +0100
 


=====================================
debian/control
=====================================
@@ -31,6 +31,7 @@ Vcs-Git: https://salsa.debian.org/debian-proftpd-team/proftpd.git
 
 Package: proftpd-core
 Architecture: any
+Pre-Depends: ${misc:Pre-Depends}
 Depends: adduser,
          debianutils (>= 1.21.0),
          libpam-runtime (>= 0.76-13.1),


=====================================
debian/control.in
=====================================
@@ -31,6 +31,7 @@ Vcs-Git: https://salsa.debian.org/debian-proftpd-team/proftpd.git
 
 Package: proftpd-core
 Architecture: any
+Pre-Depends: ${misc:Pre-Depends}
 Depends: adduser,
          debianutils (>= 1.21.0),
          libpam-runtime (>= 0.76-13.1),


=====================================
debian/proftpd-core.postinst
=====================================
@@ -207,11 +207,8 @@ if [ "$1" = "configure" ]; then
 	# enable and start proftpd daemon via systemctl
 	if egrep -qi "^[[:space:]]*ServerType.*standalone" /etc/proftpd/proftpd.conf
 	then
-		if [ -x /usr/bin/systemctl ]
-		then
-			systemctl enable proftpd.service
-			systemctl restart proftpd.service
-		fi
+		deb-systemd-invoke enable proftpd.service
+		deb-systemd-invoke restart proftpd.service
 	fi
 fi
 


=====================================
debian/proftpd-core.preinst
=====================================
@@ -13,7 +13,7 @@ set -e
 	mv -f /etc/logrotate.d/proftpd-basic /etc/logrotate.d/proftpd-core
 
 if [ "$1" = "upgrade" ]; then
-     invoke-rc.d proftpd stop >/dev/null 2>&1 || true 
+     invoke-rc.d --skip-systemd-native proftpd stop >/dev/null 2>&1 || true 
 fi
 
 #DEBHELPER#



View it on GitLab: https://salsa.debian.org/debian-proftpd-team/proftpd/-/compare/a5656f399d517085d66be3bb3faaa9ed10a70577...4138e6861cb8ae0335056cffb846015ef8763ef2

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