[SCM] qtmultimedia packaging branch, master, updated. 65f3959c4355eccab82e68a2ea1aa0fb72bb8d6b

[Lisandro Damián Nicanor Pérez]

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

The following commit has been merged in the master branch:
commit 65f3959c4355eccab82e68a2ea1aa0fb72bb8d6b
Author: Lisandro Damián Nicanor Pérez Meyer <perezmeyer at gmail.com>
Date:   Sat Apr 27 21:00:03 2013 -0300

    Put licenses at the bottom.
    
    The GFDL files have no invariant sections.
---
 debian/copyright |   56 ++++++++++++++++++++++++++++-------------------------
 1 files changed, 30 insertions(+), 26 deletions(-)

diff --git a/debian/copyright b/debian/copyright
index feafe15..5588e6b 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -17,6 +17,34 @@ Copyright: 2007-2012 Fathi Boudra <fabo at debian.org>
            2012-2013 Timo Jyrinki <timo.jyrinki at canonical.com>
 License: LGPL-2.1
 
+Files: examples/* src/multimedia/doc/snippets/multimedia-snippets/qsound.cpp
+Copyright: 2012-2013 Digia Plc and/or its subsidiary(-ies)
+License: BSD-3-clause
+
+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-NIV-1.3
+
 License: LGPL-2.1 with Digia Qt LGPL Exception 1.1
  GNU Lesser General Public License version 2.1:
  This file may be used under the terms of the GNU Lesser General Public
@@ -79,8 +107,6 @@ 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/* src/multimedia/doc/snippets/multimedia-snippets/qsound.cpp
-Copyright: 2012-2013 Digia Plc and/or its subsidiary(-ies)
 License: BSD-3-clause
  You may use this file under the terms of the BSD license as follows:
  .
@@ -109,28 +135,7 @@ 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
+License: GFDL-NIV-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
@@ -140,5 +145,4 @@ License: GFDL-1.3
  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`,
-
+ `/usr/share/common-licenses/GFDL-1.3`,
\ No newline at end of file

-- 
qtmultimedia packaging