[SCM] qtlocation packaging branch, experimental, updated. debian/5.6.1-2-5-ge013db0

Thu Jul 14 17:33:18 UTC 2016

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

The following commit has been merged in the experimental branch:
commit 9b55817b81252652daf08d8c267f3b468ff58745
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date:   Thu Jul 14 20:27:47 2016 +0300

    Update debian/copyright.
---
 debian/changelog |   1 +
 debian/copyright | 131 ++++++++++++++++++++++++++++++++++++-------------------
 2 files changed, 86 insertions(+), 46 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 42be9fa..6d874e2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ qtlocation-opensource-src (5.7.0-1) UNRELEASED; urgency=medium
   * New upstream release.
   * Refresh disable_failing_tests.patch.
   * Bump Qt build-dependencies to 5.7.0.
+  * Update debian/copyright.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Thu, 14 Jul 2016 14:02:41 +0300
 
diff --git a/debian/copyright b/debian/copyright
index e0a2fd9..8a36574 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -3,18 +3,9 @@ Upstream-Name: qtlocation-opensource-src
 Source: https://download.qt.io/official_releases/qt/*/submodules/
 
 Files: *
-Copyright: 2015 The Qt Company Ltd.
-           2013 Aaron McCarthy <mccarthy.aaron at gmail.com>
-           2013-2014 Jolla Ltd.
-License: LGPL-2.1-or-3 with Qt-1.1 exception
-
-Files: src/imports/location/*
-       src/location/*
-       src/plugins/geoservices/nokia/*
-       src/plugins/position/winrt/*
-Copyright: 2015 The Qt Company Ltd.
-           2013 Aaron McCarthy <mccarthy.aaron at gmail.com>
-           2014 Jolla Ltd.
+Copyright: 2015-2016 The Qt Company Ltd.
+           2015-2016 Jolla Ltd.
+           2016 Aaron McCarthy <mccarthy.aaron at gmail.com>
 License: LGPL-3 or GPL-2
 
 Files: src/plugins/geoservices/mapbox/*
@@ -23,6 +14,7 @@ License: LGPL-3 or GPL-2
 
 Files: examples/*
        src/location/doc/snippets/*
+       src/positioning/doc/snippets/*
 Copyright: 2015 The Qt Company Ltd.
 License: BSD-3-clause
 
@@ -34,10 +26,36 @@ Files: src/plugins/geoservices/nokia/qgeomapversion.*
 Copyright: 2014 Appello Systems AB
 License: LGPL-3 or GPL-2
 
+Files: config.tests/*
+       tests/*
+Copyright: 2016 The Qt Company Ltd.
+License: GPL-3 with Qt-1.0 exception
+
+Files: tests/auto/qnmeapositioninfosource/tst_qnmeapositioninfosource.cpp
+Copyright: 2016 Jolla Ltd.
+           2016 The Qt Company Ltd.
+License: GPL-3 with Qt-1.0 exception
+
+Files: tests/auto/qproposedsearchresult/tst_qproposedsearchresult.cpp
+Copyright: 2016 Aaron McCarthy <mccarthy.aaron at gmail.com>
+License: GPL-3 with Qt-1.0 exception
+
+Files: tests/auto/qgeotiledmap/tst_qgeotiledmap.cpp
+Copyright: 2016 The Qt Company Ltd.
+License: LGPL-2.1-or-3 with Qt-1.1 exception
+
 Files: *.qdoc
 Copyright: 2015 The Qt Company Ltd.
 License: GFDL-NIV-1.3
 
+Files: src/location/doc/src/plugins/mapbox.qdoc
+Copyright: 2014 Canonical Ltd.
+License: GFDL-NIV-1.3
+
+Files: src/location/doc/src/plugins/osm.qdoc
+Copyright: 2015 Aaron McCarthy <mccarthy.aaron at gmail.com>
+License: GFDL-NIV-1.3
+
 Files: debian/*
 Copyright: 2007-2012 Fathi Boudra <fabo at debian.org>
            2007-2012 Sune Vuorela <debian at pusling.com>
@@ -46,8 +64,8 @@ Copyright: 2007-2012 Fathi Boudra <fabo at debian.org>
            2005-2007 Brian Nelson <pyro at debian.org>
            2012 Timo Jyrinki <timo.jyrinki at canonical.com>
            2014 Lisandro Damián Nicanor Pérez Meyer <lisandro at debian.org>
-           2014-2015 Dmitry Shachnev <mitya57 at debian.org>
-License: LGPL-2.1
+           2014-2016 Dmitry Shachnev <mitya57 at debian.org>
+License: LGPL-3 or GPL-2
 
 License: LGPL-2.1-or-3 with Qt-1.1 exception
  GNU Lesser General Public License:
@@ -90,27 +108,18 @@ License: LGPL-2.1-or-3 with Qt-1.1 exception
  Furthermore, you are not required to apply this additional permission to a
  modified version of the Library.
 
-License: LGPL-2.1
- This file may be used under the terms of the GNU Lesser
- General Public License version 2.1 as published by the Free Software
- Foundation and appearing in the file LICENSE.LGPLv21 included in the
- packaging of this file.  Please review the following information to
- ensure the GNU Lesser General Public License version 2.1 requirements
- will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
- .
- On Debian systems, the complete text of the LGPL-2.1 license can be found in
- `/usr/share/common-licenses/LGPL-2.1`,
-
 License: LGPL-3
- This file may be used under the terms of the GNU Lesser
- General Public License version 3 as published by the Free Software
- Foundation and appearing in the file LICENSE.LGPLv3 included in the
- packaging of this file.  Please review the following information to
- ensure the GNU Lesser General Public License version 3 requirements
- will be met: https://www.gnu.org/licenses/lgpl.html.
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU Lesser General Public License version 3
+ as published by the Free Software Foundation.
  .
- On Debian systems, the complete text of the LGPL-3 license can be found in
- `/usr/share/common-licenses/LGPL-3`,
+ 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 Lesser General Public License for more details.
+ .
+ On Debian systems, the complete text of the GNU Lesser General Public
+ License version 3 can be found in /usr/share/common-licenses/LGPL-3.
 
 License: GPL-2
  This program is free software; you can redistribute it and/or modify
@@ -122,9 +131,42 @@ License: GPL-2
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  GNU General Public License for more details.
  .
- On Debian GNU/Linux systems, the complete text of the GNU General
- Public License version 2 can be found in
- `/usr/share/common-licenses/GPL-2'.
+ On Debian systems, the complete text of the GNU General Public
+ License version 2 can be found in /usr/share/common-licenses/GPL-2.
+
+License: GPL-3 with Qt-1.0 exception
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License version 3 as
+ published by the Free Software Foundation.
+ .
+ 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.
+ .
+ On Debian systems, the complete text of the GNU General Public License
+ version 3 can be found in /usr/share/common-licenses/GPL-3.
+ .
+ The Qt Company GPL Exception 1.0
+ Exception 1:
+ .
+ As a special exception you may create a larger work which contains the
+ output of this application and distribute that work under terms of your
+ choice, so long as the work is not otherwise derived from or based on
+ this application and so long as the work does not in itself generate
+ output that contains the output from this application in its original
+ or modified form.
+ .
+ Exception 2:
+ .
+ As a special exception, you have permission to combine this application
+ with Plugins licensed under the terms of your choice, to produce an
+ executable, and to copy and distribute the resulting executable under
+ the terms of your choice. However, the executable must be accompanied
+ by a prominent notice offering all users of the executable the entire
+ source code to this application, excluding the source code of the
+ independent modules, but including any changes you have made to this
+ application, under the terms of this license.
 
 License: BSD-3-clause
  You may use this file under the terms of the BSD license as follows:
@@ -155,13 +197,10 @@ License: BSD-3-clause
  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
 
 License: GFDL-NIV-1.3
- GNU Free Documentation License Usage
- Alternatively, this file may be used under the terms of the GNU Free
- Documentation License version 1.3 as published by the Free Software
- Foundation and appearing in the file included in the packaging of
- this file.  Please review the following information to ensure
- the GNU Free Documentation License version 1.3 requirements
- will be met: http://www.gnu.org/copyleft/fdl.html.
- .
- On Debian systems, the complete text of the GFDL-1.3 license can be found in
- `/usr/share/common-licenses/GFDL-1.3`,
+ Permission is granted to copy, distribute and/or modify this document
+ under the terms of the GNU Free Documentation License, Version 1.3
+ or any later version published by the Free Software Foundation;
+ with no Invariant Sections, no Front-Cover Texts, and no Back-Cover Texts.
+ .
+ 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.

-- 
qtlocation packaging

