[SCM] xvidcore/master: Explicitely Build-Conflict against yasm on kfreebsd-amd64.

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

The following commit has been merged in the master branch:
commit a8856a66d3d03db984533fca157b8e46d9c1a9f8
Author: Fabian Greffrath <fabian at greffrath.com>
Date:   Thu Jul 28 17:12:38 2011 +0200

    Explicitely Build-Conflict against yasm on kfreebsd-amd64.

diff --git a/debian/control b/debian/control
index 4e1b49d..090cfee 100644
--- a/debian/control
+++ b/debian/control
@@ -9,6 +9,7 @@ Uploaders: Loïc Martin <loic.martin3 at gmail.com>,
 Build-Depends: debhelper (>= 7.3~),
                yasm (>= 1.0) [any-i386 amd64],
                autoconf
+Build-Conflicts: yasm [kfreebsd-amd64]
 Standards-Version: 3.9.2
 DM-Upload-Allowed: yes
 Homepage: http://www.xvid.org/

-- 
xvidcore packaging