[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=471f952

The following commit has been merged in the master branch:
commit 471f952020f9aa2fe75054a4b65f8068a7d151c8
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date:   Thu Mar 5 11:53:41 2015 +0300

    Update debian/copyright.
---
 debian/changelog |  1 +
 debian/copyright | 48 +++++++++++++++++++++++-------------------------
 2 files changed, 24 insertions(+), 25 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 9c9c30d..872bfa9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ qtmultimedia-opensource-src (5.4.1-1) UNRELEASED; urgency=medium
   * New upstream release.
   * Bump Qt build-dependencies to 5.4.1.
   * Update debian/watch to point to https://download.qt.io/.
+  * Update debian/copyright.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Thu, 05 Mar 2015 11:38:44 +0300
 
diff --git a/debian/copyright b/debian/copyright
index 4aea5fa..9c757be 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,6 +1,6 @@
 Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: qtmultimedia-opensource-src
-Source: http://releases.qt-project.org/qt5/*/submodules/
+Source: https://download.qt.io/official_releases/qt/*/submodules/
 
 Files: debian/*
 Copyright: 2007-2012 Fathi Boudra <fabo at debian.org>
@@ -14,13 +14,13 @@ Copyright: 2007-2012 Fathi Boudra <fabo at debian.org>
 License: LGPL-2.1
 
 Files: *
-Copyright: 2012-2013 Digia Plc and/or its subsidiary(-ies)
-           2012 Research In Motion
-License: LGPL-2.1-or-3 with Digia Qt LGPL Exception 1.1 or GPL-3
+Copyright: 2012-2014 Digia Plc and/or its subsidiary(-ies)
+           2012-2013 Research In Motion
+License: LGPL-2.1-or-3 with Digia-1.1 exception
 
 Files: config.tests/mmrenderer/*
 Copyright: 2013 BlackBerry Limited
-License: LGPL-2.1-or-3 with Digia Qt LGPL Exception 1.1 or GPL-3
+License: LGPL-2.1-or-3 with Digia-1.1 exception
 
 Files: examples/*
  src/multimedia/doc/snippets/multimedia-snippets/qsound.cpp
@@ -28,16 +28,12 @@ Copyright: 2012-2013 Digia Plc and/or its subsidiary(-ies)
 License: BSD-3-clause
 
 Files: examples/multimedia/spectrum/3rdparty/fftreal/*
-Copyright: 2005 Laurent de Soras
+Copyright: 2003-2005 Laurent de Soras
 License: LGPL-2.1
 
 Files: examples/multimedia/video/*
 Copyright: 2012 Digia Plc and/or its subsidiary(-ies).
-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
-License: LGPL-2.1
+License: LGPL-2.1-or-3 with Digia-1.1 exception
 
 Files: examples/multimedia/spectrum/3rdparty/fftreal/fftreal.pas
 Copyright: 1999 Laurent de Soras
@@ -48,13 +44,28 @@ License: custom-fftreal
  Modified source code can be distributed, but modifications must be clearly
  indicated.
 
+Files: src/imports/multimedia/qdeclarativecameraviewfinder*
+       src/plugins/gstreamer/camerabin/camerabininfocontrol.*
+       src/plugins/resourcepolicy/*
+       src/plugins/videonode/egl/*
+Copyright: 2013-2014 Jolla Ltd.
+License: LGPL-2.1-or-3 with Digia-1.1 exception
+
+Files: src/plugins/android/src/mediacapture/qandroidmediavideoprobecontrol.*
+Copyright: 2013 Integrated Computer Solutions, Inc
+License: LGPL-2.1-or-3 with Digia-1.1 exception
+
+Files: src/plugins/videonode/imx6/*
+Copyright: 2014 Pelagicore AG
+License: LGPL-2.1-or-3 with Digia-1.1 exception
+
 Files: *.qdoc
  src/multimedia/qmediametadata.cpp
  src/multimedia/qmultimedia.cpp
 Copyright: 2012 Digia Plc and/or its subsidiary(-ies).
 License: GFDL-NIV-1.3
 
-License: LGPL-2.1-or-3 with Digia Qt LGPL Exception 1.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 or version 3 as published by the Free Software
@@ -94,19 +105,6 @@ License: LGPL-2.1-or-3 with Digia Qt LGPL Exception 1.1
  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

-- 
qtmultimedia packaging