[SCM] qtwebchannel packaging branch, experimental, updated. debian/5.7.1-2-4-gea25d3d

[Dmitry Shachnev]

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

The following commit has been merged in the experimental branch:
commit ea25d3d5ff309e8c44e3583c0cba4abccf6602cb
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date:   Sun Jun 11 23:43:06 2017 +0300

    Update debian/copyright.
---
 debian/changelog |  4 ++++
 debian/copyright | 63 ++++----------------------------------------------------
 2 files changed, 8 insertions(+), 59 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index ad94eca..fc96942 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,11 @@
 qtwebchannel-opensource-src (5.9.0-1) UNRELEASED; urgency=medium
 
+  [ Simon Quigley ]
   * New upstream release.
 
+  [ Dmitry Shachnev ]
+  * Update debian/copyright.
+
  -- Simon Quigley <tsimonq2 at ubuntu.com>  Sun, 04 Jun 2017 20:12:26 -0500
 
 qtwebchannel-opensource-src (5.7.1-2) unstable; urgency=medium
diff --git a/debian/copyright b/debian/copyright
index 5e0a185..98378c4 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -11,7 +11,7 @@ Files: debian/*
 Copyright: 2016 Scarlett Clark <sgclark at kubuntu.org>
            2016 Sandro Knauß <hefee at debian.org>
            2016 Simon Quigley <tsimonq2 at ubuntu.com>
-License: LGPL-2+
+License: LGPL-3 or GPL-2-or-3 with KDE Exception
 
 Files: src/*
 Copyright: 2016, Klarälvdalens Datakonsult AB, a KDAB Group company, info at kdab.com, author Milian Wolff <milian.wolff at kdab.com>
@@ -26,10 +26,10 @@ Copyright: 2016, Klarälvdalens Datakonsult AB, a KDAB Group company, info at kdab.
            2016, basysKom GmbH, author Sumedha Widyadharma <sumedha.widyadharma at basyskom.com>
 License: BSD-3-clause
 
-Files: tests/auto/qml/testobject.cpp
-       tests/auto/qml/testobject.h
+Files: tests/*
 Copyright: 2016, Klarälvdalens Datakonsult AB, a KDAB Group company, info at kdab.com, author Milian Wolff <milian.wolff at kdab.com>
-License: LGPL-2.1-or-3 with Qt-1.1 Exception
+           2016, basysKom GmbH, info at basyskom.com, author Lutz Schönemann <lutz.schoenemann at basyskom.com>
+License: GPL-3 with Qt-1.0 Exception
 
 Files: src/webchannel/doc/src/external-resources.qdoc
        src/webchannel/doc/src/index.qdoc
@@ -66,61 +66,6 @@ License: BSD-3-clause
  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
 
-License: LGPL-2+
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Library General Public
- License as published by the Free Software Foundation; either
- version 2 of the License, or (at your option) any later version.
- .
- This library 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
- Library General Public License for more details.
- .
- The complete text of the GNU Library General Public License version 2 can be
- found in `/usr/share/common-licenses/LGPL-2'.
-
-License: LGPL-2.1-or-3 with Qt-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, The Qt Company gives you certain
- additional rights. These rights are described in The Qt Company Qt LGPL
- Exception version 1.1, included in the file LGPL_EXCEPTION.txt in this
- package.
- .
- The Qt Company 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.
- .
- 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`.
-
 License: LGPL-3
  This file may be used under the terms of the GNU Lesser General Public
  License version 3 as published by the Free Software Foundation and

-- 
qtwebchannel packaging