[SCM] mplayer/master.experimental: Fix dh_auto_clean not triggering post-build.

micove-guest at users.alioth.debian.org micove-guest at users.alioth.debian.org
Tue Dec 2 21:14:13 UTC 2014


The following commit has been merged in the master.experimental branch:
commit a67bdbbc814619c11c035958761c58d04c042161
Author: Miguel A. Colón Vélez <debian.micove at gmail.com>
Date:   Tue Dec 2 16:03:23 2014 -0500

    Fix dh_auto_clean not triggering post-build.
    
    Using
    dpkg-buildpackage  -tc
    or
    dpkg-buildpackage
    fakeroot debian/rules clean
    .
    results in the post-build clean not calling dh_auto_clean and just calling
    dh_clean.
    .
    Also if configures exits with an error before config.mak is created
    then clean config.h and config.log.

diff --git a/debian/clean b/debian/clean
index 10791a6..69f81e1 100644
--- a/debian/clean
+++ b/debian/clean
@@ -1,3 +1,5 @@
+config.h
+config.log
 ffmpeg/.config
 ffmpeg/config.asm
 ffmpeg/config.h
diff --git a/debian/rules b/debian/rules
index 8724eb7..fa7d2f2 100755
--- a/debian/rules
+++ b/debian/rules
@@ -76,7 +76,7 @@ override_dh_auto_build-indep:
 	[ -f DOCS/HTML/en/index.html ] || dh_auto_build -- html-chunked
 
 override_dh_auto_clean:
-	dh_auto_clean || true
+	[ -f config.mak ] && $(MAKE) distclean || true
 
 override_dh_auto_configure:
 	./configure $(CONFIGURE_FLAGS) --enable-gui

-- 
mplayer packaging



More information about the pkg-multimedia-commits mailing list