[SCM] libkscreen packaging branch, kubuntu_stable, updated. 2a469cd536bd026d6937af6db368588fadf19605

[Kubuntu CI (Harald Sitter)]

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

The following commit has been merged in the kubuntu_stable branch:
commit 2a469cd536bd026d6937af6db368588fadf19605
Author: Harald Sitter <sitter at kde.org>
Date:   Wed Jan 28 15:26:42 2015 +0100

    Use software transition flags for kscreen5->6 Using versioned breaks/replaces instead of an unversioned conflicts.
---
 debian/changelog             | 8 ++++++++
 debian/control               | 3 ++-
 debian/libkf5screen6.install | 2 +-
 3 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 20913e6..3d79639 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+libkscreen (4:5.2.0-0ubuntu2) UNRELEASED; urgency=medium
+
+  * Use software transition flags for kscreen5->6
+    Using versioned breaks/replaces instead of an unversioned
+    conflicts.
+
+ -- Harald Sitter <sitter at kde.org>  Wed, 28 Jan 2015 15:25:55 +0100
+
 libkscreen (4:5.2.0-0ubuntu1) vivid; urgency=medium
 
   * New upstream release
diff --git a/debian/control b/debian/control
index 07e0701..f5ee8fc 100644
--- a/debian/control
+++ b/debian/control
@@ -60,7 +60,8 @@ Package: libkf5screen6
 Section: libs
 Architecture: any
 Depends: ${misc:Depends}, ${shlibs:Depends}
-Conflicts: libkf5screen5
+Breaks: libkf5screen5 (<< 4:5.2.0)
+Replaces: libkf5screen5 (<< 4:5.2.0)
 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
diff --git a/debian/libkf5screen6.install b/debian/libkf5screen6.install
index ec5477e..957d54b 100644
--- a/debian/libkf5screen6.install
+++ b/debian/libkf5screen6.install
@@ -1,4 +1,4 @@
 usr/lib/*/libKF5Screen.so.5*
 usr/lib/*/libKF5Screen.so.6
-usr/lib/*/qt5/plugins/
 usr/lib/*/libexec/kf5/kscreen_backend_launcher
+usr/lib/*/qt5/plugins/

-- 
libkscreen packaging