[apr] 03/06: Switch to debhelper compat level 11 and use dh_autoreconf

[Stefan Fritsch]

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

sf pushed a commit to branch master
in repository apr.

commit 1fdbbe353d6bdb6d4ececca647ead93d9ee16192
Author: Stefan Fritsch <sf at sfritsch.de>
Date:   Sun Feb 25 16:28:42 2018 +0100

    Switch to debhelper compat level 11 and use dh_autoreconf
---
 debian/changelog |  1 +
 debian/compat    |  2 +-
 debian/control   |  2 +-
 debian/rules     | 11 ++++-------
 4 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 95616e5..f3579ce 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ apr (1.6.3-2) UNRELEASED; urgency=medium
     patch. Closes: #888593
   * Drop deprecated autotools-dev sequence. Thanks to Niels Thykier for the
     patch.
+  * Switch to debhelper compat level 11 and use dh_autoreconf.
 
  -- Stefan Fritsch <sf at debian.org>  Sun, 25 Feb 2018 16:01:56 +0100
 
diff --git a/debian/compat b/debian/compat
index ec63514..b4de394 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-9
+11
diff --git a/debian/control b/debian/control
index e4038fb..40c84c6 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: libs
 Priority: optional
 Maintainer: Debian Apache Maintainers <debian-apache at lists.debian.org>
 Uploaders: Stefan Fritsch <sf at debian.org>
-Build-Depends: debhelper (>= 9), autoconf, mawk, uuid-dev, doxygen, netbase, net-tools, libtool (>= 2), python:any, libsctp-dev [linux-any]
+Build-Depends: debhelper (>= 11), autoconf, mawk, uuid-dev, doxygen, netbase, net-tools, libtool (>= 2), python:any, libsctp-dev [linux-any]
 Standards-Version: 3.9.8
 Vcs-Browser: https://anonscm.debian.org/cgit/pkg-apache/apr.git
 Vcs-Git: git://anonscm.debian.org/pkg-apache/apr.git
diff --git a/debian/rules b/debian/rules
index 2f58066..8ecec7b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -17,9 +17,9 @@ DEB_HOST_MULTIARCH  ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
 # The build target must not be empty.  Sadly because of how make
 # works, we have do duplicate the target in this case.
 build:
-	dh $@ -B$(BUILDDIR) --parallel
+	dh $@ -B$(BUILDDIR)
 %:
-	dh $@ -B$(BUILDDIR) --parallel
+	dh $@ -B$(BUILDDIR)
 
 #
 # configure
@@ -73,13 +73,11 @@ ifneq ($(DEB_HOST_GNU_TYPE),$(DEB_BUILD_GNU_TYPE))
   endif
 endif
 
-# files that are modified by buildconf and need to be restored during clean
-SAVE_FILES := configure build/libtool.m4 build/ltmain.sh
+override_dh_autoreconf:
+	LC_ALL=C dh_autoreconf ./buildconf
 
 override_dh_auto_configure:
 	mkdir -p $(BUILDDIR)/docs
-	for f in $(SAVE_FILES) ; do [ -e $$f.dr-orig ] || cp -p $$f $$f.dr-orig ; done
-	LC_ALL=C ./buildconf
 	# We need to force the use of bash here. Otherwise, if apr is built with
 	# /bin/sh -> /bin/bash, the resulting libtool will not work on systems
 	# where /bin/sh -> /bin/dash.
@@ -158,4 +156,3 @@ override_dh_makeshlibs:
 override_dh_auto_clean:
 	dh_auto_clean
 	rm -rf $(BUILDDIR)
-	for f in $(SAVE_FILES) ; do [ ! -e $$f.dr-orig ] || mv $$f.dr-orig $$f ; done

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