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

[siretart at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 90eaf9de085270e5aaf79a58f7bb8d14c1ef7e0d
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Fri Mar 13 08:47:53 2009 +0100

    beautify identification string

diff --git a/debian/confflags b/debian/confflags
index cce0c7e..325dc09 100644
--- a/debian/confflags
+++ b/debian/confflags
@@ -37,7 +37,7 @@ gpl_confflags += --enable-x11grab
 gpl_confflags += $(call cond_enable,/usr/include/faad.h,libfaad)
 
 # Common configuration flags
-confflags += --extra-version='svn$(SVNREVISION)+$(DEB_VERSION)'
+confflags += --extra-version='$(DEB_VERSION)'
 confflags += --prefix=/usr
 confflags += --enable-avfilter
 confflags += --enable-avfilter-lavf
diff --git a/debian/rules b/debian/rules
index fc25342..576b6b2 100755
--- a/debian/rules
+++ b/debian/rules
@@ -48,6 +48,7 @@ config-extra-includes.h:
 configure-%: configure-stamp-%
 configure-stamp-%: $(QUILT_STAMPFN) config-extra-includes.h
 	dh_testdir
+	cp .svnrevision snapshot_version
 	mkdir -p debian-$*
 	cd debian-$* && CFLAGS="$(CFLAGS)" $(CURDIR)/configure $($*_build_confflags)
 ifeq ($(internalencoders),)
@@ -81,6 +82,7 @@ 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