[SCM] qtx11extras packaging branch, master, updated. aba351df512381c7ed1c234f38049cf3ac3daa82

[Lisandro Damián Nicanor Pérez]

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

The following commit has been merged in the master branch:
commit aba351df512381c7ed1c234f38049cf3ac3daa82
Author: Lisandro Damián Nicanor Pérez Meyer <perezmeyer at gmail.com>
Date:   Sat Jul 27 15:13:28 2013 -0300

    Improve copyright file.
---
 debian/copyright |   29 ++++++++++++++++++++++++++---
 1 file changed, 26 insertions(+), 3 deletions(-)

diff --git a/debian/copyright b/debian/copyright
index 2ac2bfd..4d3931e 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -6,6 +6,10 @@ Files: *
 Copyright: 2012 Digia Plc and/or its subsidiary(-ies).
 License: LGPL-2.1 with Digia Qt LGPL Exception 1.1 or GPL-3
 
+Files: *.qdoc
+Copyright: 2012 Digia Plc and/or its subsidiary(-ies).
+License: GFDL-NIV-1.3
+
 Files: debian/*
 Copyright: 2007-2012 Fathi Boudra <fabo at debian.org>
            2007-2012 Sune Vuorela <debian at pusling.com>
@@ -55,6 +59,25 @@ License: LGPL-2.1 with Digia Qt LGPL Exception 1.1
  Furthermore, you are not required to apply this additional permission to a
  modified version of the Library.
 
-Files: *.qdoc
-Copyright: 2012 Digia Plc and/or its subsidiary(-ies).
-License: GFDL-1.3
+License: LGPL-2.1
+ This file may be used under the terms of the GNU Lesser General Public
+ License version 2.1 as published by the Free Software Foundation and
+ appearing in the file LICENSE.LGPL included in the packaging of this file.
+ Please review the following information to ensure the GNU Lesser General
+ Public License version 2.1 requirements will be met:
+ http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+ .
+ On Debian systems, the complete text of the GNU Lesser General Public License
+ can be found in `/usr/share/common-licenses/LGPL-2.1`.
+
+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
+ 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`.
\ No newline at end of file

-- 
qtx11extras packaging