[SCM] plasma-desktop packaging branch, master, updated. 3a008c7c6b669f2fd617ac895f1dc03658edceef

[Maximiliano Curia]

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

The following commit has been merged in the master branch:
commit 7a4b7d7533e240aa71179bbb19ab1c4f1d5e658f
Author: Scarlett Clark <sgclark at kubuntu.org>
Date:   Fri Oct 3 10:19:00 2014 +0000

    Fix copyright file (remove spaces) to appease lintian.
---
 debian/changelog | 4 ++++
 debian/copyright | 9 ++++-----
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 00653d7..84b804e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,11 @@
 plasma-desktop (4:5.0.95-0ubuntu1) UNRELEASED; urgency=medium
 
+  [ Jonathan Riddell ]
   * New upstream beta release
 
+  [ Scarlett Clark ]
+  * Fix copyright file (remove spaces) to appease lintian. 
+
  -- Jonathan Riddell <jriddell at ubuntu.com>  Wed, 01 Oct 2014 15:28:57 +0200
 
 plasma-desktop (4:5.0.2-0ubuntu1) utopic; urgency=medium
diff --git a/debian/copyright b/debian/copyright
index 66b8448..5fde4bd 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -844,7 +844,7 @@ Files: kcms/input/core/bitmaps.h
        kcms/input/xcursor/xcursortheme.cpp
        kcms/input/xcursor/xcursortheme.h
 Copyright: 2003, 2006-2007 Fredrik Höglund <fredrik at kde.org>
-License: GPL-2 or at your option GPLv3
+License: GPL-2 or GPL-3
  * 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
@@ -880,7 +880,7 @@ Files: containments/folder/plugin/internallibkonq/konq_copytomenu.cpp
        containments/folder/plugin/internallibkonq/konq_popupmenuplugin.h
        containments/folder/plugin/internallibkonq/konq_popupmenuplugin.cpp
 Copyright: 1998-2009 David Faure <faure at kde.org>
-License: GPL-2 or at your option GPL-3 at the discretion of KDE e.V.
+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 as published by
  the Free Software Foundation; either version 2 of the License or ( at
@@ -948,7 +948,7 @@ Copyright: 1998-2009 David Faure <faure at kde.org>
            2002       Michael Brade <brade at kde.org>
            2001-2002  Alexander Neundorf <neundorf at kde.org>
            2000-2001  Simon Hausmann <hausmann at kde.org>
-License: LGPL-2 or at your option v3
+License: LGPL-2 or LGPL-3
  This library is free software; you can redistribute it and/or
  modify it under the terms of the GNU Library General Public
  License as published by the Free Software Foundation; either
@@ -1021,8 +1021,7 @@ Files: attica-kde/kdeplugin/* excluding:
        kcms/krdb/krdb_clearlibrarypath.cpp
 Copyright: 2009 Eckhart Wörner <ewoerner at kde.org>
            2010 Frederik Gladhorn <gladhorn at kde.org>
-License: LGPL-2.1+ or any
-    later version accepted by the membership of KDE e.V.
+License: LGPL-KDEeV
  This library is free software; you can redistribute it and/or
  modify it under the terms of the GNU Lesser General Public
  License as published by the Free Software Foundation; either

-- 
plasma-desktop packaging