From 9b68d769f7280452402ea38ebfaf358ed44be20a Mon Sep 17 00:00:00 2001 From: Dan Streetman Date: Sun, 3 Nov 2019 00:27:00 +0100 Subject: debian: Replace custom rule for 'configure' with call to dh_autoreconf MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Having this custom rule to create the «configure» file means that it might end up not being rebuilt if the timestamps of some other files are off compared to the debian/changelog date. Using dh_autoreconf guarantees that even if these timestamps got updated incorrectly, the file will always be rebuilt as expected. The historic rationale for not doing this before, even though this has been considered a best packaging practice, was that because dpkg needs explicit support for new architectures, which is the main reason to get autotools updated to pull in new config.* files, we would get reports so that we could add such support and release a new upstream version. But this has never happened, and it's causing other problems. Closes: #939516 Signed-off-by: Guillem Jover --- debian/changelog | 2 ++ debian/rules | 10 +++------- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/debian/changelog b/debian/changelog index 23a21e719..30aac0626 100644 --- a/debian/changelog +++ b/debian/changelog @@ -68,6 +68,8 @@ dpkg (1.20.0) UNRELEASED; urgency=medium cross-build for musl-based systems. * Packaging: - Remove obsolete Breaks satisfied since oldstable. + - Replace custom rule for 'configure' with call to dh_autoreconf. + Thanks to Dan Streetman . Closes: #939516 * Test suite: - Remove perlcritic Documentation::RequirePodLinksIncludeText suppression. - Clarify cppcheck va_list_usedBeforeStarted suppression. diff --git a/debian/rules b/debian/rules index a542193fc..006d069ce 100755 --- a/debian/rules +++ b/debian/rules @@ -47,15 +47,10 @@ endif D := $(CURDIR)/debian/tmp -# Create configure script if necessary, automake handles rebuilding it. -configure: - dh_testdir - - ./autogen - # Configure the build tree -build-tree/config.status: configure +build-tree/config.status: dh_testdir + dh_autoreconf install -d build-tree cd build-tree && ../configure $(confflags) \ @@ -164,6 +159,7 @@ clean: [ ! -f Makefile ] || $(MAKE) distclean rm -rf build-tree + dh_autoreconf_clean dh_clean -- cgit v1.2.3