[SCM] qtmultimedia packaging branch, master, updated. debian/5.4.2-1

[Lisandro Damián Nicanor Pérez]

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

The following commit has been merged in the master branch:
commit c6bebe44a4d01c444e55b2c9447052d063d5dc17
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date:   Mon Dec 22 13:54:06 2014 +0300

    Update debian/copyright to reflect LGPL v3 addition.
---
 debian/changelog |  3 +++
 debian/copyright | 26 ++++++++++++++------------
 2 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 3cf1f6c..9f7843c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,9 @@ qtmultimedia-opensource-src (5.4.0-1) UNRELEASED; urgency=medium
     to qtmultimedia5-dev.install-common and update debian/rules to handle
     those similar to how it's done in qtbase.
 
+  [ Dmitry Shachnev ]
+  * Update debian/copyright to reflect LGPL v3 addition.
+
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Mon, 15 Dec 2014 07:55:37 +0000
 
 qtmultimedia-opensource-src (5.3.2-5) unstable; urgency=medium
diff --git a/debian/copyright b/debian/copyright
index 8b9e97f..064b9a1 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -15,11 +15,11 @@ License: LGPL-2.1
 Files: *
 Copyright: 2012-2013 Digia Plc and/or its subsidiary(-ies)
            2012 Research In Motion
-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: config.tests/mmrenderer/*
 Copyright: 2013 BlackBerry Limited
-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/multimedia/doc/snippets/multimedia-snippets/qsound.cpp
@@ -48,7 +48,7 @@ Files: examples/multimedia/video/qmlvideofx/filereader.h
  examples/multimedia/video/snippets/
  frequencymonitor/frequencymonitor.cpp
 Copyright: 2012 Digia Plc and/or its subsidiary(-ies).
-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/multimedia/spectrum/3rdparty/fftreal/*
 Copyright: 2003-2005 Laurent de Soras
@@ -69,21 +69,23 @@ Files: *.qdoc
 Copyright: 2012 Digia Plc and/or its subsidiary(-ies).
 License: GFDL-NIV-1.3
 
-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 Qt LGPL Exception 1.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

-- 
qtmultimedia packaging