[SCM] qtlocation packaging branch, experimental, updated. debian/5.3.2-2-7-g82f176b

[Dmitry Shachnev]

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

The following commit has been merged in the experimental branch:
commit 95a65754f5b5688b3e5c30a02e54d1d284988adb
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date:   Sat Dec 27 15:51:39 2014 +0300

    Update debian/copyright.
---
 debian/changelog |  1 +
 debian/copyright | 42 ++++++++++++++----------------------------
 2 files changed, 15 insertions(+), 28 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 15e7d1e..82f4e2e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,7 @@ qtlocation-opensource-src (5.4.0-1) UNRELEASED; urgency=medium
   * Bump Qt build-dependencies to 5.4.0.
   * Drop disable_qgeocircle_extendShape_tests.patch, no longer needed.
   * Build-depend on qtbase5-doc-html, for docs linking.
+  * Update debian/copyright.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sat, 27 Dec 2014 15:35:49 +0300
 
diff --git a/debian/copyright b/debian/copyright
index d0c4657..bc30639 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -3,11 +3,11 @@ Upstream-Name: qtlocation
 Source: http://qt.gitorious.org/qt/qtlocation
 
 Files: *
-Copyright: 2012-2013 Digia Plc and/or its subsidiary(-ies)
+Copyright: 2012-2014 Digia Plc and/or its subsidiary(-ies)
            2012-2013 BlackBerry Limited
            2013 Aaron McCarthy <mccarthy.aaron at gmail.com>
            2013 Jolla Ltd.
-License: LGPL-2.1 with Digia Qt LGPL Exception 1.1 or GPL-3
+License: LGPL-2.1-or-3 with Digia-1.1 exception
 
 Files: examples/*
        location/doc/snippets/*
@@ -31,23 +31,26 @@ 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>
 License: LGPL-2.1
 
-License: LGPL-2.1 with Digia Qt LGPL Exception 1.1
- GNU Lesser General Public License version 2.1:
+License: LGPL-2.1-or-3 with Digia-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 as published by the Free Software Foundation and
- appearing in the file LICENSE.LGPL 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.
+ License version 2.1 or version 3 as published by the Free Software
+ Foundation and appearing in the file LICENSE.LGPLv21 and LICENSE.LGPLv3
+ included in the packaging of this file. Please review the following
+ 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.
  .
- On Debian systems, the complete text of the GNU Lesser General Public License
- can be found in `/usr/share/common-licenses/LGPL-2.1`.
+ 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:
  As an additional permission to the GNU Lesser General Public License version
@@ -71,23 +74,6 @@ License: LGPL-2.1 with Digia Qt LGPL Exception 1.1
  Furthermore, you are not required to apply this additional permission to a
  modified version of the Library.
 
-Files: tests/auto/cmake/test_modules/main.cpp
-Copyright: 2012 Klarälvdalens Datakonsult AB, a KDAB Group company
-License: LGPL-2.1 with Digia Qt LGPL Exception 1.1 or GPL-3
-
-License: GPL-3
- GNU General Public License Usage
- .
- Alternatively, this file may be used under the terms of the GNU
- General Public License version 3.0 as published by the Free Software
- Foundation and appearing in the file LICENSE.GPL included in the
- packaging of this file.  Please review the following information to
- ensure the GNU General Public License version 3.0 requirements will be
- met: http://www.gnu.org/copyleft/gpl.html.
- .
- On Debian systems, the complete text of the license can be found in
- `/usr/share/common-licenses/GPL-3`.
-
 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

-- 
qtlocation packaging