[SCM] libav/master: Avoid the use of pipes to not cover segfaulting libavcodecs (cf. #726733)

[siretart at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 1a9ebc2c94f63d25f82708d5d9438793dbb18030
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Sat Feb 22 14:14:22 2014 +0000

    Avoid the use of pipes to not cover segfaulting libavcodecs (cf. #726733)

diff --git a/debian/rules b/debian/rules
index 9e5face..1b8b15c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -134,11 +134,11 @@ install-common: build $(DH_INSTALL_FILES)
 	dh_install $(addprefix -N,$(LIB_EXTRA_PKGS)) \
 		 --fail-missing --sourcedir=debian/tmp
 	env LD_LIBRARY_PATH="$(LD_LIBRARY_PATH):$(CURDIR)/debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)" \
-	debian/tmp/usr/bin/avconv -formats | tee formats-$(DEB_HOST_ARCH).txt
+	debian/tmp/usr/bin/avconv -formats > debian/libavformat54/usr/share/doc/libavformat54/formats-$(DEB_HOST_ARCH).txt
+	cat debian/libavformat54/usr/share/doc/libavformat54/formats-$(DEB_HOST_ARCH).txt
 	env LD_LIBRARY_PATH="$(LD_LIBRARY_PATH):$(CURDIR)/debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)" \
-	debian/tmp/usr/bin/avconv -codecs | tee codecs.txt
-	dh_installdocs -plibavformat54 formats-$(DEB_HOST_ARCH).txt
-	dh_installdocs -plibavcodec54 codecs.txt
+	debian/tmp/usr/bin/avconv -codecs > debian/libavcodec54/usr/share/doc/libavcodec54/codecs-$(DEB_HOST_ARCH).txt
+	cat debian/libavcodec54/usr/share/doc/libavcodec54/codecs-$(DEB_HOST_ARCH).txt
 install-extra: build $(DH_INSTALL_FILES)
 	dh_testdir
 	dh_testroot
@@ -146,8 +146,8 @@ install-extra: build $(DH_INSTALL_FILES)
 	dh_install $(addprefix -p,$(LIB_EXTRA_PKGS)) --fail-missing \
 		--sourcedir=debian/tmp/extra
 	env LD_LIBRARY_PATH="$(LD_LIBRARY_PATH):$(CURDIR)/debian/tmp/extra/usr/lib/$(DEB_HOST_MULTIARCH)" \
-	debian/tmp/usr/bin/avconv -codecs | tee codecs.txt
-	dh_installdocs -plibavcodec-extra-54 codecs.txt
+	debian/tmp/usr/bin/avconv -codecs > debian/libavcodec-extra-54/usr/share/doc/libavcodec-extra-54/codecs-$(DEB_HOST_ARCH).txt
+	cat debian/libavcodec-extra-54/usr/share/doc/libavcodec-extra-54/codecs-$(DEB_HOST_ARCH).txt
 ifeq ($(DEB_SOURCE), libav)
 	dh_installdocs -a doc/APIchanges
 	install -m 644 -D debian-shared/doc/*.html doc/t2h.init debian/libav-tools/usr/share/doc/libav-tools

-- 
Libav/FFmpeg packaging