[SCM] qtdoc packaging branch, experimental, updated. debian/5.4.2-2-3-gc38cb15

[Dmitry Shachnev]

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

The following commit has been merged in the experimental branch:
commit c38cb156d42697ec2468b36d1d3022dad6ae3776
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date:   Sun Aug 30 15:48:20 2015 +0300

    Update debian/copyright.
---
 debian/changelog |  1 +
 debian/copyright | 63 ++++++++++----------------------------------------------
 2 files changed, 12 insertions(+), 52 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index ef14aaf..c862489 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,7 @@ qtdoc-opensource-src (5.5.0-1) UNRELEASED; urgency=medium
   * Update build-dependencies for Qt 5.5.0.
     - Remove qtenginio, it is no longer developed and pending deprecation.
     - qtpositioning-doc[-html] packages were renamed to qtlocation-doc[-html].
+  * Update debian/copyright.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sun, 30 Aug 2015 15:25:57 +0300
 
diff --git a/debian/copyright b/debian/copyright
index d747eb3..d649e3d 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: 2013-2014 Digia Plc and/or its subsidiary(-ies)
+Copyright: 2015 The Qt Company Ltd.
 License: BSD-3-clause
 
 Files: debian/*
@@ -16,17 +16,8 @@ Copyright: 2007-2012 Fathi Boudra <fabo at debian.org>
            2014      Dmitry Shachnev <mitya57 at debian.org>
 License: LGPL-2.1
 
-Files: doc/src/diagrams/contentspropagation/customwidget.py
-       doc/src/diagrams/contentspropagation/standardwidgets.py
-       doc/src/diagrams/programs/easingcurve/main.cpp
-       doc/src/diagrams/programs/mdiarea.py
-       doc/src/diagrams/programs/qpen-dashpattern.py
-       doc/src/diagrams/programs/standard_views.py
-Copyright: 2014 Digia Plc and/or its subsidiary(-ies)
-License: LGPL-2.1-or-3 with Digia-1.1 exception
-
 Files: *.qdoc
-Copyright: 2012-2014 Digia Plc and/or its subsidiary(-ies).
+Copyright: 2015 The Qt Company Ltd.
 License: GFDL-NIV-1.3
 
 Files: doc/src/platforms/*blackberry.qdoc
@@ -37,45 +28,13 @@ 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
 
-License: LGPL-2.1-or-3 with Digia-1.1 exception
- GNU Lesser General Public License:
- This file may be used under the terms of the GNU Lesser General Public
- License version 2.1 or version 3 as published by the Free Software
- Foundation and appearing in the file LICENSE.LGPLv21 and LICENSE.LGPLv3
- included in the packaging of this file. Please review the following
- information to ensure the GNU Lesser General Public License requirements
- will be met: https://www.gnu.org/licenses/lgpl.html.
- .
- In addition, as a special exception, Digia gives you certain additional
- rights. These rights are described in the Digia Qt LGPL Exception
- version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
- .
- 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`.
- The complete text of the GNU Lesser General Public License version 3 can be
- found in `/usr/share/common-licenses/LGPL-3`.
- .
- Digia Qt LGPL Exception version 1.1:
- As an additional permission to the GNU Lesser General Public License version
- 2.1, the object code form of a "work that uses the Library" may incorporate
- material from a header file that is part of the Library.  You may distribute
- such object code under terms of your choice, provided that:
-     (i)   the header files of the Library have not been modified; and
-     (ii)  the incorporated material is limited to numerical parameters, data
-           structure layouts, accessors, macros, inline functions and
-           templates; and
-     (iii) you comply with the terms of Section 6 of the GNU Lesser General
-           Public License version 2.1.
- .
- Moreover, you may apply this exception to a modified version of the Library,
- provided that such modification does not involve copying material from the
- Library into the modified Library's header files unless such material is
- limited to (i) numerical parameters; (ii) data structure layouts;
- (iii) accessors; and (iv) small macros, templates and inline functions of
- five lines or less in length.
- .
- Furthermore, you are not required to apply this additional permission to a
- modified version of the Library.
+Files: doc/src/snippets/signalsandslots/signalslotsyntaxes.*
+Copyright: 2014 Sze Howe Koh <szehowe.koh at gmail.com>
+License: BSD-3-clause
+
+Files: doc/src/signalslotsyntaxes.qdoc
+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
@@ -112,8 +71,8 @@ License: BSD-3-clause
      notice, this list of conditions and the following disclaimer in
      the documentation and/or other materials provided with the
      distribution.
-   * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names
-     of its contributors may be used to endorse or promote products derived
+   * Neither the name of The Qt Company Ltd nor the names of its
+     contributors may be used to endorse or promote products derived
      from this software without specific prior written permission.
  .
  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS

-- 
qtdoc packaging