[SCM] qtmultimedia packaging branch, kubuntu_unstable, updated. debian/5.5.0-3

[Rohan Garg]

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

The following commit has been merged in the kubuntu_unstable branch:
commit 73c03249fffe5980028146bb2be908033a5f8905
Author: Lisandro Damián Nicanor Pérez Meyer <perezmeyer at gmail.com>
Date:   Mon Aug 24 23:17:26 2015 -0300

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

diff --git a/debian/changelog b/debian/changelog
index f613429..0cf8f4f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,7 @@ qtmultimedia-opensource-src (5.5.0-1) UNRELEASED; urgency=medium
   * Update symbols files with current build log.
   * Mark private symbols in symbols files. It should make handling the later
     much easier.
+  * Update debian/copyright.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Mon, 24 Aug 2015 20:40:09 -0300
 
diff --git a/debian/copyright b/debian/copyright
index 9c757be..b8ca73d 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -11,20 +11,22 @@ Copyright: 2007-2012 Fathi Boudra <fabo at debian.org>
            2012 Zoltán Balogh <zoltan.balogh at canonical.com>
            2012-2014 Timo Jyrinki <timo.jyrinki at canonical.com>,
            2013-2014 Dmitry Shachnev <mitya57 at debian.org>
+           2012-2015 Lisandro Damián Nicanor Pérez Meyer <lisandro at debian.org>
 License: LGPL-2.1
 
 Files: *
-Copyright: 2012-2014 Digia Plc and/or its subsidiary(-ies)
+Copyright: 2012-2014 The Qt Company Ltd
            2012-2013 Research In Motion
-License: LGPL-2.1-or-3 with Digia-1.1 exception
+           2014 Canonical Ltd.
+License: LGPL-2.1-or-3 with Qt-Company-1.1 exception
 
 Files: config.tests/mmrenderer/*
 Copyright: 2013 BlackBerry Limited
-License: LGPL-2.1-or-3 with Digia-1.1 exception
+License: LGPL-2.1-or-3 with Qt-Company-1.1 exception
 
 Files: examples/*
  src/multimedia/doc/snippets/multimedia-snippets/qsound.cpp
-Copyright: 2012-2013 Digia Plc and/or its subsidiary(-ies)
+Copyright: 2012-2013 The Qt Company Ltd
 License: BSD-3-clause
 
 Files: examples/multimedia/spectrum/3rdparty/fftreal/*
@@ -32,8 +34,8 @@ 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-1.1 exception
+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
@@ -49,23 +51,23 @@ Files: src/imports/multimedia/qdeclarativecameraviewfinder*
        src/plugins/resourcepolicy/*
        src/plugins/videonode/egl/*
 Copyright: 2013-2014 Jolla Ltd.
-License: LGPL-2.1-or-3 with Digia-1.1 exception
+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 Digia-1.1 exception
+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 Digia-1.1 exception
+License: LGPL-2.1-or-3 with Qt-Company-1.1 exception
 
 Files: *.qdoc
  src/multimedia/qmediametadata.cpp
  src/multimedia/qmultimedia.cpp
-Copyright: 2012 Digia Plc and/or its subsidiary(-ies).
+Copyright: 2012 The Qt Company Ltd.
 License: GFDL-NIV-1.3
 
-License: LGPL-2.1-or-3 with Digia-1.1 exception
+License: LGPL-2.1-or-3 with Qt-Company-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

-- 
qtmultimedia packaging