[SCM] plasma-framework packaging branch, kubuntu_wily_archive, updated. debian/5.9.0-1-10-g81f4dad

[Harald Sitter]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/frameworks/plasma-framework.git;a=commitdiff;h=81f4dad

The following commit has been merged in the kubuntu_wily_archive branch:
commit 81f4dad6080ea58c5d56ae4e21e77ff98ee1bb09
Author: Harald Sitter <sitter at kde.org>
Date:   Sat Jun 20 11:52:42 2015 -0700

    resolve file conflict on dbus file
    
    dpkg: error processing archive /var/cache/apt/archives/plasma-framework-dev_5.10.0+git20150619.0724+15.04-0_amd64.deb (--unpack):
    trying to overwrite '/usr/share/dbus-1/interfaces/org.kde.platformstatus.xml', which is also in package plasma-framework 5.9.0+git20150516.1328+15.04-0
---
 debian/control | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/debian/control b/debian/control
index 86b9273..c717f4c 100644
--- a/debian/control
+++ b/debian/control
@@ -60,6 +60,8 @@ Depends: libkf5package-dev (>= 5.10.0),
          libkf5plasmaquick5 (= ${binary:Version}),
          libkf5service-dev (>= 5.10.0),
          ${misc:Depends}
+Replaces: plasma-framework (<= 5.9.0+git20150516.1328+15.04-0)
+Breaks: plasma-framework (<= 5.9.0+git20150516.1328+15.04-0)
 Description: development files for plasma-framework
  Plasma library and runtime components based upon KF5 and Qt 5.
  .

-- 
plasma-framework packaging