[SCM] qtlocation packaging branch, experimental, updated. debian/5.4.2-2-18-gf1c64bc

Thu Aug 27 18:33:48 UTC 2015

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

The following commit has been merged in the experimental branch:
commit f1c64bc16a3ef59c9185b50740142db9b3b1ed22
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date:   Thu Aug 27 21:33:34 2015 +0300

    Update debian/copyright.
---
 debian/changelog |  1 +
 debian/copyright | 78 ++++++++++++++++++++++++++++++++++++++++++++------------
 2 files changed, 63 insertions(+), 16 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index d67a9ce..8652c04 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,7 @@ qtlocation-opensource-src (5.5.0-1) UNRELEASED; urgency=medium
   * Update install files for the new release.
   * Bump Qt build-dependencies to 5.5.0.
   * Add libqt5xcbqpa5 build-dependency, it is needed to run tests under Xvfb.
+  * Update debian/copyright.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Mon, 24 Aug 2015 11:51:52 +0300
 
diff --git a/debian/copyright b/debian/copyright
index 1e55c80..0abc887 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -3,24 +3,44 @@ Upstream-Name: qtlocation-opensource-src
 Source: https://download.qt.io/official_releases/qt/*/submodules/
 
 Files: *
-Copyright: 2012-2014 Digia Plc and/or its subsidiary(-ies)
-           2012-2013 BlackBerry Limited
+Copyright: 2015 The Qt Company Ltd.
            2013 Aaron McCarthy <mccarthy.aaron at gmail.com>
-           2013 Jolla Ltd.
-License: LGPL-2.1-or-3 with Digia-1.1 exception
+           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.
+License: LGPL-3 or GPL-2
+
+Files: src/plugins/geoservices/mapbox/*
+Copyright: 2014 Canonical Ltd.
+License: LGPL-3 or GPL-2
+
+Files: src/plugins/position/blackberry/*
+Copyright: 2012-2013 BlackBerry Limited
+License: LGPL-2.1-or-3 with Qt-1.1 exception
 
 Files: examples/*
        src/location/doc/snippets/*
        tests/applications/declarative_map/*
-Copyright: 2012 Digia Plc and/or its subsidiary(-ies)
+Copyright: 2015 The Qt Company Ltd.
 License: BSD-3-clause
 
 Files: src/3rdparty/poly2tri/*
 Copyright: 2009-2010, Poly2Tri Contributors
 License: BSD-3-clause
 
+Files: src/plugins/geoservices/nokia/qgeomapversion.*
+Copyright: 2014 Appello Systems AB
+License: LGPL-3 or GPL-2
+
 Files: *.qdoc
-Copyright: 2012 Digia Plc and/or its subsidiary(-ies).
+Copyright: 2015 The Qt Company Ltd.
 License: GFDL-NIV-1.3
 
 Files: debian/*
@@ -31,10 +51,10 @@ 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 Dmitry Shachnev <mitya57 at debian.org>
+           2014-2015 Dmitry Shachnev <mitya57 at debian.org>
 License: LGPL-2.1
 
-License: LGPL-2.1-or-3 with Digia-1.1 exception
+License: LGPL-2.1-or-3 with Qt-1.1 exception
  GNU Lesser General Public License:
  This file may be used under the terms of the GNU Lesser General Public
  License version 2.1 or version 3 as published by the Free Software
@@ -43,16 +63,17 @@ License: LGPL-2.1-or-3 with Digia-1.1 exception
  information to ensure the GNU Lesser General Public License requirements
  will be met: https://www.gnu.org/licenses/lgpl.html.
  .
- In addition, as a special exception, Digia gives you certain additional
- rights. These rights are described in the Digia Qt LGPL Exception
- version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+ In addition, as a special exception, The Qt Company gives you certain
+ additional rights. These rights are described in The Qt Company Qt LGPL
+ Exception version 1.1, included in the file LGPL_EXCEPTION.txt in this
+ package.
  .
  On Debian systems, the complete text of the GNU Lesser General Public
  License version 2.1 can be found in `/usr/share/common-licenses/LGPL-2.1`.
  The complete text of the GNU Lesser General Public License version 3 can be
  found in `/usr/share/common-licenses/LGPL-3`.
  .
- Digia Qt LGPL Exception version 1.1:
+ The Qt Company LGPL Exception version 1.1:
  As an additional permission to the GNU Lesser General Public License version
  2.1, the object code form of a "work that uses the Library" may incorporate
  material from a header file that is part of the Library.  You may distribute
@@ -77,7 +98,7 @@ License: LGPL-2.1-or-3 with Digia-1.1 exception
 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.LGPL included in the
+ 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.
@@ -85,6 +106,31 @@ License: LGPL-2.1
  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.
+ .
+ On Debian systems, the complete text of the LGPL-3 license 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
+ it under the terms of the GNU General Public License version 2 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 GNU/Linux systems, the complete text of the GNU General
+ Public License version 2 can be found in
+ `/usr/share/common-licenses/GPL-2'.
+
 License: BSD-3-clause
  You may use this file under the terms of the BSD license as follows:
  .
@@ -97,9 +143,9 @@ License: BSD-3-clause
      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.
+   * Neither the name of The Qt Company Ltd 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

-- 
qtlocation packaging

