[SCM] FFmpeg packaging branch, master.snapshot, updated. debian/0.5+svn20090706-5-16-g4d1c511

[siretart at users.alioth.debian.org]

The following commit has been merged in the master.snapshot branch:
commit b53503bf2f75dd4121e926db501329934a318404
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Mon Jan 25 14:17:22 2010 +0100

    install codecs.txt and formats.txt in correct packages
    
    upstream has split the output of -formats to include information about
    formats only. Additionally information about available codecs can be
    extracted with the parameter -codecs. Therefore introduce a file
    codecs.txt and install that instead of formats.txt into the libavcodec
    package.

diff --git a/debian/clean b/debian/clean
index 0708329..0c9cff8 100644
--- a/debian/clean
+++ b/debian/clean
@@ -1,3 +1,4 @@
 config-extra-includes.h
 EXTRA
+codecs.txt
 formats.txt
diff --git a/debian/rules b/debian/rules
index edddec4..b4cd8b4 100755
--- a/debian/rules
+++ b/debian/rules
@@ -102,16 +102,21 @@ formats.txt: install
 	env LD_LIBRARY_PATH="$(LD_LIBRARY_PATH):$(CURDIR)/debian/tmp/usr/lib" \
 	debian/tmp/usr/bin/ffmpeg -formats | tee $@
 
+codecs.txt: install
+	env LD_LIBRARY_PATH="$(LD_LIBRARY_PATH):$(CURDIR)/debian/tmp/usr/lib" \
+	debian/tmp/usr/bin/ffmpeg -codecs | tee $@
+
 binary-indep: build-doxy install
 
-binary-arch: build install formats.txt
+binary-arch: build install codecs.txt formats.txt
 	dh_testdir
 	dh_testroot
 	dh_installman -pffmpeg debian/qt-faststart.1
 	dh_installdocs $(extradoc) doc/optimization.txt
 	dh_installdocs -A MAINTAINERS CREDITS doc/TODO
 	dh_installdocs -A debian/README.Debian
-	dh_installdocs -p libavcodec52 formats.txt
+	dh_installdocs -p libavcodec52 codecs.txt
+	dh_installdocs -p libavformat52 formats.txt
 	dh_installexamples -pffmpeg doc/ffserver.conf debian/recordshow.sh
 	dh_installexamples -plibavcodec-dev libavcodec/api-example.c
 	dh_installchangelogs Changelog

-- 
FFmpeg packaging