From: Mark Wooding Date: Fri, 8 May 2020 12:43:59 +0000 (+0100) Subject: Merge branch '2.4.x' X-Git-Tag: 2.5.0~5 X-Git-Url: https://git.distorted.org.uk/~mdw/mLib/commitdiff_plain/776d2da28318443431563b68c2807eb0c29c49fa?hp=198fea9544562ac8268aa691b40e5e0e90eed492 Merge branch '2.4.x' * 2.4.x: Release 2.4.2. sel/bres-adns.c: Fix incorrect array bound. --- diff --git a/debian/changelog b/debian/changelog index 6631a8e..a77485e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +mlib (2.4.99~) experimental; urgency=medium + + * (placeholder for next minor release) + + -- Mark Wooding Wed, 02 Oct 2019 00:43:11 +0100 + mlib (2.4.2) experimental; urgency=medium * mlib (buf): Handle 64-bit length prefixes correctly on 32-bit 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