[SCM] qtdeclarative packaging branch, experimental, updated. debian/5.9.0-beta3-2-9-gb2995a7

Wed Jun 7 16:24:04 UTC 2017

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

The following commit has been merged in the experimental branch:
commit b2995a7be56d3b36164b276000a13112c3249adb
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date:   Wed Jun 7 19:23:56 2017 +0300

    Update debian/copyright.
---
 debian/changelog |  1 +
 debian/copyright | 77 +++++++-------------------------------------------------
 2 files changed, 10 insertions(+), 68 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index c5e0c4b..bb7fc4c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,7 @@ qtdeclarative-opensource-src (5.9.0-1) UNRELEASED; urgency=medium
   [ Dmitry Shachnev ]
   * Rename qml-module-qtquick-sharedimage to qml-module-qt-labs-sharedimage,
     following upstream (see commit 4a4a8e911cfafcff).
+  * Update debian/copyright.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Fri, 02 Jun 2017 23:08:37 -0500
 
diff --git a/debian/copyright b/debian/copyright
index 13aeeb0..14d2f66 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -173,6 +173,7 @@ Files: tests/auto/qml/qqmltypeloader/SlowImport/plugin.cpp
        tests/auto/qml/qqmltypeloader/data/NiceView.qml
        tests/auto/qml/qqmltypeloader/data/test_load_complete.qml
        tests/auto/qml/qqmltypeloader/tst_qqmltypeloader.cpp
+       tests/auto/qml/qqmlxmlhttprequest/data/send_patch.qml
        tests/auto/quick/qquickgridview/data/negativeDisplayMargin.qml
        tests/auto/quick/qquicklistview/data/negativeDisplayMargin.qml
        tests/auto/quick/qquicklistview/data/proxytest.qml
@@ -195,8 +196,12 @@ Files: tests/auto/qml/qqmlstatemachine/data/cppsignal.qml
        tests/auto/qmltest/statemachine/tst_nestedinitialstates.qml
        tests/auto/qmltest/statemachine/tst_nestedstatemachine.qml
        tests/auto/qmltest/statemachine/tst_parallelmachine.qml
+       tests/auto/qmltest/statemachine/tst_signaltransition.qml
        tests/auto/qmltest/statemachine/tst_trafficlight.qml
-Copyright: 2016 Ford Motor Company
+       tests/auto/qmltest/statemachine/tst_triggeredArguments1.qml
+       tests/auto/qmltest/statemachine/tst_triggeredArguments2.qml
+Copyright: 2016-2017 Ford Motor Company
+           2017      The Qt Company
 License: GPL-3 with Qt-1.0 exception
 
 Files: tests/auto/qmltest-blacklist/animators/tst_targetdestroyed.qml
@@ -227,8 +232,9 @@ License: GPL-3 with Qt-1.0 exception
 
 Files: tests/auto/qml/qmllint/main.cpp
        tests/auto/quick/qquickanimations/data/animatorInvalidTargetCrash.qml
+       tests/benchmarks/qml/qqmlchangeset/tst_qqmlchangeset.cpp
        tools/qmllint/main.cpp
-Copyright: 2016 Klarälvdalens Datakonsult AB, a KDAB Group company
+Copyright: 2016-2017 Klarälvdalens Datakonsult AB, a KDAB Group company
 License: GPL-3 with Qt-1.0 exception
 
 Files: tests/auto/quick/qquickanimatedsprite/data/runningChange.qml
@@ -243,33 +249,9 @@ Files: tests/auto/qmltest/events/tst_touch.qml
 Copyright: 2016 Jeremy Katz
 License: GPL-3 with Qt-1.0 exception
 
-Files: tests/auto/qmltest/statemachine/tst_signaltransition.qml
-       tests/auto/qmltest/statemachine/tst_triggeredArguments1.qml
-       tests/auto/qmltest/statemachine/tst_triggeredArguments2.qml
-Copyright: 2016 Ford Motor Company
-License: LGPL-2.1-or-3 with Qt-1.1 exception
-
-Files: tests/auto/qml/qqmlextensionplugin/tst_qqmlextensionplugin.cpp
-       tests/auto/quick/qquickanimatedsprite/data/sourceSwitch.qml
-       tests/auto/quick/qquickanimators/data/positionerWithAnimator.qml
-       tests/auto/quick/qquickitem/data/childAtRectangle.qml
-       tests/auto/quick/qquickitem/data/shortcutOverride.qml
-       tools/qmlplugindump/qmltypereader.cpp
-       tools/qmlplugindump/qmltypereader.h
-Copyright: 2015-2016 The Qt Company Ltd.
-License: LGPL-2.1-or-3 with Qt-1.1 exception
-
-Files: tests/benchmarks/qml/qqmlchangeset/tst_qqmlchangeset.cpp
-Copyright: 2016 Klarälvdalens Datakonsult AB, a KDAB Group company
-License: LGPL-2.1-or-3 with Qt-1.1 exception
-
 Files: tests/auto/particles/qquickparticlesystem/data/crashaffectors.qml
 Copyright: 2017 reMarkable A/S
-License: LGPL-2.1-or-3 with Qt-1.1 exception
-
-Files: tests/auto/qml/qqmlxmlhttprequest/data/send_patch.qml
-Copyright: 2015 Canonical Limited and/or its subsidiary(-ies).
-License: LGPL-2.1-or-3 with Qt-1.1 exception
+License: GPL-3 with Qt-1.0 exception
 
 Files: src/qml/qml/qqmlvmemetaobject.cpp
        src/qml/qml/qqmlvmemetaobject_p.h
@@ -455,47 +437,6 @@ License: LGPL-2.1
  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: 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.
- .
- 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`.
- .
- 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.
-
 License: LGPL-3
  This program is free software: you can redistribute it and/or modify
  it under the terms of the GNU Lesser General Public License version 3

-- 
qtdeclarative packaging

