[SCM] Calligra suite packaging branch, master, updated. debian/2.8.5+dfsg-1-70-g93e1bc3

[Dmitry Smirnov]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-std/calligra.git;a=commitdiff;h=93e1bc3

The following commit has been merged in the master branch:
commit 93e1bc3926e99e371a1c7ea9ed8b4ead6595b740
Author: Dmitry Smirnov <onlyjob at member.fsf.org>
Date:   Sat Oct 24 04:34:21 2015 +1100

    minor copyright update
---
 debian/copyright | 45 ++++++++++++++++++++++++++++++++++++---------
 1 file changed, 36 insertions(+), 9 deletions(-)

diff --git a/debian/copyright b/debian/copyright
index c292f9a..f58f488 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -38,6 +38,7 @@ Copyright:
     2010      Artur Duque de Souza <asouzakde.org>
     2011      Aurélien Gâteau <agateau at kde.org>
     2004-2006,2008 Bart Coppens <kde at bartcoppens.be>
+    1994      Basil K. Malyshev
     2011-2012 Ben Martin <monkeyiq at users.sourceforge.net>
     2009-2010 Benjamin Port <port.benjamin at gmail.com>
     2008      Benoit Jacob <jacob.benoit.1 at gmail.com>
@@ -350,7 +351,7 @@ Copyright:
     2011      Silvio Heinrich <plassyqweb.de>
     1999-2001,2006 Simon Hausmann <hausmann at kde.org>
     2002      Simon MacMullen <calligra at babysimon.co.uk>
-    1998-2002 Skåne Sjælland Linux User Group
+    1998-2002 Skåne Sjælland Linux User Group <bestyrelsen at sslug.dk>
     2011      Smit Patel <smitpatel24 at gmail.com>
     2015      Soma Schliszka <soma.schliszka at gmail.com>
     2013      Somsubhra Bairi <somsubhra.bairi at gmail.com>
@@ -467,6 +468,12 @@ Copyright:
 License: LGPL-2.1+ and exception-LGPL-Nokia-QT-1.1
 
 Files:
+    gemini/themes/default/fonts/PermanentMarker.ttf
+Copyright:
+    2010      Font Diner, Inc
+License: Apache-2.0
+
+Files:
     filters/words/rtf/import/3rdparty/rtf-qt/src/controlword.cpp
     filters/words/rtf/import/3rdparty/rtf-qt/src/controlword.h
 Copyright:
@@ -548,12 +555,15 @@ Comment: "fonts-lyx"
 
 Files:
     plugins/formulashape/fonts/LICENSE.AREV
-    plugins/formulashape/fonts/Arev*.ttf
 Copyright:
     2006      Tavmjong Bah
 License: Bitstream-Arev
 
 Files:
+    plugins/formulashape/fonts/Arev.ttf
+    plugins/formulashape/fonts/ArevBI.ttf
+    plugins/formulashape/fonts/ArevBd.ttf
+    plugins/formulashape/fonts/ArevIt.ttf
     plugins/formulashape/fonts/LICENSE.BITSTREAM
 Copyright:
     2003      Bitstream, Inc
@@ -700,6 +710,12 @@ Copyright:
 License: Expat
 
 Files:
+    krita/plugins/extensions/gmic/3rdparty/gmic/update1610.gmic
+Copyright:
+    2008-2015 David Tschumperle
+License: GFDL-1.3+
+
+Files:
     doc/*
 Copyright:
     2005      Anne-Marie.Mahfouf
@@ -715,12 +731,6 @@ Comment:
  COPYING.DOC
 
 Files:
-    krita/plugins/extensions/gmic/3rdparty/gmic/update1610.gmic
-Copyright:
-    2008-2015 David Tschumperle
-License: GFDL-1.3+
-
-Files:
     krita/ui/tests/modeltest.cpp
     krita/ui/tests/modeltest.h
     libs/kotext/kohyphen/hyphdicts/README_hyph_nl_NL.txt
@@ -1107,7 +1117,7 @@ Copyright:
     2005-2006 Hamish Rodda <rodda at kde.org>
     1999,2002 Harri Porten <porten at kde.org>
     2001      Holger Freyther <freyther at kde.org>
-    2004-2006,2009,2011 Inge Wallin <inge at lysator.liu.se>
+    2004-2006,2009-2011 Inge Wallin <inge at lysator.liu.se>
     2010      Inge wallin <inge at lysator.liu.se>
     2007-2011 Jan Hambrecht <jaham at gmx.net>
     2003-2004,2009-2014 Jarosław Staniek <staniek at kde.org>
@@ -1154,6 +1164,7 @@ Copyright:
     2003      Thierry Lorthiois <lorthioist at wanadoo.fr>
     2009      Thomas Zander <zander at kde.org>
     2007-2008,2011 Thorsten Zachmann <zachmann at kde.org>
+    2006      Tobias Koenig <tokoe at kde.org>
     2004-2007 Tomas Mecir <mecirt at gmail.com>
     1998-2000 Torben Weis <weis at kde.org>
     2009      Vera Lukman <shicmap at gmail.com>
@@ -1383,6 +1394,22 @@ Copyright:
     2006      Stefan Nikolaus <stefan.nikolaus at kdemail.net>
 License: XML-Schema
 
+License: Apache-2.0
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+ ․
+    http://www.apache.org/licenses/LICENSE-2.0
+ ․
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ ․
+ On Debian systems, the complete text of the Apache License,
+ Version 2.0 can be found in "/usr/share/common-licenses/Apache-2.0".
+
 License: BSD-2-Clause
  Redistribution and use in source and binary forms, with or without
  modification, are permitted provided that the following conditions are met:

-- 
Calligra suite packaging