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

[siretart at users.alioth.debian.org]

The following commit has been merged in the ubuntu.extra branch:
commit 55e302908b4eac9d183d66067bfea1aae618b2c8
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Fri May 28 13:33:49 2010 +0200

    don't try install html files, we don't build ffmpeg-doc in ffmpeg-extra

diff --git a/debian/rules b/debian/rules
index 33925e3..54e62f1 100755
--- a/debian/rules
+++ b/debian/rules
@@ -91,7 +91,6 @@ install: build
 	dh_testroot
 	dh_prep
 	$(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.
 	[ ! -d doxy ] || cp doxy/html/* debian/tmp/usr/share/doc/ffmpeg-doc/html
 	install -m 644 -D doc/ffserver.conf debian/tmp/etc/

-- 
FFmpeg packaging