rules: Fix failure to build twice in a row introduced by dh_autoreconf_clean.

Drop the separate config.status target and, hence, a dependency on the
configure script.

diff --git a/debian/changelog b/debian/changelog
index 7aca5e36d3bc581c0748a94b82fbddc449da1084..830362408967ed3a8415389a8c2df4deffb0ae57 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,10 @@ collectd (5.5.1-5) UNRELEASED; urgency=medium
     - Disable the sigrok plugin on non-Linux; restrict build dependency to
       linux-any; thanks to Andreas Beckmann for reporting this
       (Closes: #825606).
+  * debian/rules:
+    - Fix failure to build twice in a row introduced by dh_autoreconf_clean;
+      drop the separate config.status target and, hence, a dependency on the
+      configure script.
 
  -- Sebastian Harl <tokkee@debian.org>  Tue, 05 Jul 2016 13:58:29 +0200
 

diff --git a/debian/rules b/debian/rules
index 84b48007256bbe448e4724059d0be61e802ee0f6..fca492c9b3d482e6613583f5a2e8bb38db04eb44 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -161,8 +161,13 @@ ifneq (,$(filter hppa sparc, $(DEB_BUILD_ARCH)))
        confflags += --disable-java
 endif
 
-config.status: configure
+build: build-arch build-indep
+build-arch: build-stamp
+build-indep: build-stamp
+
+build-stamp:
        dh_testdir
+       
        dh_autoreconf
        
        # This is a work-around for #474087 (broken openipmi .pc files).
@@ -177,13 +182,6 @@ config.status: configure
                JAVA_LDFLAGS="$(JAVA_LDFLAGS)" \
                || ( status=$$?; cat config.log; exit $$status )
 
-build: build-arch build-indep
-build-arch: build-stamp
-build-indep: build-stamp
-
-build-stamp: config.status
-       dh_testdir
-       
        $(MAKE)
        perl ./debian/bin/check_plugins.pl