d/control: define compat level via build-depends and raise to 12

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>

diff --git a/Makefile b/Makefile
index b9614d349078dbd646e3e1603a31c83309f8a69a..8796ca264b2ead422e415d51271c143a4d2e15cb 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -27,10 +27,12 @@ all: $(DEBS)
 submodule:
        test -f "$(SRCDIR)/debian/changelog" || git submodule update --init
 
+# FIXME: fully merge our and upstream (which is also the upstream for debian's "downstream") packaging
+# so that the top-level debian directory is the canonical source.
 $(BUILDDIR): submodule debian/changelog
        rm -rf $@ $@.tmp
        cp -a $(SRCDIR) $@.tmp
-       rm $@.tmp/debian/changelog
+       rm $@.tmp/debian/changelog $@.tmp/debian/compat
        cp -a debian/* $@.tmp/debian/
        mv $@.tmp $@
 

diff --git a/debian/compat b/debian/compat
deleted file mode 100644 (file)
index 9a03714..0000000
--- a/debian/compat
+++ /dev/null
@@ -1 +0,0 @@
-10
\ No newline at end of file

diff --git a/debian/control b/debian/control
index 6ba0b1a764bf476b6a9345ebed980e798e74a097..778a156fcb2186d2688ee67d54e3c8e0ccf09129 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -5,8 +5,8 @@ Maintainer: David Lamparter <equinox-debian@diac24.net>
 Uploaders: FRRouting-dev <dev@lists.frrouting.org>
 Build-Depends: bison,
                chrpath,
-               debhelper (>= 10~) | dh-systemd,
                debhelper (>= 9.20150101~),
+               debhelper-compat (= 12),
                flex,
                gawk,
                install-info,