[SCM] qtsvg packaging branch, master, updated. bff4e875443ac49681b9c3944b5c7a5f65ad0a36

Lisandro Damián Nicanor Pérez lisandro at alioth.debian.org
Mon Apr 22 16:34:43 UTC 2013


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

The following commit has been merged in the master branch:
commit bff4e875443ac49681b9c3944b5c7a5f65ad0a36
Author: Lisandro Damián Nicanor Pérez Meyer <perezmeyer at gmail.com>
Date:   Mon Apr 22 13:34:10 2013 -0300

    Put files listing on top.
    
    The GFDL licensed docs do not have invariant sections.
---
 debian/copyright |   17 +++++++++--------
 1 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/debian/copyright b/debian/copyright
index 0c93c5b..5902edd 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -15,6 +15,14 @@ Copyright: 2007-2012 Fathi Boudra <fabo at debian.org>
            2012-2013 Timo Jyrinki <timo.jyrinki at canonical.com>
 License: LGPL-2.1
 
+Files: src/svg/qtsvgglobal.h
+Copyright: 2012 Intel Corporation
+License: LGPL-2.1 with Digia Qt LGPL exception or GPL-3
+
+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
  GNU Lesser General Public License version 2.1:
  This file may be used under the terms of the GNU Lesser General Public
@@ -77,10 +85,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: src/svg/qtsvgglobal.h
-Copyright: 2012 Intel Corporation
-License: LGPL-2.1 with Digia Qt LGPL exception or GPL-3
-
 Files: src/svg/qsvghandler.cpp src/svg/doc/src/svglicense.qdoc
 Copyright: 2002 USC/Information Sciences Institute
            2012 Digia Plc and/or its subsidiary(-ies).
@@ -146,11 +150,8 @@ Files: examples/svg/embedded/fluidlauncher/fluidlauncher.h examples/svg/embedded
 Copyright: 2012 Digia Plc and/or its subsidiary(-ies).
 License: LGPL-2.1 with Digia Qt LGPL exception or GPL-3
 
-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

-- 
qtsvg packaging



More information about the pkg-kde-commits mailing list