[PATCH 17/18] packaging: update to compat level 13

Update for compatibility level 9 to 13 [1].

- remove --fail-missing from dh
- remove --with=systemd from dh
- drop autoreconf dependencies (obsolete since level 10)

[1] https://manpages.debian.org/testing/debhelper/debhelper-compat-upgrade-checklist.7.en.html#v13

Signed-off-by: Zygmunt Krynicki <zygmunt.krynicki@canonical.com>
Gbp-Pq: Name 0018-PATCH-17-18-packaging-update-to-compat-level-13.patch

diff --git a/packaging/debian-sid/compat b/packaging/debian-sid/compat
index ec635144f60048986bc560c5576355344005e6e7..b1bd38b62a0800a4f6a80c34e21c5acffae52c7e 100644 (file)
--- a/packaging/debian-sid/compat
+++ b/packaging/debian-sid/compat
@@ -1 +1 @@
-9
+13

diff --git a/packaging/debian-sid/control b/packaging/debian-sid/control
index cf9fcbece8665cb8d07d52aadf763129c1cf415e..4d0ebc6d42d4b3297fc15743c610d492975a2cb0 100644 (file)
--- a/packaging/debian-sid/control
+++ b/packaging/debian-sid/control
@@ -9,13 +9,11 @@ Uploaders: Steve Langasek <vorlon@debian.org>,
 Build-Depends: autoconf,
                autoconf-archive,
                automake,
-               autotools-dev,
                bash-completion,
                ca-certificates,
                dbus,
-               debhelper (>= 9.20160709),
+               debhelper (>= 13),
                dh-apparmor,
-               dh-autoreconf,
                dh-golang (>=1.7),
                fakeroot,
                gcc-multilib [amd64],
@@ -54,6 +52,7 @@ Build-Depends: autoconf,
                python3-docutils,
                python3-markdown,
                squashfs-tools,
+               systemd-dev,
                tzdata,
                udev,
                xfslibs-dev

diff --git a/packaging/debian-sid/rules b/packaging/debian-sid/rules
index 7fd2255a0a771d71c95d1914e5e2461ea0360a19..016c5b9e1cc21be7d8a0578f51b58c293216fdbd 100755 (executable)
--- a/packaging/debian-sid/rules
+++ b/packaging/debian-sid/rules
@@ -106,7 +106,7 @@ endif
 BUILT_USING=$(shell dpkg-query -f '$${source:Package} (= $${source:Version}), ' -W $(BUILT_USING_PACKAGES))
 
 %:
-       dh $@ --buildsystem=golang --with=golang --fail-missing --with systemd --builddirectory=_build
+       dh $@ --buildsystem=golang --with=golang --builddirectory=_build
 
 override_dh_fixperms:
        dh_fixperms -Xusr/lib/snapd/snap-confine