[SCM] libkscreen packaging branch, kubuntu_vivid_archive, updated. 34b2204ffdb8b883bac833356fcdc5861d747443

[Jonathan Riddell]

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

The following commit has been merged in the kubuntu_vivid_archive branch:
commit a8a60026dbb6aaa905605d6cea9e9cb89d867ef4
Author: Jonathan Riddell <jr at jriddell.org>
Date:   Wed Nov 26 17:02:43 2014 +0100

    plugins make this conflict
---
 debian/control | 1 +
 1 file changed, 1 insertion(+)

diff --git a/debian/control b/debian/control
index 16b7f40..c607bf4 100644
--- a/debian/control
+++ b/debian/control
@@ -60,6 +60,7 @@ Package: libkf5screen6
 Section: libs
 Architecture: any
 Depends: ${misc:Depends}, ${shlibs:Depends}
+Conflicts: libkf5screen5
 Description: library for screen management - shared library
  The KDE multiple monitor support is trying be as smart as possible
  adapting the behavior of it to each use case making the configuration

-- 
libkscreen packaging