From: Sebastian Harl <sh@tokkee.org>
Date: Sun, 17 Jul 2016 17:43:43 +0000 (+0200)
Subject: rules: Fix failure to build twice in a row introduced by dh_autoreconf_clean.
X-Git-Tag: collectd-5.5.1-5~3
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=e38e82fe071d5fe7a3ae4f448a5687c9cfa202b9;p=pkg-collectd.git

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 7aca5e3..8303624 100644
--- 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 84b4800..fca492c 100755
--- 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