[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 ae7d302528f11427616679b819f06c8d1aeaafcb
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Fri May 28 15:09:29 2010 +0200

    remove all install rules that are related to non-library packages

diff --git a/debian/changelog b/debian/changelog
index f8b4e60..3cc1a4d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+ffmpeg-extra (4:0.6~svn20100505-1ubuntu3) maverick; urgency=low
+
+  * remove all install rules that are related to non-library packages
+    Fixes FTBFS
+
+ -- Reinhard Tartler <siretart at tauware.de>  Fri, 28 May 2010 15:09:06 +0200
+
 ffmpeg-extra (4:0.6~svn20100505-1ubuntu2) maverick; urgency=low
 
   * don't try install html files, we don't build ffmpeg-doc in ffmpeg-extra
diff --git a/debian/rules b/debian/rules
index 54e62f1..86bf5e4 100755
--- a/debian/rules
+++ b/debian/rules
@@ -91,12 +91,6 @@ install: build
 	dh_testroot
 	dh_prep
 	$(foreach flavor,$(FLAVORS),$(call install_flavor,$(flavor)))
-	# 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/
-	install -m 644 -D debian-shared/tools/qt-faststart debian/tmp/usr/bin/qt-faststart
-	dh_install -Xusr/share/doc/ffmpeg-doc -Xusr/share/doc/ffmpeg \
-		--list-missing --sourcedir=debian/tmp
 
 formats.txt: install
 	env LD_LIBRARY_PATH="$(LD_LIBRARY_PATH):$(CURDIR)/debian/tmp/usr/lib" \

-- 
FFmpeg packaging