[SCM] FFmpeg packaging branch, master, updated. debian/0.svn20090303-1-28-geb4e01e

[siretart at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit f7c8ca3b4ae2c738c3a50d3dd24dc4bb480bab83
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Sat May 2 08:53:26 2009 +0200

    fix ffmpeg version identification string
    
    by creating snapshot_version in the build directories instead of the top
    source directory, the makefile will create a more sensible version.h file.
    
    Compare:
    
    FFmpeg version git-1d37261-4:0.5+svn20090420-1, Copyright (c) 2000-2009 Fabrice Bellard, et al.
    
    to
    
    FFmpeg version SVN-r18630-4:0.5+svn20090420-1, Copyright (c) 2000-2009 Fabrice Bellard, et al.

diff --git a/debian/rules b/debian/rules
index 74704c3..606078a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -52,8 +52,8 @@ config-extra-includes.h:
 configure-%: configure-stamp-%
 configure-stamp-%: $(QUILT_STAMPFN) config-extra-includes.h
 	dh_testdir
-	cp .svnrevision snapshot_version
 	mkdir -p debian-$*
+	cp .svnrevision debian-$*/snapshot_version
 	cd debian-$* && CFLAGS="$(CFLAGS)" $(CURDIR)/configure $($*_build_confflags)
 ifeq ($(internalencoders),)
 	echo "#include \"config-extra-includes.h\"" >> debian-$*/config.h
@@ -86,7 +86,6 @@ clean-real:
 	rm -f build-stamp $(addprefix build-stamp-, $(FLAVORS)) \
 	    $(addprefix configure-stamp-, $(FLAVORS)) patch-stamp
 	rm -rf $(addprefix debian-, $(FLAVORS)) doxy
-	dh_clean snapshot_version
 	dh_clean config-extra-includes.h debian/tmp.debhelper.log
 	dh_clean formats.txt
 

-- 
FFmpeg packaging