[SCM] plasma-workspace packaging branch, kubuntu_wily_archive, updated. 50c9f97fdf35f6009e0e177945de20d07626c9a7

[Jonathan Riddell]

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

The following commit has been merged in the kubuntu_wily_archive branch:
commit 50c9f97fdf35f6009e0e177945de20d07626c9a7
Author: Jonathan Riddell <jr at jriddell.org>
Date:   Thu Jul 2 09:31:26 2015 +0000

    dep5-copyright-license-name-not-unique
---
 debian/copyright | 47 ++++++++++++++++++-----------------------------
 1 file changed, 18 insertions(+), 29 deletions(-)

diff --git a/debian/copyright b/debian/copyright
index 58cded4..94175d1 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -500,19 +500,6 @@ Files: applets/system-monitor/* excluding:
 Copyright: 2007 Petri Damsten <damu at iki.fi>
            2010 Michel Lafon-Puyo <michel.lafonpuyo at gmail.com>
 License: LGPL-2
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU Library General Public License version 2 as
- published by the Free Software Foundation
- .
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details
- .
- You should have received a copy of the GNU Library General Public
- License along with this program; if not, write to the
- Free Software Foundation, Inc.,
- 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 Files: applets/analog-clock/contents/code/*
        applets/batterymonitor/contents/code/*
@@ -820,22 +807,6 @@ Copyright: 2006-2011, Aaron Seigo <aseigo at kde.org>
            2014, Vishesh Handa <me at vhanda.in>
            2014, Vishesh Handa <vhanda at kde.org>
 License: LGPL-2
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU Library General Public License version 2 as
- published by the Free Software Foundation
- .
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details
- .
- You should have received a copy of the GNU Library General Public
- License along with this program; if not, write to the
- Free Software Foundation, Inc.,
- 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
- .
- 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: appmenu/appmenu.cpp
        appmenu/appmenu.h
@@ -1313,3 +1284,21 @@ 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".
+
+License: LGPL-2
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU Library General Public License version 2 as
+ published by the Free Software Foundation
+ .
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License for more details
+ .
+ You should have received a copy of the GNU Library General Public
+ License along with this program; if not, write to the
+ Free Software Foundation, Inc.,
+ 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ .
+ 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".

-- 
plasma-workspace packaging