[SCM] FFmpeg packaging branch, master, updated. debian/0.5+svn20090420-2-34-gbfadf4f

[Felipe Sateler]

El date: invalid date « Thu, 14 May 2009 22:57:55 +0000\n   Thu May 14 
18:55:20 2009 -0400»
, ceros-guest at users.alioth.debian.org escribió:
> The following commit has been merged in the master branch:
> commit d9d3c6855e891857d4033d6365481917fba32d4d
> Author: Andres Mejia <mcitadel at gmail.com>
> Date:   Thu May 14 18:55:20 2009 -0400
>
>     Only use .svnrevision if it's readable.
>
>     This helps in cases where we want to track and build packages for
> upstream svn/git.
>
> diff --git a/debian/rules b/debian/rules
> index 4a878ea..dfb17e0 100755
> --- a/debian/rules
> +++ b/debian/rules
> @@ -47,7 +47,8 @@ configure-%: configure-stamp-%
>  configure-stamp-%: $(QUILT_STAMPFN) config-extra-includes.h
>  	dh_testdir
>  	mkdir -p debian-$*
> -	cp .svnrevision debian-$*/snapshot_version
> +	[ -r .svnrevision ] && \
> +		echo "SVN-r$$(cat .svnrevision)" > debian-$*/snapshot_version
>  	cd debian-$* && CFLAGS="$(CFLAGS)" $(CURDIR)/configure \
>  		$($*_build_confflags) $(extra_$*_build_confflags)
>  ifeq ($(internalencoders),)

This will fail when .svnrevision is not readable ( [ ] will return nonzero, 
thus make will stop). The correct way to implement this is

[ ! -r .svnrevision ] || echo ....

This is uglier and harder to understand, but works.
Please test before commiting. 


Saludos,
Felipe Sateler
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 835 bytes
Desc: This is a digitally signed message part.
URL: <http://lists.alioth.debian.org/pipermail/pkg-multimedia-maintainers/attachments/20090515/0118d0c3/attachment.pgp>