[SCM] libav/master: Fix file conflicts between ffmpeg and libav-tools package.

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

The following commit has been merged in the master branch:
commit 6d0c1862ec8d6d9a966713f5572de032b2610ce9
Author: Andres Mejia <amejia004 at gmail.com>
Date:   Thu Mar 29 10:52:34 2012 -0400

    Fix file conflicts between ffmpeg and libav-tools package.

diff --git a/debian/rules b/debian/rules
index b955a6c..f1511ba 100755
--- a/debian/rules
+++ b/debian/rules
@@ -125,8 +125,8 @@ install-common: build $(DH_INSTALL_FILES)
 	install -m 644 -D debian-shared/doc/*.html debian/tmp/usr/share/doc/libav/html/
 	install -m 644 -D doc/avserver.conf debian/tmp/etc/
 	install -m 644 -D debian-shared/tools/qt-faststart debian/tmp/usr/bin/qt-faststart
-	dh_install $(addprefix -N,$(LIB_EXTRA_PKGS)) -Nffmpeg -Xusr/bin/ffmpeg \
-		-Xusr/share/man/man1/ffmpeg.1 -Xusr/share/doc/libav-doc \
+	dh_install $(addprefix -N,$(LIB_EXTRA_PKGS)) -Nffmpeg -Xffmpeg \
+		-Xffmpeg.1 -Xusr/share/doc/libav-doc \
 		-Xusr/share/doc/libav --fail-missing --sourcedir=debian/tmp
 	dh_install -pffmpeg --sourcedir=debian/tmp
 	dh_strip $(addprefix -N,$(LIB_PKGS2)) -Nffmpeg --dbg-package=libav-dbg

-- 
Libav/FFmpeg packaging