[SCM] ksysguard packaging branch, kubuntu_unstable, updated. ubuntu/4%5.4.3-0ubuntu1-23-gcaadfb5

[Scarlett Clark]

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

The following commit has been merged in the kubuntu_unstable branch:
commit caadfb5e066dee768b177f9e5db46d378ffac859
Author: Scarlett Clark <scarlett at scarlettgatelyclark.com>
Date:   Fri Feb 26 15:13:47 2016 -0800

    Fix copyright file merge.
---
 debian/changelog |  3 +++
 debian/copyright | 29 -----------------------------
 2 files changed, 3 insertions(+), 29 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index e9d7694..d6f42c6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,9 @@ ksysguard (4:5.5.4-0ubuntu1) UNRELEASED; urgency=medium
   * New upstream release
   * New upstream release
 
+  [ Scarlett Clark ]
+  * Fix copyright file merge. 
+
  -- Clive Johnston <clivejo at aol.com>  Wed, 27 Jan 2016 20:11:41 +0000
 
 ksysguard (4:5.4.3-0ubuntu1) xenial; urgency=medium
diff --git a/debian/copyright b/debian/copyright
index daae31a..09b0a22 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -162,9 +162,6 @@ License: GPL-2+3
 
 Files: ksysguardd/FreeBSD/stat.c
 Copyright: 2011, David Naylor <naylor.b.david at gmail.com>
-<<<<<<< HEAD
-License: GPL-2+, and BSD-3-clause
-=======
 License: BSD-3-clause_and_GPL-2+
  Copyright (c) 2011 David Naylor <naylor.b.david at gmail.com>
  .
@@ -309,32 +306,6 @@ License: GPL-2+3+KDEeV
  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  --
  On Debian systems, the complete text of the GNU General Public License
-<<<<<<< HEAD
- version 2 can be found in "/usr/share/common-licenses/GPL-2".
-
-License: BSD-3-clause
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions are met:
- 1. Redistributions of source code must retain the above copyright notice,
-    this list of conditions and the following disclaimer.
- 2. Redistributions in binary form must reproduce the above copyright notice,
-    this list of conditions and the following disclaimer in the documentation
-    and/or other materials provided with the distribution.
- 3. The name of the author may not be used to endorse or promote products
-    derived from this software without specific prior written permission.
- .
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
- LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- POSSIBILITY OF SUCH DAMAGE.
-=======
  version 2 can be found in `/usr/share/common-licenses/GPL-2', likewise, the
  complete text of the GNU General Public License version 3 can be found in
  `/usr/share/common-licenses/GPL-3'.

-- 
ksysguard packaging