[SCM] knewstuff packaging branch, master, updated. 9b57a3d2f4c04c5078994faae592e277f654c23f

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/frameworks/knewstuff.git;a=commitdiff;h=9b57a3d

The following commit has been merged in the master branch:
commit 9b57a3d2f4c04c5078994faae592e277f654c23f
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Wed Mar 25 14:51:08 2015 +0100

    Update copyright information.
---
 debian/changelog |  1 +
 debian/copyright | 66 +++++++++++++++++++++++++++++++++++++++++++++-----------
 2 files changed, 55 insertions(+), 12 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 5457c08..c108af0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 knewstuff (5.8.0-1) experimental; urgency=medium
 
   * New upstream release (5.8.0).
+  * Update copyright information.
 
  -- Maximiliano Curia <maxy at debian.org>  Sun, 22 Mar 2015 11:39:08 +0100
 
diff --git a/debian/copyright b/debian/copyright
index 000240e..2abeade 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -14,18 +14,58 @@ Copyright: 2004, Aaron J. Seigo <aseigo at kde.org>
            2003-2007, Josef Spillner <spillner at kde.org>
            2010, Matthias Fuchs <mat69 at gmx.net>
            2010, Reza Fatahilah Shah <rshah0385 at kireihana.com>
+           2009, Adriaan de Groot, Mustapha Abubakar, Ibrahim Dasuna
+           2006, Canonical Ltd, and Rosetta Contributors 2006
+           1998, Erez Nir <erez-n at actcom.co.il>
+           2000-2010, Free Software Foundation, Inc
+           2008-2009, K Desktop Environment
+           2005, KDE Armenian translation team
+           2005, KDE Russian translation team
+           2000-2003, KDE e.v
+           2007, KDE i18n Project for Vietnamese
+           1999-2003, Meni Livne <livne at kde.org>
+           2007-2010, This_file_is_part_of_KDE
+           2001, translate.org.za
 License: LGPL-2.1+
 
+Files: po/ca/knewstuff5.po
+       po/ca at valencia/knewstuff5.po
+       po/uk/knewstuff5.po
+Copyright: 2014, This_file_is_part_of_KDE
+License: LGPL-2.1+3+KDEeV
+
 Files: tests/khotnewstuff.cpp
        tests/khotnewstuff_upload.cpp
 Copyright: 2002, Cornelius Schumacher <schumacher at kde.org>
            2009, Frederik Gladhorn <gladhorn at kde.org>
            2007-2014, Jeremy Whiting <jpwhiting at kde.org>
 License: LGPL-2+
+
+Files: src/core/upload.cpp
+Copyright: 2007-2009, Frederik Gladhorn <gladhorn at kde.org>
+           2009, Jeremy Whiting <jpwhiting at kde.org>
+           2007, Josef Spillner <spillner at kde.org>
+License: LGPL-2
+
+Files: po/bg/knewstuff5.po
+Copyright: 2009-2013, Yasen Pramatarov <yasen at lindeas.com>
+           2006-2009, Zlatko Popov <zlatkopopov at fsa-bg.org>
+License: GPL
+
+Files: debian/*
+Copyright: 2014, Scarlett Clark <scarlett at scarlettgatelyclark.com>
+License: LGPL-2.1+
+
+License: GPL
+ This file is licensed under the GPL.
+ .
+ On Debian systems, the complete text of the GNU General Public License can be
+ found in "/usr/share/common-licenses/GPL".
+
+License: LGPL-2
  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
- version 2 of the License, or (at your option) any later version.
+ License version 2 as published by the Free Software Foundation.
  .
  This library is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -40,14 +80,11 @@ 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: src/core/upload.cpp
-Copyright: 2007-2009, Frederik Gladhorn <gladhorn at kde.org>
-           2009, Jeremy Whiting <jpwhiting at kde.org>
-           2007, Josef Spillner <spillner at kde.org>
-License: LGPL-2
+License: LGPL-2+
  This library 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.
+ License as published by the Free Software Foundation; either
+ version 2 of the License, or (at your option) any later version.
  .
  This library is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -62,10 +99,6 @@ 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: debian/*
-Copyright: 2014, Scarlett Clark <scarlett at scarlettgatelyclark.com>
-License: LGPL-2.1+
-
 License: LGPL-2.1+
  This library is free software; you can redistribute it and/or
  modify it under the terms of the GNU Lesser General Public
@@ -82,3 +115,12 @@ License: LGPL-2.1+
  .
  On Debian systems, the complete text of the GNU Lesser General Public License
  version 2.1 can be found in "/usr/share/common-licenses/LGPL-2.1".
+
+License: LGPL-2.1+3+KDEeV
+ This file is distributed under the license LGPL version 2.1 or
+ version 3 or later versions approved by the membership of KDE e.V.
+ .
+ On Debian systems, the complete text of the GNU Lesser General Public License
+ version 2.1 can be found in `/usr/share/common-licenses/LGPL-2.1', likewise,
+ the complet text of the GNU General Public License version 3 can be found in
+ `/usr/share/common-licenses/LGPL-3'.

-- 
knewstuff packaging