[SCM] plasma-integration packaging branch, master, updated. debian/5.7.4-1-49-gef4ba8d

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/plasma/plasma-integration.git;a=commitdiff;h=4940be2

The following commit has been merged in the master branch:
commit 4940be210fe602835e11cb8826d08f1bcac0cf6f
Author: Harald Sitter <sitter at kde.org>
Date:   Mon Aug 22 11:15:33 2016 +0200

    conflict appstream-qt5 in 16.04 to prevent it from breaking integration
    
    https://bugs.kde.org/show_bug.cgi?id=367665
    
    (appstream-qt5 cannot be installed in neon as it is ABI locked on qt 5.5,
    better save than sorry though)
---
 debian/control | 1 +
 1 file changed, 1 insertion(+)

diff --git a/debian/control b/debian/control
index ec42f54..0639c3d 100644
--- a/debian/control
+++ b/debian/control
@@ -28,6 +28,7 @@ Vcs-Git: git://anonscm.debian.org/pkg-kde/plasma/plasma-integration.git
 Package: plasma-integration
 Architecture: any
 Depends: breeze, ${misc:Depends}, ${shlibs:Depends}
+Conflicts: appstream-qt5 (<= 0.3.0+16.04.20151130-0ubuntu1)
 Recommends: fonts-noto-hinted, fonts-oxygen
 Description: Qt Platform Theme integration plugins for KDE Plasma
  A plugin to provide Qt Platform Theme integration for the Plasma

-- 
plasma-integration packaging