[SCM] subtitlecomposer packaging branch, master, updated. debian/0.5.3-4-12-g386410e

[Martin Steghöfer]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/subtitlecomposer.git;a=commitdiff;h=b904c91

The following commit has been merged in the master branch:
commit b904c91f0062644e3dcbc58b90a517528106b51c
Author: Martin Steghöfer <martin at steghoefer.eu>
Date:   Sun Oct 4 20:44:35 2015 +0200

    Declared build conflict with Qt5.
    
    Closes: #784075
---
 debian/control | 1 +
 1 file changed, 1 insertion(+)

diff --git a/debian/control b/debian/control
index 4862537..e90d080 100644
--- a/debian/control
+++ b/debian/control
@@ -6,6 +6,7 @@ Uploaders: Maximiliano Curia <maxy at debian.org>
 Build-Depends: debhelper (>= 9), cmake, pkg-kde-tools,
  kdelibs5-dev, libgstreamer-plugins-base1.0-dev, libglib2.0-dev, libxml2-dev,
  libxine2-dev, libx11-dev
+Build-Conflicts: qt5-default
 Standards-Version: 3.9.4
 Homepage: http://sourceforge.net/projects/subcomposer
 Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-kde/kde-extras/subtitlecomposer.git

-- 
subtitlecomposer packaging