[SCM] vlc/master: Build-Conflict with Qt in experimental

[sramacher at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit dd4a1832269648898aa3d2b9d83513d5011ee044
Author: Sebastian Ramacher <sramacher at debian.org>
Date:   Fri Apr 7 17:24:53 2017 +0200

    Build-Conflict with Qt in experimental
    
    Workaround for #858762

diff --git a/debian/control b/debian/control
index 16d2393..c608353 100644
--- a/debian/control
+++ b/debian/control
@@ -131,6 +131,8 @@ Build-Depends: autopoint,
                libwebp-dev,
                libxvidcore-dev,
                yasm
+Build-Conflicts: libqt5x11extras5-dev (>= 5.8),
+                 qtbase5-dev (>= 5.8)
 Standards-Version: 3.9.8
 Homepage: http://www.videolan.org/vlc/
 Vcs-Git: https://anonscm.debian.org/git/pkg-multimedia/vlc.git

-- 
VLC media player packaging