summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--debian/changelog2
-rwxr-xr-xdebian/rules10
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 <ddstreet@canonical.com>. 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