[SCM] qtbase packaging branch, experimental, updated. debian/5.7.0+dfsg-3-8-g4669c77

[Dmitry Shachnev]

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

The following commit has been merged in the experimental branch:
commit 4669c772f7a8e8c5ce25d819ba5cfbe6034db246
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date:   Fri Oct 21 11:22:01 2016 +0300

    Rename GFDL-1.3 to GFDL-NIV-1.3 as the copyright format requires.
---
 debian/changelog                |  2 +-
 debian/copyright                | 27 ++++++++++++---------------
 debian/scripts/update-copyright |  4 ++--
 3 files changed, 15 insertions(+), 18 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 191da36..380e1dc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,7 +4,7 @@ qtbase-opensource-src (5.7.1~20161021+dfsg-1) UNRELEASED; urgency=medium
   * New upstream snapshot.
   * Drop debian/patches/qdevicediscovery_dummy.diff, applied upstream.
   * Update the copyright script to use a stricter formula for GPL-2 license.
-  * Automated debian/copyright update.
+  * Update debian/copyright.
 
   [ Lisandro Damián Nicanor Pérez Meyer ]
   * Require pkg-kde-tools (>= 0.15.17~) to allow using backported versions.
diff --git a/debian/copyright b/debian/copyright
index 0446015..37d739f 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -46,7 +46,7 @@ License: BSD-3-clause
 
 Files: *.qdoc
 Copyright: 2016 The Qt Company Ltd.
-License: GFDL-1.3
+License: GFDL-NIV-1.3
 
 # Debian packaging copyright
 
@@ -152,17 +152,17 @@ Files: src/corelib/doc/snippets/code/src_corelib_kernel_qabstractnativeeventfilt
 Copyright: 2015-2016 Samuel Gaist <samuel.gaist at edeltech.ch>
 License: BSD-3-clause
 
-## GFDL-1.3
+## GFDL-NIV-1.3
 
 Files: src/testlib/doc/src/qttestlib-manual.qdoc
 Copyright: 2016 Intel Corporation.
            2016 The Qt Company Ltd.
-License: GFDL-1.3
+License: GFDL-NIV-1.3
 
 Files: examples/widgets/doc/mousebuttons.qdoc
 Copyright: 2016 Rick Stockton <rickstockton at reno-computerhelp.com>
            2016 The Qt Company Ltd.
-License: GFDL-1.3
+License: GFDL-NIV-1.3
 
 ## GPL-3 with Qt-1.0 exception
 
@@ -2307,17 +2307,14 @@ License: FTL
     Robert Wilhelm    <robert.wilhelm at freetype.org>
     Werner Lemberg    <werner.lemberg at freetype.org>
 
-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`,
+License: GFDL-NIV-1.3
+ Permission is granted to copy, distribute and/or modify this document
+ under the terms of the GNU Free Documentation License, Version 1.3
+ or any later version published by the Free Software Foundation;
+ with no Invariant Sections, no Front-Cover Texts, and no Back-Cover Texts.
+ .
+ On Debian systems, the complete text of the GNU Free Documentation
+ License version 1.3 can be found in /usr/share/common-licenses/GFDL-1.3.
 
 License: Apache-2.0
   Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/debian/scripts/update-copyright b/debian/scripts/update-copyright
index 5e23129..9f0d7a7 100755
--- a/debian/scripts/update-copyright
+++ b/debian/scripts/update-copyright
@@ -8,12 +8,12 @@ default_licenses = (
     'BSD-3-clause',
     'LGPL-3 or GPL-2',
     'GPL-3 with Qt-1.0 exception',
-    'GFDL-1.3',
+    'GFDL-NIV-1.3',
 )
 
 licenses_map = {
     'BSD': 'BSD-3-clause',
-    'FDL': 'GFDL-1.3',
+    'FDL': 'GFDL-NIV-1.3',
     'GPL-EXCEPT': 'GPL-3 with Qt-1.0 exception',
     'LGPL': 'LGPL-3 or GPL-2',
     'LGPL21': 'LGPL-2.1-or-3 with Qt-1.1 exception',

-- 
qtbase packaging