From 47ebc8336839ef098b7b93a40056b775a101bd6a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20Sur=C3=BD?= Date: Thu, 6 Aug 2020 09:16:40 +0200 Subject: [PATCH] Convert the package to dh compat level 10 There are couple of related changes: * Bump the debhelper dependency to the version at least in Debian Jessie * Drop the dh-autoreconf, autotools-dev dependency, this is automatically included. * Drop the --parallel, --with=systemd and --with=autoreconf, this is automatically enabled in dh compat level 10, add a --without=systemd when requested via build profile. --- debian/compat | 2 +- debian/control | 5 +---- debian/rules | 6 +++--- 3 files changed, 5 insertions(+), 8 deletions(-) diff --git a/debian/compat b/debian/compat index ec635144f6..f599e28b8a 100644 --- a/debian/compat +++ b/debian/compat @@ -1 +1 @@ -9 +10 diff --git a/debian/control b/debian/control index cd6a13812f..2e2825cfa9 100644 --- a/debian/control +++ b/debian/control @@ -5,12 +5,9 @@ Maintainer: David Lamparter Uploaders: FRRouting-dev , Ondřej Surý Build-Depends: - autotools-dev, bison, chrpath, - debhelper (>= 9), - debhelper (>= 9.20160709) | dh-systemd , - dh-autoreconf, + debhelper (>= 9.20150101), flex, gawk, install-info, diff --git a/debian/rules b/debian/rules index c8550ecb52..6cc03c378a 100755 --- a/debian/rules +++ b/debian/rules @@ -22,17 +22,17 @@ else endif ifeq ($(filter pkg.frr.nosystemd,$(DEB_BUILD_PROFILES)),) - DH_WITH_SYSTEMD=systemd, + DH_WITHOUT_SYSTEMD= CONF_SYSTEMD=--enable-systemd=yes else - DH_WITH_SYSTEMD= + DH_WITHOUT_SYSTEMD=--without=systemd CONF_SYSTEMD=--enable-systemd=no endif export PYTHON=python3 %: - dh $@ --with=$(DH_WITH_SYSTEMD)autoreconf --parallel + dh $@ $(DH_WITHOUT_SYSTEMD) override_dh_auto_configure: $(shell dpkg-buildflags --export=sh); \