Bump debhelper compat level to 13

This gives us the appropriate RUNSTATEDIR setting of /run, and is still
compatible with backports to Bullseye. Also use the new
debhelper-compat build-dep rather than debian/compat.

diff --git a/debian/compat b/debian/compat
deleted file mode 100644 (file)
index f599e28..0000000
--- a/debian/compat
+++ /dev/null
@@ -1 +0,0 @@
-10

diff --git a/debian/control b/debian/control
index b2c67a7f0d69b52aff2533458f1c8cdd0088ba4c..9491a641ee482292e1f9949c607e7a08f4ad2f08 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: net
 Priority: optional
 Maintainer: Jonathan McDowell <noodles@earth.li>
 Build-Depends: cmake,
-       debhelper (>= 10),
+       debhelper-compat (= 13),
        libcurl4-gnutls-dev | libcurl-dev,
        libdb-dev,
        libsystemd-dev (>= 214) [linux-any] | libsystemd-daemon-dev [linux-any],

diff --git a/debian/rules b/debian/rules
index 4cfee2bbad85f00c781e29423c2b5be08d10d680..44eedb4c7767bcbc71b6ea969b393a91a2002dca 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -9,6 +9,6 @@ CFLAGS += -std=gnu99
 override_dh_installinit:
        dh_installinit --no-start
 
-override_dh_systemd_enable:
-       dh_systemd_enable --no-enable debian/onak.service
-       dh_systemd_enable --no-enable debian/onak.socket
+override_dh_installsystemd:
+       dh_installsystemd --no-enable --no-start onak.service
+       dh_installsystemd --no-enable --no-start onak.socket