[SCM] mplayer packaging branch, master, updated. debian/1.0.rc2+svn20090303-2-22-g932e786

[Reinhard Tartler]

Reinhard Tartler <siretart at tauware.de> writes:

> but AFAIUI the buildds call the clean target always before the build, so
> it is a very good idea to make the rule idempotent.
>
> The current version of the clean rule does not fail if config.mak
> doesn't exist:

That is of course non-sense, I forgot to actually push the following
change. Excuse the confusion.

siretart at users.alioth.debian.org writes:

> The following commit has been merged in the master branch:
> commit 932e786a88a43b37a9b485b0420b591a99f94510
> Author: Reinhard Tartler <siretart at tauware.de>
> Date:   Fri Mar 27 20:49:24 2009 +0100
>
>     run 'make distclean' only of config.mak exists
>     
>     This fixes spurious error messages on the buildds. This change is
>     actually a fix, the former test didn't really work.
>
> diff --git a/debian/rules b/debian/rules
> index aa996c8..78a1440 100755
> --- a/debian/rules
> +++ b/debian/rules
> @@ -181,8 +181,8 @@ clean: clean-real unpatch
>  clean-real:
>  	dh_testdir
>  	dh_testroot
> -	test -r config.mak && $(MAKE) -C DOCS/xml distclean || true
> -	$(MAKE) distclean
> +	[ ! -f config.mak ] || $(MAKE) -C DOCS/xml distclean || true
> +	[ ! -f config.mak ] || $(MAKE) distclean
>  	dh_clean config.h config.mak configure.log
>  	dh_clean build-arch-stamp build-indep-stamp configure-arch-stamp snapshot_version
>  	find -name '*.o' -or -name '*.a' -or -name '*~' \


-- 
Gruesse/greetings,
Reinhard Tartler, KeyID 945348A4