[SCM] qtbase packaging branch, experimental, updated. debian/5.9.0-beta+dfsg-1-4-g5b23c19
Dmitry Shachnev
mitya57 at moszumanska.debian.org
Fri May 5 11:14:16 UTC 2017
Gitweb-URL: http://git.debian.org/?p=pkg-kde/qt/qtbase.git;a=commitdiff;h=5b23c19
The following commit has been merged in the experimental branch:
commit 5b23c196088857a963806e82071453855614b3bf
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date: Fri May 5 14:13:45 2017 +0300
Update debian/copyright using debian/scripts/update-copyright.
---
debian/changelog | 1 +
debian/copyright | 136 ++++++++++++++-----------------------------------------
2 files changed, 35 insertions(+), 102 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 98ce84f..b929336 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ qtbase-opensource-src (5.9.0~beta+dfsg-2) UNRELEASED; urgency=medium
[ Dmitry Shachnev ]
* Update qmake-qt5 manpage (closes: #859968).
* Update debian/libqt5core5a.symbols for arm64.
+ * Update debian/copyright using debian/scripts/update-copyright.
-- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org> Sun, 09 Apr 2017 21:50:40 +0300
diff --git a/debian/copyright b/debian/copyright
index b3e8d9e..15f5dc1 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -108,11 +108,6 @@ Files: src/corelib/doc/snippets/code/src_corelib_tools_qregularexpression.cpp
Copyright: 2016 Giuseppe D'Angelo <dangelog at gmail.com>.
License: BSD-3-clause
-Files: tests/auto/corelib/global/qglobalstatic/tst_qglobalstatic.cpp
-Copyright: 2016 Intel Corporation.
- 2016 Thiago Macieira <thiago at kde.org>
-License: BSD-3-clause
-
Files: examples/widgets/itemviews/storageview/main.cpp
examples/widgets/itemviews/storageview/storagemodel.cpp
examples/widgets/itemviews/storageview/storagemodel.h
@@ -126,10 +121,6 @@ Files: examples/network/dnslookup/dnslookup.cpp
Copyright: 2016 Jeremy Lainé <jeremy.laine at m4x.org>
License: BSD-3-clause
-Files: tests/manual/qtbug-52641/main.cpp
-Copyright: 2016 Kai Pastor
-License: BSD-3-clause
-
Files: src/corelib/doc/snippets/qversionnumber/main.cpp
Copyright: 2016 Keith Gardner <kreios4004 at gmail.com>
2016 The Qt Company Ltd.
@@ -269,6 +260,11 @@ Files: tests/auto/corelib/tools/qbytedatabuffer/tst_qbytedatabuffer.cpp
Copyright: 2012 Hewlett-Packard Development Company, L.P.
License: GPL-3 with Qt-1.0 exception
+Files: tests/manual/qstorageinfo/main.cpp
+ tests/manual/qstorageinfo/printvolumes.cpp
+Copyright: 2016 Intel Corporation
+License: GPL-3 with Qt-1.0 exception
+
Files: tests/auto/corelib/io/qipaddress/tst_qipaddress.cpp
tests/auto/corelib/io/qprocess-noapplication/tst_qprocessnoapplication.cpp
tests/auto/corelib/io/qprocess/testProcessHang/main.cpp
@@ -282,6 +278,7 @@ Files: tests/auto/corelib/io/qipaddress/tst_qipaddress.cpp
tests/auto/corelib/tools/qsharedpointer/nontracked.h
tests/auto/dbus/qdbusconnection_delayed/tst_qdbusconnection_delayed.cpp
tests/auto/dbus/qdbusconnection_no_app/tst_qdbusconnection_no_app.cpp
+ tests/auto/dbus/qdbusconnection_spyhook/tst_qdbusconnection_spyhook.cpp
tests/auto/network/kernel/qnetworkdatagram/tst_qnetworkdatagram.cpp
tests/auto/other/compiler/othersource.cpp
tests/auto/other/qprocess_and_guieventloop/tst_qprocess_and_guieventloop.cpp
@@ -315,6 +312,7 @@ Files: configure
tests/auto/corelib/codecs/utf8/tst_utf8.cpp
tests/auto/corelib/global/qnumeric/tst_qnumeric.cpp
tests/auto/corelib/io/qdebug/tst_qdebug.cpp
+ tests/auto/corelib/io/qdir/tst_qdir.cpp
tests/auto/corelib/io/qfile/tst_qfile.cpp
tests/auto/corelib/io/qprocess/tst_qprocess.cpp
tests/auto/corelib/io/qurl/tst_qurl.cpp
@@ -357,10 +355,15 @@ Files: configure
tests/auto/testlib/selftests/tst_selftests.cpp
tests/benchmarks/corelib/tools/qbytearray/main.cpp
tests/benchmarks/corelib/tools/qhash/main.cpp
-Copyright: 2016 Intel Corporation.
+Copyright: 2016-2017 Intel Corporation.
2016 The Qt Company Ltd.
License: GPL-3 with Qt-1.0 exception
+Files: tests/auto/corelib/global/qglobalstatic/tst_qglobalstatic.cpp
+Copyright: 2016 Intel Corporation.
+ 2016 Thiago Macieira <thiago at kde.org>
+License: GPL-3 with Qt-1.0 exception
+
Files: tests/auto/corelib/io/qstorageinfo/tst_qstorageinfo.cpp
Copyright: 2014 Ivan Komissarov <ABBAPOH at gmail.com>
License: GPL-3 with Qt-1.0 exception
@@ -376,6 +379,10 @@ Files: tests/auto/gui/painting/qpagelayout/tst_qpagelayout.cpp
Copyright: 2014 John Layt <jlayt at kde.org>
License: GPL-3 with Qt-1.0 exception
+Files: tests/manual/qtbug-52641/main.cpp
+Copyright: 2016 Kai Pastor
+License: GPL-3 with Qt-1.0 exception
+
Files: tests/auto/corelib/tools/qversionnumber/tst_qversionnumber.cpp
Copyright: 2014 Keith Gardner <kreios4004 at gmail.com>
2016 The Qt Company Ltd.
@@ -432,6 +439,7 @@ Files: tests/auto/cmake/test(needsquoting)dirname/mywidget.cpp
tests/auto/tools/qdbuscpp2xml/test1.h
tests/auto/tools/qdbuscpp2xml/tst_qdbuscpp2xml.cpp
tests/auto/widgets/kernel/qwidgetmetatype/tst_qwidgetmetatype.cpp
+ tests/benchmarks/gui/painting/qcolor/tst_qcolor.cpp
tests/manual/cocoa/menus/main.cpp
tests/manual/qmetatype/declare_metatype_noninline.cpp
tests/manual/qmetatype/declare_metatype_noninline.h
@@ -451,7 +459,7 @@ Files: tests/auto/cmake/test(needsquoting)dirname/mywidget.cpp
util/glgen/specparser.h
util/glgen/xmlspecparser.cpp
util/glgen/xmlspecparser.h
-Copyright: 2011-2015 Klarälvdalens Datakonsult AB, a KDAB Group company
+Copyright: 2011-2016 Klarälvdalens Datakonsult AB, a KDAB Group company
License: GPL-3 with Qt-1.0 exception
Files: tests/auto/gui/util/qregularexpressionvalidator/tst_qregularexpressionvalidator.cpp
@@ -515,6 +523,10 @@ Copyright: 2014 Samuel Gaist <samuel.gaist at edeltech.ch>
2016 The Qt Company Ltd.
License: GPL-3 with Qt-1.0 exception
+Files: tests/auto/cmake/test_QFINDTESTDATA/tests/main.cpp
+Copyright: 2016 Stephen Kelly <steveire at gmail,com>
+License: GPL-3 with Qt-1.0 exception
+
Files: tests/auto/cmake/test_private_targets/main.cpp
tests/auto/other/modeltest/dynamictreemodel.cpp
tests/auto/other/modeltest/dynamictreemodel.h
@@ -553,44 +565,9 @@ Files: tests/benchmarks/gui/itemviews/qheaderview/qheaderviewbench.cpp
Copyright: 2012-2013 Thorbjørn Lund Martsum <tmartsum at gmail.com>
License: GPL-3 with Qt-1.0 exception
-## LGPL-2.1-or-3 with Qt-1.1 exception
-
-Files: tests/manual/qstorageinfo/main.cpp
- tests/manual/qstorageinfo/printvolumes.cpp
-Copyright: 2016 Intel Corporation
-License: LGPL-2.1-or-3 with Qt-1.1 exception
-
-Files: tests/auto/dbus/qdbusconnection_spyhook/tst_qdbusconnection_spyhook.cpp
-Copyright: 2016 Intel Corporation.
-License: LGPL-2.1-or-3 with Qt-1.1 exception
-
-Files: tests/benchmarks/gui/painting/qcolor/tst_qcolor.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/cmake/test_QFINDTESTDATA/tests/main.cpp
-Copyright: 2016 Stephen Kelly <steveire at gmail,com>
-License: LGPL-2.1-or-3 with Qt-1.1 exception
-
-Files: tests/auto/gui/kernel/qkeyevent/tst_qkeyevent.cpp
- tests/manual/diaglib/logwidget.cpp
- tests/manual/diaglib/logwidget.h
- tests/manual/embeddedintoforeignwindow/itemwindow.cpp
- tests/manual/embeddedintoforeignwindow/itemwindow.h
- tests/manual/embeddedintoforeignwindow/main.cpp
- tests/manual/foreignwindows/main.cpp
- tests/manual/qcursor/childwidget/main.cpp
- tests/manual/qcursor/childwindow/main.cpp
- tests/manual/qcursor/childwindowcontainer/main.cpp
- tests/manual/widgets/styles/main.cpp
-Copyright: 2015-2016 The Qt Company Ltd.
-License: LGPL-2.1-or-3 with Qt-1.1 exception
-
-## LGPL-3
-
-Files: src/plugins/platforms/android/extract.cpp
-Copyright: 2014 BogDan Vatra <bogdan at kde.org>
-License: LGPL-3
+Files: tests/auto/corelib/global/qfloat16/tst_qfloat16.cpp
+Copyright: 2016 by Southwest Research Institute (R)
+License: GPL-3 with Qt-1.0 exception
## LGPL-3 or GPL-2
@@ -736,6 +713,7 @@ Files: src/android/jar/src/org/qtproject/qt5/android/ExtractStyle.java
src/plugins/platforms/android/androidjnimenu.h
src/plugins/platforms/android/androidplatformplugin.cpp
src/plugins/platforms/android/androidsurfaceclient.h
+ src/plugins/platforms/android/extract.cpp
src/plugins/platforms/android/qandroidassetsfileenginehandler.cpp
src/plugins/platforms/android/qandroidassetsfileenginehandler.h
src/plugins/platforms/android/qandroideventdispatcher.cpp
@@ -1005,6 +983,12 @@ Copyright: 2016 Intel Corporation.
2016 The Qt Company Ltd.
License: LGPL-3 or GPL-2
+Files: src/corelib/io/qfilesystemengine_unix.cpp
+Copyright: 2017 Intel Corporation.
+ 2013 Samuel Gaist <samuel.gaist at edeltech.ch>
+ 2016 The Qt Company Ltd.
+License: LGPL-3 or GPL-2
+
Files: bin/syncqt.pl
config.tests/arch/arch.cpp
src/corelib/arch/qatomic_msvc.h
@@ -1527,8 +1511,7 @@ Copyright: 2013 Samuel Gaist <samuel.gaist at edeltech.ch>
2016 The Qt Company Ltd.
License: LGPL-3 or GPL-2
-Files: src/corelib/io/qfilesystemengine_unix.cpp
- src/corelib/kernel/qcoreapplication_win.cpp
+Files: src/corelib/kernel/qcoreapplication_win.cpp
src/gui/image/qpnghandler.cpp
src/gui/kernel/qsessionmanager_p.h
src/platformsupport/eventdispatchers/qwindowsguieventdispatcher.cpp
@@ -1572,19 +1555,9 @@ Files: src/corelib/doc/snippets/qbytearraylist/main.cpp
src/corelib/global/qfloat16.h
src/corelib/global/qfloat16_p.h
src/tools/qfloat16-tables/gen_qfloat16_tables.cpp
- tests/auto/corelib/global/qfloat16/tst_qfloat16.cpp
Copyright: 2014-2016 by Southwest Research Institute (R)
License: LGPL-3 or GPL-2
-## LGPL-3 or GPL-2+
-
-Files: src/plugins/platforms/vnc/qvncintegration.cpp
- src/plugins/platforms/winrt/qwinrtdrag.cpp
- src/plugins/platforms/winrt/qwinrtdrag.h
- tests/auto/corelib/io/qfilesystemmetadata/tst_qfilesystemmetadata.cpp
-Copyright: 2015-2017 The Qt Company Ltd.
-License: LGPL-3 or GPL-2+
-
## END AUTO GENERATED BLOCK
# Manual rules for some files with non-standard licenses
@@ -2032,47 +2005,6 @@ License: Zlib
# License texts
-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
--
qtbase packaging
More information about the pkg-kde-commits
mailing list