[Pkg-nagios-changes] [pkg-nrpe] 31/41: Use dh-autoreconf instead of autotools-dev.

[Bas Couwenberg]

This is an automated email from the git hooks/post-receive script.

sebastic pushed a commit to branch master
in repository pkg-nrpe.

commit c9d195c7e78c5b84ae18f63cfb2854cdf102f367
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Sun Dec 4 17:02:27 2016 +0100

    Use dh-autoreconf instead of autotools-dev.
---
 debian/changelog                          |  1 +
 debian/control                            |  2 +-
 debian/patches/11_reproducible_dh.h.patch | 11 -----------
 debian/rules                              |  4 +++-
 4 files changed, 5 insertions(+), 13 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 60255b7..f290a3c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -35,6 +35,7 @@ nagios-nrpe (3.0.1-1) UNRELEASED; urgency=medium
   * Drop 09_noremove_pid.patch, fixed upstream. Refresh remaining patches.
   * Add patch to use pre-generated dh.h for reproducible builds.
   * Override dh_auto_build to build all targets.
+  * Use dh-autoreconf instead of autotools-dev.
 
   [ Benjamin Drung ]
   * Use dh_auto_configure to enable default hardening flags.
diff --git a/debian/control b/debian/control
index e73ccd1..e5fe2ec 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Maintainer: Debian Nagios Maintainer Group <pkg-nagios-devel at lists.alioth.debian
 Section: net
 Priority: optional
 Build-Depends: debhelper (>= 9),
-               autotools-dev,
+               dh-autoreconf,
                libssl1.0-dev,
                libwrap0-dev,
                openssl
diff --git a/debian/patches/11_reproducible_dh.h.patch b/debian/patches/11_reproducible_dh.h.patch
index 293a763..6faa005 100644
--- a/debian/patches/11_reproducible_dh.h.patch
+++ b/debian/patches/11_reproducible_dh.h.patch
@@ -58,14 +58,3 @@ Forwarded: not-needed
  	AC_NAGIOS_GET_SSL
  fi
  
---- a/configure
-+++ b/configure
-@@ -7266,7 +7266,7 @@ fi
- 
- if test x$check_for_ssl = xyes; then
- 	# need_dh should only be set for NRPE
--	need_dh=yes
-+	need_dh=no
- 
- 
- # -------------------------------
diff --git a/debian/rules b/debian/rules
index b7a1209..e827a99 100755
--- a/debian/rules
+++ b/debian/rules
@@ -8,8 +8,10 @@ export DEB_BUILD_MAINT_OPTIONS=hardening=+all
 
 CFLAGS += $(CPPFLAGS)
 
+export AUTOHEADER=true
+
 %:
-	    dh $@ --with autotools_dev --parallel
+	    dh $@ --with autoreconf --parallel
 
 override_dh_auto_configure:
 	# Save deterministic "openssl dhparam" output.

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-nagios/pkg-nrpe.git