[SCM] qtlocation packaging branch, master, updated. debian/5.7.1-20161021-3-4-gfcfc505

[Dmitry Shachnev]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/qt/qtlocation.git;a=commitdiff;h=fcfc505

The following commit has been merged in the master branch:
commit fcfc505b7b16a1c579e125948a540c14cf71009a
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date:   Fri Dec 16 19:54:01 2016 +0300

    Update debian/copyright.
---
 debian/changelog |  1 +
 debian/copyright | 52 +++++++++++++++++++++++++++++++++++++++++++++++++++-
 2 files changed, 52 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 7cc6799..ed2f45f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ qtlocation-opensource-src (5.7.1-1) UNRELEASED; urgency=medium
   * New upstream stable release.
   * Ignore the tests results rather than completely disable them.
   * Bump qtbase build-dependencies to 5.7.1 final.
+  * Update debian/copyright.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Fri, 16 Dec 2016 19:00:20 +0300
 
diff --git a/debian/copyright b/debian/copyright
index 8a36574..eb1372d 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -5,7 +5,7 @@ Source: https://download.qt.io/official_releases/qt/*/submodules/
 Files: *
 Copyright: 2015-2016 The Qt Company Ltd.
            2015-2016 Jolla Ltd.
-           2016 Aaron McCarthy <mccarthy.aaron at gmail.com>
+           2013-2016 Aaron McCarthy <mccarthy.aaron at gmail.com>
 License: LGPL-3 or GPL-2
 
 Files: src/plugins/geoservices/mapbox/*
@@ -18,6 +18,14 @@ Files: examples/*
 Copyright: 2015 The Qt Company Ltd.
 License: BSD-3-clause
 
+Files: src/3rdparty/clip2tri/*
+Copyright: 2014 Bitfighter developers
+License: Expat
+
+Files: src/3rdparty/clipper/*
+Copyright: 2010-2014 Angus Johnson
+License: Boost-1.0
+
 Files: src/3rdparty/poly2tri/*
 Copyright: 2009-2010, Poly2Tri Contributors
 License: BSD-3-clause
@@ -204,3 +212,45 @@ License: GFDL-NIV-1.3
  .
  On Debian systems, the complete text of the GNU Free Documentation
  License version 1.3 can be found in /usr/share/common-licenses/GFDL-1.3.
+
+License: Expat
+ Permission is hereby granted, free of charge, to any person obtaining a copy
+ of this software and associated documentation files (the "Software"), to deal
+ in the Software without restriction, including without limitation the rights
+ to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ copies of the Software, and to permit persons to whom the Software is
+ furnished to do so, subject to the following conditions:
+ .
+ The above copyright notice and this permission notice shall be included in all
+ copies or substantial portions of the Software.
+ .
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ SOFTWARE.
+
+License: Boost-1.0
+ Permission is hereby granted, free of charge, to any person or organization
+ obtaining a copy of the software and accompanying documentation covered by
+ this license (the "Software") to use, reproduce, display, distribute,
+ execute, and transmit the Software, and to prepare derivative works of the
+ Software, and to permit third-parties to whom the Software is furnished to
+ do so, all subject to the following:
+ .
+ The copyright notices in the Software and this entire statement, including
+ the above license grant, this restriction and the following disclaimer,
+ must be included in all copies of the Software, in whole or in part, and
+ all derivative works of the Software, unless such copies or derivative
+ works are solely in the form of machine-executable object code generated by
+ a source language processor.
+ .
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
+ SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
+ FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
+ ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ DEALINGS IN THE SOFTWARE.

-- 
qtlocation packaging