[SCM] FFmpeg packaging branch, master, updated. 7e16ace7ebff2d85563fe4cc3e46bda6d83db3b6

[siretart at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 67aa45c9b2909cad471c93a5eeb51f04d2f86f5b
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Sun Jan 11 22:45:15 2009 +0100

    install formats.txt in the libavcodec52 package to document what formats
    this version of ffmpeg has enabled.

diff --git a/debian/changelog b/debian/changelog
index c83c7b9..155e8b1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,8 +9,10 @@ ffmpeg-debian (3:0.svn20090110-1) experimental; urgency=low
   * removed patch 050_fix_pkgconfig_files.patch. Merged upstream
   * disabled patch 020_visibility_patch. It needs to be adapted to the new
     upstream changes. Hopefully it will get merged into ffmpeg properly.
+  * install formats.txt in the libavcodec52 package to document what
+    formats this version of ffmpeg has enabled.
 
- -- Reinhard Tartler <siretart at tauware.de>  Sat, 10 Jan 2009 16:36:52 +0100
+ -- Reinhard Tartler <siretart at tauware.de>  Sun, 11 Jan 2009 20:55:48 +0100
 
 ffmpeg-debian (3:0.svn20081115-1) experimental; urgency=low
 
diff --git a/debian/rules b/debian/rules
index ccc13e6..ae10c25 100755
--- a/debian/rules
+++ b/debian/rules
@@ -70,6 +70,7 @@ clean-real:
 	    $(addprefix configure-stamp-, $(FLAVORS)) patch-stamp
 	rm -rf $(addprefix debian-, $(FLAVORS)) doxy
 	dh_clean config-extra-includes.h debian/tmp.debhelper.log
+	dh_clean formats.txt
 
 get-orig-source:
 	dh_testdir
@@ -105,18 +106,23 @@ else
 	dh_install --fail-missing --sourcedir=debian/tmp
 endif
 
+formats.txt: install
+	env LD_LIBRARY_PATH=$(CURDIR)/debian/tmp/usr/lib \
+	debian/tmp/usr/bin/ffmpeg -formats > $@
+
 ifneq ($(DEB_SOURCE),ffmpeg-debian)
 binary-indep: install
 else
 binary-indep: build-doxy install
 endif
 
-binary-arch: build install
+binary-arch: build install formats.txt
 	dh_testdir
 	dh_testroot
 	dh_installdocs $(extradoc) doc/optimization.txt
 	dh_installdocs -A MAINTAINERS CREDITS doc/TODO
 	dh_installdocs -A debian/patents.txt debian/README.Debian
+	dh_installdocs -p libavcodec52 formats.txt
 	dh_installexamples -pffmpeg doc/ffserver.conf debian/recordshow.sh
 	dh_installexamples -plibavcodec-dev libavcodec/apiexample.c
 	dh_installchangelogs Changelog

-- 
FFmpeg packaging