debian/: Bump to Debhelper 10.

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 14d26a76cbb538b2b197d214700543cc42414620..54a897686ed0e97a4c124147d112a1d90874bcaf 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: mlib
 Section: libs
 Priority: extra
 Maintainer: Mark Wooding <mdw@distorted.org.uk>
 Section: libs
 Priority: extra
 Maintainer: Mark Wooding <mdw@distorted.org.uk>

-Build-Depends: debhelper (>= 9), python, libadns1-dev
+Build-Depends: debhelper (>= 10), python, libadns1-dev

 Standards-Version: 3.1.1
 
 Package: mlib2
 Standards-Version: 3.1.1
 
 Package: mlib2

diff --git a/debian/rules b/debian/rules
index bbbc852adf1c6c8fb0e7cf85fc343c3f9ec37638..4bd7c2c1d62f9bae455fa007bd18088691ac88ad 100755 (executable)
--- 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 \
 ## 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
        $(DH_$1_OPTIONS) $(DH_$1_OPTIONS_$2)
 
 endef


@@ -58,6 +58,9 @@ DH_install_OPTIONS_adns = --destdir=debian/tmp-adns
 ###--------------------------------------------------------------------------
 ### Additional tweaks.
 
 ###--------------------------------------------------------------------------
 ### 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
 ## Some of the install lists need to be generated.  This is a little
 ## annoying.
 GEN_INSTALL_PKGS = mlib2-adns