[SCM] qtbase packaging branch, master, updated. debian/5.6.1+dfsg-2-2-g6d3679b

[Lisandro Damián Nicanor Pérez]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/qt/qtbase.git;a=commitdiff;h=6d3679b

The following commit has been merged in the master branch:
commit 6d3679b006f65f498de4f5a516339cd1bbe3f8a9
Author: Lisandro Damián Nicanor Pérez Meyer <perezmeyer at gmail.com>
Date:   Mon Jun 20 18:10:54 2016 -0300

    Make libqtcore5a break libqt5scintilla2-12v5 (<< 2.9.2+dfsg-2~)
---
 debian/changelog | 4 ++++
 debian/control   | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index fae071e..f9e009a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,9 @@
 qtbase-opensource-src (5.6.1+dfsg-3) UNRELEASED; urgency=medium
 
+  [ Lisandro Damián Nicanor Pérez Meyer ]
+  * Make libqtcore5a break libqt5scintilla2-12v5 (<< 2.9.2+dfsg-2~), pointed
+    out by Scott Kitterman.
+
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Mon, 20 Jun 2016 18:05:07 -0300
 
 qtbase-opensource-src (5.6.1+dfsg-2) unstable; urgency=medium
diff --git a/debian/control b/debian/control
index 0c4213b..c4f580e 100644
--- a/debian/control
+++ b/debian/control
@@ -80,7 +80,7 @@ Provides: qtbase-abi-5-6-1
 Depends: ${misc:Depends}, ${shlibs:Depends}
 Recommends: qttranslations5-l10n
 Suggests: libthai0
-Breaks: libqt5core5 (<< 5.2.0+dfsg~)
+Breaks: libqt5core5 (<< 5.2.0+dfsg~), libqt5scintilla2-12v5 (<< 2.9.2+dfsg-2~)
 Replaces: libqt5core5 (<< 5.2.0+dfsg~)
 Description: Qt 5 core module
  Qt is a cross-platform C++ application framework. Qt's primary feature

-- 
qtbase packaging