[SCM] knewstuff packaging branch, master, updated. 2eca235ef0054bca3e7c41d71c506088515710f8

[Maximiliano Curia]

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

The following commit has been merged in the master branch:
commit 504f13d628ab4e5cac0c9265e9f4fa206953ff9a
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Fri Jan 30 15:39:30 2015 +0100

    Update copyright information.
---
 debian/changelog |  1 +
 debian/copyright | 74 ++++++++++++++++++++++++++++++++++++++++----------------
 2 files changed, 54 insertions(+), 21 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 04cb6d5..b170395 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,7 @@ knewstuff (5.6.0-1~) UNRELEASED; urgency=medium
     follow cmake.
   * Bump Standards-Version to 3.9.6, no changes needed.
   * Add basic autopkgtests support.
+  * Update copyright information.
 
  -- Maximiliano Curia <maxy at debian.org>  Wed, 28 Jan 2015 09:08:38 +0100
 
diff --git a/debian/copyright b/debian/copyright
index bcf51b2..000240e 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -3,36 +3,47 @@ Upstream-Name: knewstuff
 Source: https://projects.kde.org/projects/frameworks/knewstuff
 
 Files: *
-       debian/*
-Copyright: © 2007-2010 Frederik Gladhorn <gladhorn at kde.org>
-           © 2003-2007 Josef Spillner <spillner at kde.org>
-           © 2007-2009 Jeremy Whiting <jpwhiting at kde.org>
-           © 2002 Cornelius Schumacher <schumacher at kde.org>
-           © 2010 Reza Fatahilah Shah <rshah0385 at kireihana.com>
-           © 2005 Enrico Ros <eros.kde at email.it>
-           © 2007 Dirk Mueller <mueller at kde.org>
-           © 2010 Matthias Fuchs <mat69 at gmx.net>
-           © 2004-2005 Andras Mantia <amantia at kde.org>
-           © 2004 Aaron J. Seigo <aseigo at kde.org>
-             2014 Scarlett Clark <scarlett at scarlettgatelyclark.com>
+Copyright: 2004, Aaron J. Seigo <aseigo at kde.org>
+           2004-2005, Andras Mantia <amantia at kde.org>
+           2002, Cornelius Schumacher <schumacher at kde.org>
+           2007, Dirk Mueller <mueller at kde.org>
+           2005, Enrico Ros <eros.kde at email.it>
+           2007-2010, Frederik Gladhorn <gladhorn at kde.org>
+           1991-1999, Free Software Foundation, Inc
+           2007-2009, Jeremy Whiting <jpwhiting 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>
 License: LGPL-2.1+
+
+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+
  This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Lesser General Public
+ modify it under the terms of the GNU Library General Public
  License as published by the Free Software Foundation; either
- version 2.1 of the License, or (at your option) any later version.
+ 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
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- Lesser General Public License for more details.
+ Library General Public License for more details.
  .
- You should have received a copy of the GNU Lesser General Public
- License along with this library.  If not, see <http://www.gnu.org/licenses/>.
+ You should have received a copy of the GNU Library General Public License
+ along with this library; see the file COPYING.LIB.  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:  src/core/upload.cpp
-Copyright: 2007 Josef Spillner <spillner at kde.org>
-           2007-2009 Frederik Gladhorn <gladhorn at kde.org>
-           2009 Jeremy Whiting <jpwhiting at kde.org>
+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
  This library is free software; you can redistribute it and/or
  modify it under the terms of the GNU Library General Public
@@ -50,3 +61,24 @@ 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
+ License as published by the Free Software Foundation; either
+ version 2.1 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
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ Lesser General Public License for more details.
+ .
+ You should have received a copy of the GNU Lesser General Public
+ License along with this library.  If not, see <http://www.gnu.org/licenses/>.
+ .
+ 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".

-- 
knewstuff packaging