[SCM] ffmpeg/master: don't try to install non-existing documentation, fixes FTBFS on powerpc

siretart at users.alioth.debian.org siretart at users.alioth.debian.org
Fri Apr 22 09:42:46 UTC 2011


The following commit has been merged in the master branch:
commit 80928e504c477550dd40171cd7417092f813d876
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Fri Apr 22 11:16:23 2011 +0200

    don't try to install non-existing documentation, fixes FTBFS on powerpc

diff --git a/debian/confflags b/debian/confflags
index f3df6fb..0782428 100644
--- a/debian/confflags
+++ b/debian/confflags
@@ -225,9 +225,3 @@ vis_build_confflags += --disable-static
 vis_build_confflags += --extra-cflags="-fPIC -DPIC"
 vis_build_confflags += --disable-ffmpeg
 vis_build_confflags += --disable-ffplay
-
-# Additional documentation for PowerPC
-ifneq (,$(findstring powerpc,$(DEB_BUILD_GNU_TYPE)))
-  extradoc := doc/ffmpeg_powerpc_performance_evaluation_howto.txt
-endif
-
diff --git a/debian/rules b/debian/rules
index 41d3b23..2e70f17 100755
--- a/debian/rules
+++ b/debian/rules
@@ -115,7 +115,7 @@ 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 doc/optimization.txt
 	dh_installdocs -A CREDITS doc/TODO
 	dh_installdocs -A debian/README.Debian
 	dh_installdocs -p libavcodec52 codecs.txt

-- 
Libav/FFmpeg packaging



More information about the pkg-multimedia-commits mailing list