[SCM] subtitlecomposer packaging branch, master, updated. debian/0.5.7-1-18-gc7b9930

[Pino Toscano]

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

The following commit has been merged in the master branch:
commit c7b99303fc05222e99fe2b7dfd6fabb80985274f
Author: Pino Toscano <pino at debian.org>
Date:   Sun Mar 27 10:39:32 2016 +0200

    remove no more useful Build-Conflicts: qt5-default
---
 debian/changelog | 1 +
 debian/control   | 1 -
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index a2ff081..9534d2d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -33,6 +33,7 @@ subtitlecomposer (0.6.2-0r1) UNRELEASED; urgency=medium
   * Update lintian overrides.
   * Link in as-needed mode.
   * Bump Standards-Version to 3.9.7, no changes required.
+  * Remove no more useful Build-Conflicts: qt5-default.
 
  -- Debian KDE Extras Team <pkg-kde-extras at lists.alioth.debian.org>  Sun, 27 Mar 2016 08:57:39 +0200
 
diff --git a/debian/control b/debian/control
index 95e65bb..c72a736 100644
--- a/debian/control
+++ b/debian/control
@@ -27,7 +27,6 @@ Build-Depends: debhelper (>= 9), cmake, pkg-kde-tools (>= 0.15.16),
  libxcb1-dev,
 # for tests:
  xvfb, xauth,
-Build-Conflicts: qt5-default
 Standards-Version: 3.9.7
 Homepage: https://github.com/maxrd2/subtitlecomposer
 Vcs-Browser: https://anonscm.debian.org/gitweb/?p=pkg-kde/kde-extras/subtitlecomposer.git

-- 
subtitlecomposer packaging