[SCM] knights packaging branch, master, updated. upstream/2.4.2-46-g6e050b4

[José Manuel Santamaría Lema]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/knights.git;a=commitdiff;h=6e050b4

The following commit has been merged in the master branch:
commit 6e050b4e33823d6a64c3ff7a6283ad2009992b53
Author: José Manuel Santamaría Lema <panfaust at gmail.com>
Date:   Wed Sep 12 23:19:21 2012 +0200

    Update copyright file: years and add note about derived works.
---
 debian/changelog |    1 +
 debian/copyright |   58 ++++++++++++++++++++++++++++++++++++++++++++++++++++-
 2 files changed, 57 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 21be305..261397d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,7 @@ knights (2.4.2-1) UNRELEASED; urgency=low
   * Add stockfish to Recommends.
   * Add knights-dbg package.
   * Bump Standards-Version to 3.9.3; no changes needed.
+  * Update copyright file.
 
  -- José Manuel Santamaría Lema <panfaust at gmail.com>  Wed, 21 Mar 2012 14:45:23 +0100
 
diff --git a/debian/copyright b/debian/copyright
index fe28ffe..1f416ba 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -8,7 +8,7 @@ Thu, 03 Jun 2010 19:06:32 +0200.
 It was downloaded from http://kde-apps.org/content/show.php/Knights?content=122046
 
 
-Copyright © 2009-2010 Miha Čančula <miha.cancula at gmail.com>
+Copyright © 2009-2011 Miha Čančula <miha.cancula at gmail.com>
 
 Upstream Author: Miha Čančula <miha.cancula at gmail.com>
 
@@ -38,6 +38,60 @@ On Debian systems, the complete text of the GNU General Public License
 version 3 can be found in the file `/usr/share/common-licenses/GPL-3'.
 
 
-The Debian packaging is © 2010 José Manuel Santamaría Lema
+Derived works:
+
+Files knights/src/clock.h and knights/src/clock.cpp, are modified versions of
+these files from plasma (plasma is provided by the source package kde-workspace
+in Debian):
+    plasma/generic/applets/analog-clock/clock.h
+    plasma/generic/applets/analog-clock/clock.cpp
+
+The original clock.* files were published with these copyright holders:
+    Copyright © 2007 Aaron Seigo <aseigo at kde.org>
+    Copyright © 2007 Riccardo Iaconelli <riccardo at kde.org>
+
+under this license:
+
+    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 your option) any later version.
+
+    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 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 .
+
+The modified clock.* files were published with these copyright holders:
+    Copyright © 2010,2011 Miha Čančula <miha at noughmad.eu>
+    Copyright © 2007 Aaron Seigo <aseigo at kde.org>
+    Copyright © 2007 Riccardo Iaconelli <riccardo at kde.org>
+
+under this license: 
+
+    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 your option) version 3 or any later version
+    accepted by the membership of KDE e.V. (or its successor approved
+    by the membership of KDE e.V.), which shall act as a proxy
+    defined in Section 14 of version 3 of the license.
+
+    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 General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+
+The Debian packaging is © 2010-2012 José Manuel Santamaría Lema
 <panfaust at gmail.com> and is licensed under the GPL v2 or later,
 see `/usr/share/common-licenses/GPL-2'.
+

-- 
knights packaging