[SCM] qtconnectivity packaging branch, experimental, updated. debian/5.3.2-2-4-g25ee9b9

[Lisandro Damián Nicanor Pérez]

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

The following commit has been merged in the experimental branch:
commit 8a899e2822ed96797c72a75d67fce33762beda4b
Author: Lisandro Damián Nicanor Pérez Meyer <perezmeyer at gmail.com>
Date:   Thu Dec 18 18:17:34 2014 -0300

    Update debian/copyright with new LGPL license.
---
 debian/changelog |  1 +
 debian/copyright | 22 ++++++++++++----------
 2 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 5db07e6..c471a03 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ qtconnectivity-opensource-src (5.4.0-1) UNRELEASED; urgency=medium
 
   [ Lisandro Damián Nicanor Pérez Meyer ]
   * New upstream release.
+  * Update debian/copyright with new LGPL 3 license.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Thu, 18 Dec 2014 11:35:32 -0300
 
diff --git a/debian/copyright b/debian/copyright
index fbadd1a..b116859 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -6,7 +6,7 @@ Files: *
 Copyright: 2013-2014 Digia Plc and/or its subsidiary(-ies)
            2011-2014 Research In Motion (aka Blackberry)
            2012 Klarälvdalens Datakonsult AB, a KDAB Group company
-License: LGPL-2.1 with Digia Qt LGPL Exception 1.1 or GPL-3
+License: LGPL-2.1-or-3 with Digia Qt LGPL Exception 1.1 or GPL-3
 
 Files: examples/*
        src/nfc/doc/snippets/*
@@ -41,21 +41,23 @@ Copyright: 2013 Aaron McCarthy <mccarthy.aaron at gmail.com>
            2014 Digia Plc and/or its subsidiary(-ies)
 License: BSD-3-clause
 
-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

-- 
qtconnectivity packaging