[SCM] libav/master: Fix issue with file not being multiarch compatible. (Closes: #669988)

[ceros-guest at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 71d59d3c0091b64278afa192760a5cd967558bc3
Author: Andres Mejia <amejia004 at gmail.com>
Date:   Sun Apr 22 11:27:38 2012 -0400

    Fix issue with file not being multiarch compatible. (Closes: #669988)

diff --git a/debian/changelog b/debian/changelog
index 711da2b..6571fa1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+libav (5:0.8.1-5) UNRELEASED; urgency=low
+
+  * Fix issue with file not being multiarch compatible. (Closes: #669988)
+
+ -- Andres Mejia <amejia at debian.org>  Sun, 22 Apr 2012 11:24:46 -0400
+
 libav (5:0.8.1-4) unstable; urgency=low
 
   * Use a Provides field to provide transitional packages instead of Conflicts.
diff --git a/debian/rules b/debian/rules
index f1511ba..440daa0 100755
--- a/debian/rules
+++ b/debian/rules
@@ -136,7 +136,7 @@ install-common: build $(DH_INSTALL_FILES)
 	debian/tmp/usr/bin/avconv -formats | tee formats.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 -plibavformat53 formats.txt
+	dh_installdocs -plibavformat53 formats-$(DEB_HOST_ARCH).txt
 	dh_installdocs -plibavcodec53 codecs.txt
 install-extra: build $(DH_INSTALL_FILES)
 	dh_testdir

-- 
Libav/FFmpeg packaging