[SCM] libksysguard packaging branch, kubuntu_unstable, updated. 929aee31a20bf683f64a2438b1bd1fc18853d5cb

[Kubuntu CI (Harald Sitter)]

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

The following commit has been merged in the kubuntu_unstable branch:
commit bc429073188931fd369d08de34f81fa308467f8f
Author: Jonathan Riddell <jr at jriddell.org>
Date:   Wed Nov 5 18:45:55 2014 +0100

    finish copyright
---
 debian/changelog |  6 ------
 debian/copyright | 26 +++++++++++++++++++++++---
 2 files changed, 23 insertions(+), 9 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 1cfdb35..f9806b8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -28,10 +28,6 @@ libksysguard (4:5.1.0.1-0ubuntu1) vivid; urgency=medium
   * libkf5sysguard5-data breaks and conflicts pre-5.0 ksysguard as the
     dbus processlisthelper.conf previously was in ksysguard.
 
-  [ Jonathan Riddell ]
-  * New upstream release
-  * New upstream release with fixed tar
-
  -- Jonathan Riddell <jriddell at ubuntu.com>  Tue, 14 Oct 2014 13:49:37 +0200
 
 libksysguard (4:5.0.2-0ubuntu1) utopic; urgency=medium
@@ -48,8 +44,6 @@ libksysguard (4:5.0.1-0ubuntu1~ubuntu14.10~ppa2) utopic; urgency=medium
   [ Scarlett Clark ]
   * Update watch to http://download.kde.org
 
-  [ Jonathan Riddell ]
-  * New upstream bugfix release
  -- Jonathan Riddell <jriddell at ubuntu.com>  Sun, 10 Aug 2014 15:43:41 +0200
 
 libksysguard (4:4.98.0-0ubuntu1) utopic; urgency=medium
diff --git a/debian/copyright b/debian/copyright
index dec1d33..6c79c14 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -194,10 +194,10 @@ License: LGPL-2+
  On Debian systems, the complete text of the GNU Library General
  Public License version 2 can be found in "/usr/share/common-licenses/LGPL-2".
 
-Files: ksgrd/* excluding:
-       signalplotter/* excluding:
+Files: ksgrd/*
+       signalplotter/*
 Copyright: 1999 - 2001 Chris Schlaeger <cs at kde.org>
-License: GPL-KDEeV
+License: GPL-2 or GPL-2
  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
@@ -215,6 +215,26 @@ License: GPL-KDEeV
  On Debian systems, the complete text of the GNU General
  Public License version 2 can be found in "/usr/share/common-licenses/GPL-2".
 
+Files: scripts/smaps/sorttable.js
+Copyright: 2007 Stuart Langridge
+License: MIT
+ Permission is hereby granted, free of charge, to any person obtaining
+ a copy of this software and associated documentation files (the
+ "Software"), to deal in the Software without restriction, including
+ without limitation the rights to use, copy, modify, merge, publish,
+ distribute, sublicense, and/or sell copies of the Software, and to
+ permit persons to whom the Software is furnished to do so, subject to
+ the following conditions:
+ .
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+ BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+ ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ SOFTWARE.
+
 Files: processcore/atop_p.h
        debian/*
 Copyright: Unknown

-- 
libksysguard packaging