[SCM] qtdoc packaging branch, master, updated. c3f9ee4481a22153846d229f40083503ba74c5d6

[Lisandro Damián Nicanor Pérez]

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

The following commit has been merged in the master branch:
commit c3f9ee4481a22153846d229f40083503ba74c5d6
Author: Lisandro Damián Nicanor Pérez Meyer <perezmeyer at gmail.com>
Date:   Fri May 10 22:23:37 2013 -0300

    It's a NIV GFDL.
    
    Put license at bottom, file listing in the top.
---
 debian/copyright |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/debian/copyright b/debian/copyright
index a722b31..054bc58 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -23,6 +23,10 @@ Files: tools/pngdumper/*.qml
 Copyright: 2013 Digia Plc and/or its subsidiary(-ies)
 License: BSD-3-clause
 
+Files: *.qdoc
+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
@@ -85,11 +89,7 @@ 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: *.qdoc
-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

-- 
qtdoc packaging