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.
This commit is contained in:
Ondřej Surý 2020-08-06 09:16:40 +02:00
parent a32cd91a25
commit 47ebc83368
3 changed files with 5 additions and 8 deletions

2
debian/compat vendored
View File

@ -1 +1 @@
9
10

5
debian/control vendored
View File

@ -5,12 +5,9 @@ Maintainer: David Lamparter <equinox-debian@diac24.net>
Uploaders: FRRouting-dev <dev@lists.frrouting.org>,
Ondřej Surý <ondrej@debian.org>
Build-Depends:
autotools-dev,
bison,
chrpath,
debhelper (>= 9),
debhelper (>= 9.20160709) <!pkg.frr.nosystemd> | dh-systemd <!pkg.frr.nosystemd>,
dh-autoreconf,
debhelper (>= 9.20150101),
flex,
gawk,
install-info,

6
debian/rules vendored
View File

@ -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); \