[SCM] FFmpeg packaging branch, ubuntu.extra, updated. extra/debian/0.6.svn20100505-1ubuntu1

[siretart at users.alioth.debian.org]

The following commit has been merged in the ubuntu.extra branch:
commit 60871b8a797b75dab5005645570a43e47cfff7be
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Wed May 26 08:06:10 2010 +0200

    remove install commands for packages that do not exist in this package flavor

diff --git a/debian/rules b/debian/rules
index 829250c..33925e3 100755
--- a/debian/rules
+++ b/debian/rules
@@ -90,8 +90,6 @@ install: build
 	dh_testdir
 	dh_testroot
 	dh_prep
-	dh_installdirs -ptmp usr/share/doc/ffmpeg/html etc
-	dh_installdirs -ptmp usr/share/doc/ffmpeg-doc/html
 	$(foreach flavor,$(FLAVORS),$(call install_flavor,$(flavor)))
 	install -m 644 -D debian-shared/doc/*.html debian/tmp/usr/share/doc/ffmpeg/html/
 	# don't fail on binary-indep only builds.
@@ -114,14 +112,11 @@ binary-indep: install
 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 libavcodec-extra-52 codecs.txt
 	dh_installdocs -p libavformat-extra-52 formats.txt
-	dh_installexamples -pffmpeg doc/ffserver.conf debian/recordshow.sh
-	dh_installexamples -plibavcodec-dev libavcodec/api-example.c
 	dh_installchangelogs Changelog
 	dh_lintian
 	dh_link

-- 
FFmpeg packaging