[SCM] libksysguard packaging branch, kubuntu_utopic_next, updated. e678c8a9ae59519734094e6dd23506b18aedd025

[Harald Sitter]

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

The following commit has been merged in the kubuntu_utopic_next branch:
commit e678c8a9ae59519734094e6dd23506b18aedd025
Author: Harald Sitter <sitter at kde.org>
Date:   Tue Oct 7 09:29:51 2014 +0200

    libkf5sysguard5-data breaks and conflicts pre-5.0 ksysguard as the dbus processlisthelper.conf previously was in ksysguard.
---
 debian/changelog | 2 ++
 debian/control   | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index b28fda6..bd5bdef 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -25,6 +25,8 @@ libksysguard (4:5.0.95-0ubuntu1) UNRELEASED; urgency=medium
       which will give unintended results (namely right now kwindowsystem
       crashes) if there is no window manager. So we are running a more
       advanced setup using autopkgtest and openbox.
+  * libkf5sysguard5-data breaks and conflicts pre-5.0 ksysguard as the
+    dbus processlisthelper.conf previously was in ksysguard.
 
  -- Jonathan Riddell <jriddell at ubuntu.com>  Wed, 01 Oct 2014 15:27:56 +0200
 
diff --git a/debian/control b/debian/control
index d9e34f1..f7afefb 100644
--- a/debian/control
+++ b/debian/control
@@ -115,8 +115,8 @@ Package: libkf5sysguard5-data
 Section: libs
 Architecture: any
 Depends: ${misc:Depends}, ${shlibs:Depends}
-Breaks: libkf5sysguard5 (<< 4:5.0.95)
-Replaces: libkf5sysguard5 (<< 4:5.0.95)
+Breaks: ksysguard (<< 4:5.0.0), libkf5sysguard5 (<< 4:5.0.95)
+Replaces: ksysguard (<< 4:5.0.0), libkf5sysguard5 (<< 4:5.0.95)
 Description: library for monitoring your system - shared library
  KSysGuard is a program to monitor various elements of your system, or any
  other remote system with the KSysGuard daemon (ksysgardd) installed.

-- 
libksysguard packaging