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

[Jonathan Riddell]

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

The following commit has been merged in the kubuntu_utopic_next branch:
commit a994c1e662214f9149c155294b1232788454d4ef
Author: Jonathan Riddell <jr at jriddell.org>
Date:   Thu Oct 2 18:27:07 2014 +0200

     Move data files to libkf5sysguard5-data
    
    * Move data files to libkf5sysguard5-data
    * Add missing processlisthelper files
    * Add not-installed for a file installed to /etc rather than /usr/etc
---
 debian/changelog                    | 5 +++--
 debian/control                      | 2 ++
 debian/copyright                    | 2 +-
 debian/libkf5sysguard5-data.install | 4 ++++
 debian/libkf5sysguard5.install      | 4 ----
 5 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 1a23cda..be1d4c8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,10 +2,11 @@ libksysguard (4:5.0.95-0ubuntu1) UNRELEASED; urgency=medium
 
   [ Jonathan Riddell ]
   * New upstream beta release
+  * Move data files to libkf5sysguard5-data
 
   [ Scarlett Clark ]
-  * Add missing processlisthelper files to libksysguard.install
-    - add not-installed for a file installed to /etc rather than /usr/etc. 
+  * Add missing processlisthelper files
+  * Add not-installed for a file installed to /etc rather than /usr/etc
 
  -- Jonathan Riddell <jriddell at ubuntu.com>  Wed, 01 Oct 2014 15:27:56 +0200
 
diff --git a/debian/control b/debian/control
index a58c39d..9a55978 100644
--- a/debian/control
+++ b/debian/control
@@ -149,6 +149,8 @@ Section: libs
 Architecture: any
 Depends: ${misc:Depends},
          ${shlibs:Depends}
+Breaks: libkf5sysguard5 (<< 4:5.0.95)
+Replaces: 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.
diff --git a/debian/copyright b/debian/copyright
index b08cb09..24e209e 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -197,7 +197,7 @@ License: LGPL-2+
 Files: ksgrd/* excluding:
        signalplotter/* excluding:
 Copyright: 1999 - 2001 Chris Schlaeger <cs at kde.org>
-License: GPL-2 or at your option version 3
+License: GPL-KDEeV
  This program is free software; you can redistribute it and/or
  modify it under the terms of the GNU General Public
  License version 2 or at your option version 3 as published by
diff --git a/debian/libkf5sysguard5-data.install b/debian/libkf5sysguard5-data.install
index 3270a48..a9d9da8 100644
--- a/debian/libkf5sysguard5-data.install
+++ b/debian/libkf5sysguard5-data.install
@@ -1 +1,5 @@
+usr/share/ksysguard/*
+usr/share/dbus-1/system-services/org.kde.ksysguard.processlisthelper.service
+usr/share/polkit-1/actions/org.kde.ksysguard.processlisthelper.policy
 usr/share/locale/*
+usr/etc/dbus-1/system.d/org.kde.ksysguard.processlisthelper.conf etc/dbus-1/system.d/org.kde.ksysguard.processlisthelper.conf
diff --git a/debian/libkf5sysguard5.install b/debian/libkf5sysguard5.install
index 62152bb..42dcd19 100644
--- a/debian/libkf5sysguard5.install
+++ b/debian/libkf5sysguard5.install
@@ -1,5 +1 @@
-usr/share/ksysguard/*
-usr/share/dbus-1/system-services/org.kde.ksysguard.processlisthelper.service
-usr/share/polkit-1/actions/org.kde.ksysguard.processlisthelper.policy
 usr/lib/*/libexec/kauth/ksysguardprocesslist_helper
-usr/etc/dbus-1/system.d/org.kde.ksysguard.processlisthelper.conf etc/dbus-1/system.d/org.kde.ksysguard.processlisthelper.conf

-- 
libksysguard packaging