From 411eb18222eed6e4f31d66f4c1105aca625bd72c Mon Sep 17 00:00:00 2001 From: Thomas Lamprecht Date: Tue, 6 Jun 2023 09:55:01 +0200 Subject: [PATCH] d/control: define compat level via build-depends and raise to 12 Signed-off-by: Thomas Lamprecht --- Makefile | 4 +++- debian/compat | 1 - debian/control | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) delete mode 100644 debian/compat diff --git a/Makefile b/Makefile index b9614d3..8796ca2 100644 --- 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 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 6ba0b1a..778a156 100644 --- a/debian/control +++ b/debian/control @@ -5,8 +5,8 @@ Maintainer: David Lamparter Uploaders: FRRouting-dev Build-Depends: bison, chrpath, - debhelper (>= 10~) | dh-systemd, debhelper (>= 9.20150101~), + debhelper-compat (= 12), flex, gawk, install-info,