[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=bf8f332

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

    More debian/copyright updates.
---
 debian/changelog |  2 +-
 debian/copyright | 21 +++------------------
 2 files changed, 4 insertions(+), 19 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index d4f0eca..39c4c58 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,7 +10,7 @@ qtmultimedia-opensource-src (5.4.0-1) UNRELEASED; urgency=medium
 
   [ Dmitry Shachnev ]
   * Drop also_build_alsa_plugin.patch, applied upstream.
-  * Update debian/copyright to reflect LGPL v3 addition.
+  * Update debian/copyright.
   * Update Vcs-Browser field to point to cgit interface.
   * Add qtbase5-doc-html to Build-Depends-Indep to make sure docs
     are properly linked with qtbase.
diff --git a/debian/copyright b/debian/copyright
index ccaad7d..4aea5fa 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -9,7 +9,8 @@ Copyright: 2007-2012 Fathi Boudra <fabo at debian.org>
            2007-2009 Ana Beatriz Guerrero Lopez <ana at debian.org>
            2005-2007 Brian Nelson <pyro at debian.org>
            2012 Zoltán Balogh <zoltan.balogh at canonical.com>
-           2012-2013 Timo Jyrinki <timo.jyrinki at canonical.com>
+           2012-2014 Timo Jyrinki <timo.jyrinki at canonical.com>,
+           2013-2014 Dmitry Shachnev <mitya57 at debian.org>
 License: LGPL-2.1
 
 Files: *
@@ -30,23 +31,7 @@ Files: examples/multimedia/spectrum/3rdparty/fftreal/*
 Copyright: 2005 Laurent de Soras
 License: LGPL-2.1
 
-Files: examples/multimedia/video/qmlvideofx/filereader.h
- examples/multimedia/video/qmlvideofx/images/titlebar.sci
- examples/multimedia/video/qmlvideofx/filereader.cpp
- examples/multimedia/video/qmlvideofx/main.cpp
- examples/multimedia/video/qmlvideofx/trace.h
- examples/multimedia/video/qmlvideofx/qmlapplicationviewer/qmlapplicationviewer.cpp
- examples/multimedia/video/qmlvideofx/qmlapplicationviewer/qmlapplicationviewer.h
- examples/multimedia/video/qmlvideo/main.cpp
- examples/multimedia/video/qmlvideo/trace.h
- examples/multimedia/video/snippets/performancemonitor/performancemonitor.cpp
- examples/multimedia/video/snippets/performancemonitor/performancemonitor.h
- examples/multimedia/video/snippets/performancemonitor/performancemonitordeclarative.h
- examples/multimedia/video/snippets/performancemonitor/performancemonitordeclarative.cpp
- examples/multimedia/video/snippets/frequencymonitor/frequencymonitordeclarative.cpp
- examples/multimedia/video/snippets/frequencymonitor/frequencymonitor.h
- examples/multimedia/video/snippets/
- frequencymonitor/frequencymonitor.cpp
+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
 

-- 
qtmultimedia packaging