[SCM] qtsensors packaging branch, experimental, updated. debian/5.3.2+dfsg-2-5-g77608f7

[Dmitry Shachnev]

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

The following commit has been merged in the experimental branch:
commit 5e4840a338d2ba9151e9b0d4c20d2c12acade64e
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date:   Fri Dec 26 12:32:33 2014 +0300

    Update and clean up debian/copyright.
---
 debian/changelog |  2 +-
 debian/copyright | 40 +++++++++++++++-------------------------
 2 files changed, 16 insertions(+), 26 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 9de608a..20e29db 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,7 +3,7 @@ qtsensors-opensource-src (5.4.0+dfsg-1) UNRELEASED; urgency=medium
   [ Dmitry Shachnev ]
   * New upstream release.
   * Bump Qt build-dependencies to 5.4.0.
-  * Remove unused paragraph in debian/copyright.
+  * Update and clean up debian/copyright.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Wed, 08 Oct 2014 22:08:41 +0400
 
diff --git a/debian/copyright b/debian/copyright
index edd71c4..c382e28 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -7,7 +7,7 @@ Files: *
 Copyright: 2012-2014 Digia Plc and/or its subsidiary(-ies)
            2013 BogDan Vatra <bogdan at kde.org>
            2012 Lorn Potter
-License: LGPL-2.1 with Digia-1.1 exception or GPL-3
+License: LGPL-2.1-or-3 with Digia-1.1 exception
 
 Files: debian/*
 Copyright: 2007-2012 Fathi Boudra <fabo at debian.org>
@@ -16,6 +16,7 @@ Copyright: 2007-2012 Fathi Boudra <fabo at debian.org>
            2007-2009 Ana Beatriz Guerrero Lopez <ana at debian.org>
            2005-2007 Brian Nelson <pyro at debian.org>
            2012-2013 Timo Jyrinki <timo.jyrinki at canonical.com>
+           2013-2014 Dmitry Shachnev <mitya57 at debian.org>
 License: LGPL-2.1
 
 Files: config.tests/bbsensor_compass/main.cpp
@@ -36,11 +37,11 @@ Files: config.tests/bbsensor_compass/main.cpp
        src/sensors/qambienttemperaturesensor.h
        src/sensors/qholstersensor.cpp
 Copyright: 2012 Research In Motion
-License: LGPL-2.1 with Digia-1.1 exception or GPL-3
+License: LGPL-2.1-or-3 with Digia-1.1 exception
 
 Files: src/plugins/sensors/android/src/androidaccelerometer.cpp
 Copyright: 2014 BlackBerry Limited
-License: LGPL-2.1 with Digia-1.1 exception or GPL-3
+License: LGPL-2.1-or-3 with Digia-1.1 exception
 
 Files: examples/*
        src/sensors/doc/snippets/*
@@ -55,7 +56,7 @@ Files: examples/sensors/sensor_explorer/import/propertyinfo.h
        examples/sensors/sensor_explorer/import/explorer.h
        examples/sensors/sensor_explorer/import/sensoritem.cpp
 Copyright: 2012 Digia Plc and/or its subsidiary(-ies).
-License: LGPL-2.1 with Digia-1.1 exception or GPL-3
+License: LGPL-2.1-or-3 with Digia-1.1 exception
 
 Files: doc/config/scripts/superfish.js
 Copyright: 2008 Joel Birch
@@ -80,20 +81,22 @@ License: GFDL-NIV-1.3
  `/usr/share/common-licenses/GFDL-1.3`,
 
 License: LGPL-2.1 with Digia-1.1 exception
- GNU Lesser General Public License version 2.1:
+ 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
@@ -117,19 +120,6 @@ License: LGPL-2.1 with Digia-1.1 exception
  Furthermore, you are not required to apply this additional permission to a
  modified version of the Library.
 
-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

-- 
qtsensors packaging