[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=ed77879

The following commit has been merged in the master branch:
commit ed778795f91cdf3b5578a56a5f881afdae439a76
Merge: 01e5a419561f431fac99359e7f2baa1d0391cf11 4940be210fe602835e11cb8826d08f1bcac0cf6f
Author: Harald Sitter <sitter at kde.org>
Date:   Mon Aug 22 15:08:13 2016 +0200

    Merge branch 'Neon/stable' into Neon/unstable
    
    # Conflicts:
    #	debian/control

 debian/control | 1 +
 1 file changed, 1 insertion(+)

diff --cc debian/control
index 40c8949,0639c3d..43b95a3
--- a/debian/control
+++ b/debian/control
@@@ -28,7 -28,8 +28,8 @@@ Vcs-Git: git://anonscm.debian.org/pkg-k
  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
 +Recommends: fonts-hack-ttf, fonts-noto-hinted
  Description: Qt Platform Theme integration plugins for KDE Plasma
   A plugin to provide Qt Platform Theme integration for the Plasma
   workspace.

-- 
plasma-integration packaging