[SCM] qtmultimedia packaging branch, experimental, updated. debian/5.5.1-3-6-g9caa5e9

[Lisandro Damián Nicanor Pérez]

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

The following commit has been merged in the experimental branch:
commit 9caa5e90e33bc012d8e6e3bde6cb77dc7f0ae70e
Author: Lisandro Damián Nicanor Pérez Meyer <perezmeyer at gmail.com>
Date:   Sat Jan 16 23:20:27 2016 -0300

    Update and simplify debian/copyright.
---
 debian/changelog |  1 +
 debian/copyright | 25 +++++--------------------
 2 files changed, 6 insertions(+), 20 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index ef063e7..a909dd6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,7 @@ qtmultimedia-opensource-src (5.6.0~beta-1) UNRELEASED; urgency=medium
   * Update and sort install files.
   * Update symbols files using migrate-symbols.py script and bumping minimum
     version to 5.6.0~beta.
+  * Update and simplify debian/copyright.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Thu, 07 Jan 2016 18:26:14 -0300
 
diff --git a/debian/copyright b/debian/copyright
index b8ca73d..5cca591 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -18,6 +18,10 @@ Files: *
 Copyright: 2012-2014 The Qt Company Ltd
            2012-2013 Research In Motion
            2014 Canonical Ltd.
+           2013-2015 Jolla Ltd.
+           2013 Integrated Computer Solutions, Inc
+           2014 Pelagicore AG
+           2015 Denis Shienkov <denis.shienkov at gmail.com>
 License: LGPL-2.1-or-3 with Qt-Company-1.1 exception
 
 Files: config.tests/mmrenderer/*
@@ -33,10 +37,6 @@ Files: examples/multimedia/spectrum/3rdparty/fftreal/*
 Copyright: 2003-2005 Laurent de Soras
 License: LGPL-2.1
 
-Files: examples/multimedia/video/*
-Copyright: 2012 The Qt Company Ltd.
-License: LGPL-2.1-or-3 with Qt-Company-1.1 exception
-
 Files: examples/multimedia/spectrum/3rdparty/fftreal/fftreal.pas
 Copyright: 1999 Laurent de Soras
 License: custom-fftreal
@@ -46,21 +46,6 @@ 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 Qt-Company-1.1 exception
-
-Files: src/plugins/android/src/mediacapture/qandroidmediavideoprobecontrol.*
-Copyright: 2013 Integrated Computer Solutions, Inc
-License: LGPL-2.1-or-3 with Qt-Company-1.1 exception
-
-Files: src/plugins/videonode/imx6/*
-Copyright: 2014 Pelagicore AG
-License: LGPL-2.1-or-3 with Qt-Company-1.1 exception
-
 Files: *.qdoc
  src/multimedia/qmediametadata.cpp
  src/multimedia/qmultimedia.cpp
@@ -76,7 +61,7 @@ License: LGPL-2.1-or-3 with Qt-Company-1.1 exception
  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
+ In addition, as a special exception, The Qt Company 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.
  .

-- 
qtmultimedia packaging