[SCM] ffmpeg/master: Revert "Avoid needlessly re-running configure"

[jcowgill at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 93b6d7282284b73a5a22465089f6060c43688a94
Author: James Cowgill <jcowgill at debian.org>
Date:   Wed Aug 16 10:55:03 2017 +0100

    Revert "Avoid needlessly re-running configure"
    
    This commit prevents arch-dependent clean from working properly.
    
    This reverts commit 4a2e5d1b769a081e58d475a832bbe879911b04a5.

diff --git a/debian/rules b/debian/rules
index 6698cdb..fa0d8cf 100755
--- a/debian/rules
+++ b/debian/rules
@@ -199,7 +199,6 @@ endif
 override_dh_auto_configure:
 	$(foreach flavor,$(FLAVORS),mkdir -p debian/$(flavor);)
 	$(foreach flavor,$(FLAVORS),set -e; echo " *** $(flavor) ***"; cd debian/$(flavor); ../../configure $(CONFIG) $(CONFIG_$(flavor)) || (cat config.log && exit 1); cd ../.. ;)
-	touch override_dh_auto_configure
 
 # Remove the subdirectories generated for the flavors.
 override_dh_auto_clean:
@@ -210,7 +209,6 @@ override_dh_auto_build-indep:
 	dh_auto_build -i --sourcedirectory=debian/standard -- apidoc
 	# Create the minified CSS files.
 	lessc debian/missing-sources/ffmpeg-web/src/less/style.less | cleancss > debian/standard/doc/style.min.css
-	rm override_dh_auto_configure
 
 override_dh_auto_build-arch:
 	# Copy built object files to avoid building them again for the extra flavor.

-- 
ffmpeg packaging