buildsys: bump d/compat to 12 and adapt d/rules

Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>

diff --git a/debian/compat b/debian/compat
index f599e28b8ab0d8c9c57a486c89c4a5132dcbd3b2..48082f72f087ce7e6fa75b9c41d7387daecd447b 100644 (file)
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-10
+12

diff --git a/debian/control b/debian/control
index cec24e58b9f4b14c94a8aa8aed2b3972147855b8..f3da164282ea3f0edee228f8cfa24d3930a51bd6 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: pmg-api
 Section: perl
 Priority: optional
 Maintainer: Proxmox Support Team <support@proxmox.com>
-Build-Depends: debhelper (>= 10~),
+Build-Depends: debhelper (>= 12~),
                libarchive-perl,
                libarchive-zip-perl,
                libauthen-pam-perl,

diff --git a/debian/install b/debian/install
new file mode 100644 (file)
index 0000000..9be2202
--- /dev/null
+++ b/debian/install
@@ -0,0 +1,13 @@
+debian/pmgbanner.service /lib/systemd/system/
+debian/pmgdaemon.service /lib/systemd/system/
+debian/pmg-daily.service /lib/systemd/system/
+debian/pmg-hourly.service /lib/systemd/system/
+debian/pmgmirror.service /lib/systemd/system/
+debian/pmgnetcommit.service /lib/systemd/system/
+debian/pmgpolicy.service /lib/systemd/system/
+debian/pmgproxy.service /lib/systemd/system/
+debian/pmgreport.service /lib/systemd/system/
+debian/pmg-smtp-filter.service /lib/systemd/system/
+debian/pmgspamreport.service /lib/systemd/system/
+debian/pmgsync.service /lib/systemd/system/
+debian/pmgtunnel.service /lib/systemd/system/

diff --git a/debian/rules b/debian/rules
index 5a2cf7a0b80f365879a1274768f409beb95f2699..6834364d2aa0fb76a543c343cb9df07f1b69e713 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -6,27 +6,27 @@
 %:
        dh $@
 
-override_dh_installinit:
-       dh_systemd_enable --name=pmgdaemon pmgdaemon.service
-       dh_systemd_enable --name=pmgproxy pmgproxy.service
-       dh_systemd_enable --name=pmg-smtp-filter pmg-smtp-filter.service
-       dh_systemd_enable --name=pmgpolicy pmgpolicy.service
-       dh_systemd_enable --name=pmgtunnel pmgtunnel.service
-       dh_systemd_enable --name=pmgmirror pmgmirror.service
-       dh_systemd_enable --name=pmgnetcommit pmgnetcommit.service
-       dh_systemd_enable --name=pmgbanner pmgbanner.service
-       dh_systemd_enable --name=pmg-hourly pmg-hourly.service
-       dh_systemd_enable --name=pmg-daily pmg-daily.service
-       dh_systemd_enable --name=pmgspamreport pmgspamreport.service
-       dh_systemd_enable --name=pmgreport pmgreport.service
-       dh_systemd_enable --name=pmgsync pmgsync.service
-       dh_systemd_enable --no-enable --name=pmg-pbsbackup@ pmg-pbsbackup@.service
-
-override_dh_systemd_start:
-       dh_systemd_start pmg-hourly.timer pmg-daily.timer pmgspamreport.timer pmgreport.timer
-       dh_systemd_start --no-restart-on-upgrade --no-start pmgnetcommit.service pmgbanner.service pmgsync.service
-       dh_systemd_start pmg-smtp-filter.service pmgpolicy.service pmgtunnel.service pmgmirror.service
+override_dh_installsystemd:
+       dh_installsystemd --no-start \
+               pmg-hourly.service \
+               pmg-daily.service \
+               pmgspamreport.service \
+               pmgreport.service \
+               pmgnetcommit.service \
+               pmgbanner.service \
+               pmgsync.service
+       dh_installsystemd \
+               pmg-smtp-filter.service \
+               pmgpolicy.service \
+               pmgtunnel.service \
+               pmgmirror.service \
+               pmg-hourly.timer \
+               pmg-daily.timer \
+               pmgspamreport.timer \
+               pmgreport.timer
+       dh_installsystemd --no-enable --name=pmg-pbsbackup@ pmg-pbsbackup@.service
        # we handle pmgproxy/pmgdaemon manually (use reload instead of restart to keep vnc connection active)
+       dh_installsystemd --no-start --no-stop-on-upgrade pmgdaemon.service pmgproxy.service
 
 override_dh_fixperms:
        dh_fixperms --exclude /var/log/pmgproxy