[SCM] qtmultimedia packaging branch, master, updated. e38796d8d8635cdcf10e4b1b167c5a481dc914ba

[Timo Jyrinki]

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

The following commit has been merged in the master branch:
commit fb47f00103df2c793d0f1a3813d14416808e048f
Author: Timo Jyrinki <timo.jyrinki at canonical.com>
Date:   Thu Feb 14 14:16:57 2013 +0000

    more detailed copyright information
---
 debian/copyright |   40 +++++++++++++++++++++++++++++++++++-----
 1 files changed, 35 insertions(+), 5 deletions(-)

diff --git a/debian/copyright b/debian/copyright
index fcdeb93..e1d2333 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -4,8 +4,7 @@ Source: http://releases.qt-project.org/qt5/5.0.1/submodules_tar/
 
 Files: *
 Copyright: 2012-2013 Digia Plc and/or its subsidiary(-ies)
-           2008-2012 Nokia Corporation and/or its subsidiary(-ies)
-           1994-2008 Trolltech ASA.
+           2012 Research In Motion
 License: LGPL-2.1 with Digia Qt LGPL Exception 1.1 or GPL-3
 
 Files: debian/*
@@ -80,10 +79,8 @@ License: LGPL-2.1
  On Debian systems, the complete text of the LGPL-2.1 license can be found in
  `/usr/share/common-licenses/LGPL-2.1`,
 
-Files: examples/*
+Files: examples/* src/multimedia/doc/snippets/multimedia-snippets/qsound.cpp
 Copyright: 2012-2013 Digia Plc and/or its subsidiary(-ies)
-           2008-2012 Nokia Corporation and/or its subsidiary(-ies)
-           1994-2008 Trolltech ASA.
 License: BSD-3-clause
  You may use this file under the terms of the BSD license as follows:
  .
@@ -112,3 +109,36 @@ License: BSD-3-clause
  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
 
+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
+Copyright: 2012 Digia Plc and/or its subsidiary(-ies).
+License: LGPL-2.1 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
+
+Files: examples/multimedia/spectrum/3rdparty/fftreal/fftreal.pas
+Copyright: 1999 Laurent de Soras
+License: Custom BSD like
+ Source code may be freely used for any purpose, including commercial
+ applications. Programs must display in their "About" dialog-box (or
+ documentation) a text telling they use these routines by Laurent de Soras.
+ Modified source code can be distributed, but modifications must be clearly
+ indicated.
+
+Files: *.qdoc src/multimedia/qmediametadata.cpp src/multimedia/qmultimedia.cpp
+Copyright: 2012 Digia Plc and/or its subsidiary(-ies).
+License: GFDL-1.3
+
+License: GFDL-1.3
+ GNU Free Documentation License Usage
+ Alternatively, this file may be used under the terms of the GNU Free
+ Documentation License version 1.3 as published by the Free Software
+ Foundation and appearing in the file included in the packaging of
+ this file.  Please review the following information to ensure
+ the GNU Free Documentation License version 1.3 requirements
+ will be met: http://www.gnu.org/copyleft/fdl.html.
+ .
+ On Debian systems, the complete text of the GFDL-1.3 license can be found in
+ `/usr/share/common-licenses/GFDL-1.3`,
+

-- 
qtmultimedia packaging