From a7a49baf5b06bb7871dd302d7a5f134ed87d8638 Mon Sep 17 00:00:00 2001 From: Mark Wooding Date: Sun, 29 Sep 2019 15:50:36 +0100 Subject: [PATCH] debian/: Bump to Debhelper 10. --- debian/compat | 2 +- debian/control | 2 +- debian/rules | 5 ++++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/debian/compat b/debian/compat index ec63514..f599e28 100644 --- a/debian/compat +++ b/debian/compat @@ -1 +1 @@ -9 +10 diff --git a/debian/control b/debian/control index 14d26a7..54a8976 100644 --- a/debian/control +++ b/debian/control @@ -2,7 +2,7 @@ Source: mlib Section: libs Priority: extra Maintainer: Mark Wooding -Build-Depends: debhelper (>= 9), python, libadns1-dev +Build-Depends: debhelper (>= 10), python, libadns1-dev Standards-Version: 3.1.1 Package: mlib2 diff --git a/debian/rules b/debian/rules index bbbc852..4bd7c2c 100755 --- a/debian/rules +++ b/debian/rules @@ -31,7 +31,7 @@ DH_BUILD_OVERRIDES = configure clean build install test ## How to perform build action for a particular library flavour. define flavour-build-action dh_auto_$1 -Bdebian/build-$2 \ - $(DH_OPTIONS) $(DH_OPTIONS_$2) \ + $(addprefix -O, $(DH_OPTIONS)) $(DH_OPTIONS_$2) \ $(DH_$1_OPTIONS) $(DH_$1_OPTIONS_$2) endef @@ -58,6 +58,9 @@ DH_install_OPTIONS_adns = --destdir=debian/tmp-adns ###-------------------------------------------------------------------------- ### Additional tweaks. +## Don't try to rebuild our configure script. +DH_OPTIONS += --without=autoreconf + ## Some of the install lists need to be generated. This is a little ## annoying. GEN_INSTALL_PKGS = mlib2-adns -- 2.11.0