[SCM] qtdoc packaging branch, master, updated. debian/5.7.1-1-5-gd5fcd43

[Dmitry Shachnev]

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

The following commit has been merged in the master branch:
commit d5fcd43a3b3bbf5a95f5b15232e7bd990ef46f50
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date:   Tue Jan 17 16:29:24 2017 +0300

    Update debian/copyright.
---
 debian/changelog |  1 +
 debian/copyright | 41 ++++++++++++++++++-----------------------
 2 files changed, 19 insertions(+), 23 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 191c769..33a394c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ qtdoc-opensource-src (5.7.1-2) UNRELEASED; urgency=medium
   [ Dmitry Shachnev ]
   * Add new modules: qt3d, qtquickcontrols2, qtwayland, qtwebchannel and
     qtwebengine.
+  * Update debian/copyright.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Thu, 22 Dec 2016 10:22:47 +0300
 
diff --git a/debian/copyright b/debian/copyright
index d649e3d..e56b901 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -3,7 +3,7 @@ Upstream-Name: qtdoc-opensource-src
 Source: https://download.qt.io/official_releases/qt/*/submodules/
 
 Files: *
-Copyright: 2015 The Qt Company Ltd.
+Copyright: 2016 The Qt Company Ltd.
 License: BSD-3-clause
 
 Files: debian/*
@@ -20,15 +20,11 @@ Files: *.qdoc
 Copyright: 2015 The Qt Company Ltd.
 License: GFDL-NIV-1.3
 
-Files: doc/src/platforms/*blackberry.qdoc
-Copyright: 2014 BlackBerry Limited.
-License: GFDL-NIV-1.3
-
 Files: doc/src/development/cmake-manual.qdoc
 Copyright: 2012 Klarälvdalens Datakonsult AB, a KDAB Group company <info at kdab.com>
 License: GFDL-NIV-1.3
 
-Files: doc/src/snippets/signalsandslots/signalslotsyntaxes.*
+Files: doc/src/snippets/signalsandslots/*
 Copyright: 2014 Sze Howe Koh <szehowe.koh at gmail.com>
 License: BSD-3-clause
 
@@ -37,27 +33,26 @@ Copyright: 2014 Sze Howe Koh <szehowe.koh at gmail.com>
 License: GFDL-NIV-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.
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU Lesser General Public License version 2.1
+ as published by the Free Software Foundation.
+ .
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU Lesser General Public License for more details.
  .
- On Debian systems, the complete text of the LGPL-2.1 license can be found in
- `/usr/share/common-licenses/LGPL-2.1`,
+ On Debian systems, the complete text of the GNU Lesser General Public
+ License version 2.1 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.
+ Permission is granted to copy, distribute and/or modify this document
+ under the terms of the GNU Free Documentation License version 1.3
+ as 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 GFDL-1.3 license can be found in
- `/usr/share/common-licenses/GFDL-1.3`,
+ 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: BSD-3-clause
  You may use this file under the terms of the BSD license as follows:

-- 
qtdoc packaging