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.

diff --git a/debian/compat b/debian/compat
index ec635144f60048986bc560c5576355344005e6e7..f599e28b8ab0d8c9c57a486c89c4a5132dcbd3b2 100644 (file)
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-9
+10

diff --git a/debian/control b/debian/control
index cd6a13812fd26e631e60f76f0de248e1e009c822..2e2825cfa903174a9a187ef29d60f4e34455862d 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -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,

diff --git a/debian/rules b/debian/rules
index c8550ecb520563c3342dc51cbdc2c8298eb42cb9..6cc03c378ac4ae0b90c75e4b3a9ba2089d9ef0cf 100755 (executable)
--- 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); \