[SCM] LabPlot Debian packaging. branch, master, updated. debian/2.2.0-1-7-g1ee8e85

[Pino Toscano]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/labplot.git;a=commitdiff;h=1ee8e85

The following commit has been merged in the master branch:
commit 1ee8e8599bb02fbe71910fd61051f8a02e6e0492
Author: Pino Toscano <pino at debian.org>
Date:   Tue Jul 26 07:09:08 2016 +0200

    copyright: update
---
 debian/changelog |  1 +
 debian/copyright | 43 +++++++++++++++++++++++++++++++++++++++----
 2 files changed, 40 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 44b5fd9..3dbec00 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,7 @@ labplot (2.3.0-0r1) UNRELEASED; urgency=medium
     - upstream_Include-cmath-for-std-isfinite.patch: drop, backported from
       upstream
   * Add the libfftw3-dev build dependency, used by the new version.
+  * Update copyright.
 
  -- Debian KDE Extras Team <pkg-kde-extras at lists.alioth.debian.org>  Mon, 04 Jul 2016 06:14:45 +0200
 
diff --git a/debian/copyright b/debian/copyright
index 4e096f4..57ef387 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,15 +1,17 @@
-Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: labplot
 Source: https://edu.kde.org/applications/science/labplot/
 
 Files: *
 Copyright: 2006, David Saxton <david at bluehaze.org>
-           2006, Ion Vasilief <ion_vasilief at yahoo.fr>
+           2006-2007, Ion Vasilief <ion_vasilief at yahoo.fr>
            2006-2010, Knut Franke <knut.franke at gmx.de>
            2006-2009, Tilman Benkert <thzs at gmx.net>
-           2008-2015, Stefan Gerlach <stefan.gerlach at uni.kn>
-           2009-2016, Alexander Semke <alexander.semke at web.de>
+           2008-2016, Alexander Semke <alexander.semke at web.de>
+           2008-2016, Stefan Gerlach <stefan.gerlach at uni.kn>
+           2009-2016, Garvit Khatri <garvitdelhi at gmail.com>
            2015-2016, Ankit Wagadre <wagadre.ankit at gmail.com>
+           2016, Fabian Kristof <fkristofszabolcs at gmail.com>
 License: GPL-2+
 
 Files: admin/asan_symbolize.py
@@ -291,6 +293,39 @@ License: CPL-1.0
  after the cause of action arose. Each party waives its rights to a jury trial in
  any resulting litigation.
 
+Files: src/cantor/*
+Copyright: 2009-2010, Alexander Rieder <alexanderrieder at gmail.com>
+License: GPL-2+
+
+Files: src/kdefrontend/widgets/ExpressionTextEdit.*
+Copyright: 2013, Digia Plc and/or its subsidiary(-ies)
+           2014-2015, Alexander Semke <alexander.semke at web.de>
+License: GPL-2+ and BSD-3-clause
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions are
+ met:
+   * Redistributions of source code must retain the above copyright
+     notice, this list of conditions and the following disclaimer.
+   * Redistributions in binary form must reproduce the above copyright
+     notice, this list of conditions and the following disclaimer in
+     the documentation and/or other materials provided with the
+     distribution.
+   * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names
+     of its contributors may be used to endorse or promote products derived
+     from this software without specific prior written permission.
+ .
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
 Files: debian/*
 Copyright: 2016, Pino Toscano <pino at debian.org>
 License: GPL-2+

-- 
LabPlot Debian packaging.