[SCM] qtbase packaging branch, experimental, updated. debian/5.5.0+dfsg-4-2-gf434798
Dmitry Shachnev
mitya57 at moszumanska.debian.org
Fri Aug 14 16:42:22 UTC 2015
Gitweb-URL: http://git.debian.org/?p=pkg-kde/qt/qtbase.git;a=commitdiff;h=f434798
The following commit has been merged in the experimental branch:
commit f434798bf42ad185649a6e5babe8a51df21310da
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date: Fri Aug 14 19:41:27 2015 +0300
Update debian/copyright for 5.5.0.
---
debian/changelog | 2 +
debian/copyright | 233 ++++++++++++++++++++++++++++++++++++++++++++++---------
2 files changed, 197 insertions(+), 38 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index ab6b0c5..b0b5be6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,7 @@
qtbase-opensource-src (5.5.0+dfsg-5) UNRELEASED; urgency=medium
+ [ Dmitry Shachnev ]
+ * Update debian/copyright for 5.5.0.
-- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org> Fri, 14 Aug 2015 19:37:52 +0300
diff --git a/debian/copyright b/debian/copyright
index b5f6a06..027a4a5 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -19,7 +19,7 @@ Files-Excluded: src/3rdparty/zlib/doc/rfc*.txt
Files: *
Copyright: 2012-2015 The Qt Company Ltd.
-License: LGPL-2.1-or-3 with Digia-1.1 exception
+License: LGPL-2.1-or-3 with Qt-1.1 exception
Files: examples/*
doc/src/snippets/*
@@ -46,7 +46,7 @@ Copyright: 2007-2013 Fathi Boudra <fabo at debian.org>
2012-2013 Zoltán Balogh <zoltan.balogh at canonical.com>
2012-2013 Timo Jyrinki <timo.jyrinki at canonical.com>
2013-2015 Dmitry Shachnev <mitya57 at debian.org>
-License: LGPL-2.1-or-3 with Digia-1.1 exception
+License: LGPL-2.1-or-3 with Qt-1.1 exception
Files: src/testlib/3rdparty/callgrind_p.h
src/testlib/3rdparty/valgrind_p.h
@@ -55,6 +55,8 @@ Copyright: 2003-2007 Josef Weidendorfer
License: Hybrid-BSD
Files: tests/auto/cmake/*
+ src/gui/opengl/qopenglfunctions_4_4_*
+ src/gui/opengl/qopenglfunctions_4_5_*
src/gui/kernel/qplatformmenu.h
src/gui/kernel/qplatformsystemtrayicon.h
src/gui/kernel/qplatformsystemtrayicon.cpp
@@ -72,8 +74,12 @@ Files: tests/auto/cmake/*
tests/auto/tools/qdbuscpp2xml/tst_qdbuscpp2xml.cpp
tests/auto/corelib/tools/qpair/tst_qpair.cpp
tests/auto/corelib/itemmodels/qidentityproxymodel/tst_qidentityproxymodel.cpp
-Copyright: 2011 Klarälvdalens Datakonsult AB, a KDAB Group company
-License: LGPL-2.1-or-3 with Digia-1.1 exception
+Copyright: 2011-2015 Klarälvdalens Datakonsult AB, a KDAB Group company
+License: LGPL-2.1-or-3 with Qt-1.1 exception
+
+Files: tests/auto/cmake/test_add_binary_resources_delayed_file/main.cpp
+Copyright: 2015 André Klitzing <aklitzing at gmail.com>
+License: LGPL-2.1-or-3 with Qt-1.1 exception
Files: tests/manual/cocoa/menus/main.cpp
src/plugins/platforms/cocoa/qcocoamenubar.mm
@@ -86,7 +92,7 @@ Files: tests/manual/cocoa/menus/main.cpp
src/plugins/platforms/cocoa/qcocoamenu.mm
Copyright: 2011 Klarälvdalens Datakonsult AB, a KDAB Group company
2007-2008 Apple, Inc.
-License: LGPL-2.1-or-3 with Digia-1.1 exception
+License: LGPL-2.1-or-3 with Qt-1.1 exception
Files: src/plugins/platforms/cocoa/qcocoaeventdispatcher.h
src/plugins/platforms/cocoa/qcocoaapplication.h
@@ -97,18 +103,45 @@ Copyright: 2007-2008 Apple, Inc.
2015 The Qt Company Ltd.
License: BSD-3-clause
+Files: src/corelib/io/qstandardpaths_haiku.cpp
+ src/plugins/platforms/haiku/*
+Copyright: 2015 Klarälvdalens Datakonsult AB, a KDAB Group company, info at kdab.com
+License: LGPL-2.1-or-3 with Qt-1.1 exception
+
Files: src/plugins/platforms/qnx/*
src/plugins/bearer/blackberry/*
+ src/plugins/styles/bb10style/*
+ config.tests/unix/lgmon/lgmon.cpp
+ config.tests/unix/objcopy/objcopy.cpp
+ config.tests/unix/pps/pps.cpp
+ config.tests/unix/qqnx_imf/qqnx_imf.cpp
config.tests/unix/slog2/slog2.cpp
- mkspecs/blackberry-x86-qcc/qplatformdefs.h
- mkspecs/qnx-x86-qcc/qplatformdefs.h
+ mkspecs/blackberry-*
+ mkspecs/qnx-*
src/corelib/io/qstandardpaths_blackberry.cpp
src/corelib/io/qurl.cpp
- src/corelib/kernel/qeventdispatcher_blackberry.cpp
- src/corelib/kernel/qeventdispatcher_blackberry_p.h
+ src/corelib/kernel/qeventdispatcher_blackberry*
+ src/corelib/kernel/qppsattribute*
+ src/corelib/kernel/qppsobject*
+ src/network/access/qabstractprotocolhandler*
+ src/network/access/qhttpnetworkconnectionchannel.cpp
+ src/network/access/qhttpprotocolhandler*
+ src/network/access/qspdyprotocolhandler*
+ tests/auto/corelib/io/qfileselector/tst_qfileselector.cpp
tests/auto/corelib/io/qurl/tst_qurl.cpp
-Copyright: 2009-2012 Research In Motion
-License: LGPL-2.1-or-3 with Digia-1.1 exception
+ tests/auto/network/access/spdy/tst_spdy.cpp
+ tests/manual/qnetworkreply/main.cpp
+ tests/manual/qsslsocket/main.cpp
+Copyright: 2009-2014 BlackBerry Limited (formerly Research In Motion)
+License: LGPL-2.1-or-3 with Qt-1.1 exception
+
+Files: tests/auto/android/runtests_androiddeployqt.pl
+ src/plugins/platforms/android/*
+ src/android/jar/src/org/qtproject/qt5/android/*
+ src/android/java/src/*
+ src/widgets/styles/qandroidstyle*
+Copyright: 2012-2014 BogDan Vatra <bogdan at kde.org>
+License: LGPL-2.1-or-3 with Qt-1.1 exception
Files: config.tests/unix/pcre/pcre.cpp
src/3rdparty/pcre/import_from_pcre_tarball.sh
@@ -122,7 +155,7 @@ Files: config.tests/unix/pcre/pcre.cpp
tests/auto/corelib/tools/qregularexpression/defaultoptimize/tst_qregularexpression_defaultoptimize.cpp
tests/auto/corelib/tools/qregularexpression/alwaysoptimize/tst_qregularexpression_alwaysoptimize.cpp
Copyright: 2012 Giuseppe D'Angelo
-License: LGPL-2.1-or-3 with Digia-1.1 exception
+License: LGPL-2.1-or-3 with Qt-1.1 exception
Files: src/3rdparty/xcb/xcb-util-keysyms/keysyms.c
src/3rdparty/xcb/xcb-util/xcb_aux.c
@@ -153,13 +186,13 @@ Files: src/network/kernel/qdnslookup_p.h
src/network/kernel/qdnslookup.cpp
tests/auto/network/kernel/qdnslookup_appless/tst_qdnslookup_appless.cpp
tests/auto/network/kernel/qdnslookup/tst_qdnslookup.cpp
-Copyright: 2012 Jeremy Lain
-License: LGPL-2.1-or-3 with Digia-1.1 exception
+Copyright: 2012 Jeremy Lainé
+License: LGPL-2.1-or-3 with Qt-1.1 exception
Files: src/network/doc/snippets/code/src_network_kernel_qdnslookup.cpp
examples/network/dnslookup/dnslookup.cpp
examples/network/dnslookup/dnslookup.h
-Copyright: 2012 Jeremy Lain
+Copyright: 2012 Jeremy Lainé
License: BSD-3-clause
Files: tests/auto/corelib/xml/qxmlstream/XML-Test-Suite/*
@@ -241,10 +274,13 @@ Files: config.tests/qpa/directfb/directfb.cpp
src/corelib/io/qurlrecode.cpp
src/corelib/io/qurlquery.h
src/corelib/io/qurl.cpp
+ src/dbus/qdbusconnection.h
+ src/dbus/qdbusutil_p.h
src/opengl/qtopenglglobal.h
tests/auto/tools/qdbusxml2cpp/tst_qdbusxml2cpp.cpp
tests/auto/tools/moc/forward-declared-param.h
tests/auto/network/kernel/qhostaddress/tst_qhostaddress.cpp
+ tests/auto/network/socket/qudpsocket/tst_qudpsocket.cpp
tests/auto/corelib/tools/qsharedpointer/tst_qsharedpointer.cpp
tests/auto/corelib/tools/qsharedpointer/nontracked.h
tests/auto/corelib/tools/qsharedpointer/forwarddeclared.h
@@ -255,15 +291,15 @@ Files: config.tests/qpa/directfb/directfb.cpp
tests/auto/corelib/io/qprocess-noapplication/tst_qprocessnoapplication.cpp
tests/auto/corelib/io/qurlinternal/tst_qurlinternal.cpp
tests/auto/corelib/io/qipaddress/tst_qipaddress.cpp
-Copyright: 2012-2013 Intel Corporation
-License: LGPL-2.1-or-3 with Digia-1.1 exception
+Copyright: 2012-2015 Intel Corporation
+License: LGPL-2.1-or-3 with Qt-1.1 exception
Files: mkspecs/common/android/qplatformdefs.h
src/network/kernel/qdnslookup_android.cpp
src/corelib/kernel/qsharedmemory_android.cpp
src/corelib/kernel/qsystemsemaphore_android.cpp
Copyright: 2012 Collabora Ltd
-License: LGPL-2.1-or-3 with Digia-1.1 exception
+License: LGPL-2.1-or-3 with Qt-1.1 exception
Files: src/gui/painting/qt_mips_asm_dsp_p.h
src/gui/painting/qdrawhelper_mips_dsp_p.h
@@ -271,22 +307,46 @@ Files: src/gui/painting/qt_mips_asm_dsp_p.h
src/gui/painting/qdrawhelper_mips_dsp_asm.S
src/gui/painting/qdrawhelper_mips_dspr2_asm.S
Copyright: 2012 MIPS Technologies
-License: LGPL-2.1-or-3 with Digia-1.1 exception
+License: LGPL-2.1-or-3 with Qt-1.1 exception
-Files: src/corelib/thread/qmutex.cpp src/corelib/thread/qmutex_p.h tests/auto/tools/moc/cxx11-enums.h
-Copyright: 2011-2012 Olivier Goffart
-License: LGPL-2.1-or-3 with Digia-1.1 exception
+Files: src/corelib/global/qlogging.cpp
+ src/corelib/kernel/qmetaobject.cpp
+ src/corelib/kernel/qmetaobject.h
+ src/corelib/kernel/qmetaobject_p.h
+ src/corelib/kernel/qmetatype.h
+ src/corelib/kernel/qobject.cpp
+ src/corelib/kernel/qobjectdefs_impl.h
+ src/corelib/kernel/qobject.h
+ src/corelib/kernel/qobject_p.h
+ src/corelib/kernel/qvariant.cpp
+ src/corelib/thread/qmutex.cpp
+ src/corelib/thread/qmutex_p.h
+ src/tools/moc/generator.cpp
+ src/tools/moc/preprocessor.cpp
+ src/tools/moc/symbols.h
+ tests/auto/corelib/global/qlogging/tst_qlogging.cpp
+ tests/auto/corelib/kernel/qmetaenum/tst_qmetaenum.cpp
+ tests/auto/corelib/kernel/qmetamethod/tst_qmetamethod.cpp
+ tests/auto/corelib/kernel/qmetaproperty/tst_qmetaproperty.cpp
+ tests/auto/corelib/kernel/qobject/tst_qobject.cpp
+ tests/auto/corelib/kernel/qvariant/tst_qvariant.cpp
+ tests/auto/tools/moc/cxx11-enums.h
+ tests/auto/tools/moc/dollars.h
+ tests/auto/tools/moc/tst_moc.cpp
+Copyright: 2011-2015 Olivier Goffart
+License: LGPL-2.1-or-3 with Qt-1.1 exception
Files: src/network/ssl/qsslcertificateextension_p.h
src/network/ssl/qsslcertificateextension.cpp
src/network/ssl/qsslcertificateextension.h
Copyright: 2011 Richard J. Moore
-License: LGPL-2.1-or-3 with Digia-1.1 exception
+License: LGPL-2.1-or-3 with Qt-1.1 exception
Files: tests/benchmarks/corelib/tools/qalgorithms/tst_qalgorithms.cpp
+ tests/benchmarks/corelib/tools/qstack/main.cpp
tests/benchmarks/corelib/kernel/qcoreapplication/main.cpp
-Copyright: 2011-2012 Robin Burchell
-License: LGPL-2.1-or-3 with Digia-1.1 exception
+Copyright: 2011-2015 Robin Burchell <robin.burchell at viroteck.net>
+License: LGPL-2.1-or-3 with Qt-1.1 exception
Files: src/corelib/codecs/qjpunicode.cpp
src/corelib/codecs/qsjiscodec_p.h
@@ -297,7 +357,32 @@ Files: src/corelib/codecs/qjpunicode.cpp
src/corelib/codecs/qeucjpcodec_p.h
src/corelib/codecs/qjiscodec.cpp
Copyright: 1999 Serika Kurusugawa
-License: LGPL-2.1-or-3 with Digia-1.1 exception
+License: LGPL-2.1-or-3 with Qt-1.1 exception
+
+Files: tests/auto/corelib/io/qstorageinfo/tst_qstorageinfo.cpp
+ src/corelib/io/qstorageinfo*
+ src/widgets/widgets/qkeysequenceedit*
+Copyright: 2013-2014 Ivan Komissarov <ABBAPOH at gmail.com>
+License: LGPL-2.1-or-3 with Qt-1.1 exception
+
+Files: src/network/ssl/qsslcontext_openssl.cpp
+ src/network/ssl/qsslellipticcurve.cpp
+ src/network/ssl/qsslellipticcurve_dummy.cpp
+ src/network/ssl/qsslellipticcurve.h
+ src/network/ssl/qsslellipticcurve_openssl.cpp
+ src/network/ssl/qsslpresharedkeyauthenticator.cpp
+ src/network/ssl/qsslpresharedkeyauthenticator.h
+ src/network/ssl/qsslpresharedkeyauthenticator_p.h
+ src/network/ssl/qsslsocket_openssl.cpp
+ tests/auto/network/ssl/qsslellipticcurve/tst_qsslellipticcurve.cpp
+ tests/auto/network/ssl/qsslsocket/tst_qsslsocket.cpp
+Copyright: 2014 Governikus GmbH & Co. KG.
+License: LGPL-2.1-or-3 with Qt-1.1 exception
+
+Files: src/3rdparty/atspi2/atspi/atspi-constants.h
+Copyright: 2010-2011 Novell, Inc.
+ 2012 SUSE LINUX Products GmbH, Nuernberg, Germany
+License: GPL-2+
Files: src/3rdparty/angle/*
Copyright: 2002-2010 The ANGLE Project Authors.
@@ -491,11 +576,39 @@ License: Unifont
Files: tests/manual/widgets/itemviews/delegate/example.cpp
tests/manual/widgets/itemviews/qheaderview/qheaderviewtest1.cpp
+ tests/manual/widgets/itemviews/qtreewidget/main.cpp
+ tests/manual/widgets/itemviews/autoResizePrecision/*
+ tests/manual/widgets/kernel/qtooltip/main.cpp
+ tests/manual/widgets/kernel/sizeonhide/main.cpp
+ tests/manual/widgets/kernel/layoutreplace/main.cpp
tests/manual/widgets/qgraphicsview/rubberband/rubberbandtest.cpp
+ tests/manual/corelib/tools/qmap/main.cpp
+ tests/manual/corelib/tools/qvector/main.cpp
+ tests/manual/corelib/tools/qhash/main.cpp
+ tests/manual/corelib/tools/qlist/main.cpp
+ tests/manual/corelib/tools/qset/main.cpp
+ tests/manual/corelib/tools/qvarlengtharray/main.cpp
+ tests/manual/dialogs/messageboxpanel.*
tests/benchmarks/gui/itemviews/qheaderview/qheaderviewbench.cpp
tests/auto/widgets/itemviews/qheaderview/tst_qheaderview.cpp
-Copyright: 2012 Thorbjørn Lund Martsum
-License: LGPL-2.1-or-3 with Digia-1.1 exception
+Copyright: 2012-2013 Thorbjørn Lund Martsum
+License: LGPL-2.1-or-3 with Qt-1.1 exception
+
+Files: tests/auto/corelib/tools/qbytearray/tst_qbytearray_mac.mm
+ src/corelib/kernel/qcoreapplication_win.cpp
+ src/corelib/io/qfilesystemengine_unix.cpp
+ src/corelib/tools/qbytearray_mac.mm
+ src/gui/kernel/qplatformsessionmanager.*
+ src/gui/kernel/qsessionmanager_p.h
+ src/gui/image/qpnghandler.cpp
+ src/plugins/platforms/windows/qtwindowsglobal.h
+ src/plugins/platforms/windows/qwindowscontext.cpp
+ src/plugins/platforms/windows/qwindowsguieventdispatcher.cpp
+ src/plugins/platforms/windows/qwindowsintegration.*
+ src/plugins/platforms/windows/qwindowssessionmanager.*
+ src/widgets/itemviews/qlistview.cpp
+Copyright: 2013-2014 Samuel Gaist <samuel.gaist at edeltech.ch>
+License: LGPL-2.1-or-3 with Qt-1.1 exception
Files: src/3rdparty/freetype/src/pcf/pcfutil.c
Copyright: 1990-1998 The Open Group
@@ -548,6 +661,22 @@ Copyright: 1998-2005 David Turner
2008-2012 Nokia Corporation and/or its subsidiary(-ies)
2012-2013 The Qt Company Ltd.
License: Harfbuzz
+
+Files: src/3rdparty/harfbuzz-ng/*
+Copyright: 2010-2012 Google, Inc.
+ 2012 Mozilla Foundation
+ 2011 Codethink Limited
+ 2008-2010 Nokia Corporation and/or its subsidiary(-ies)
+ 2009 Keith Stribley
+ 2009 Martin Hosken and SIL International
+ 2007 Chris Wilson
+ 2006 Behdad Esfahbod
+ 2005 David Turner
+ 2004-2010 Red Hat, Inc.
+ 1998-2004 David Turner and Werner Lemberg
+License: Harfbuzz
+
+License: Harfbuzz
Permission is hereby granted, without written agreement and without
license or royalty fees, to use, copy, modify, and distribute this
software and its documentation for any purpose, provided that the
@@ -569,7 +698,13 @@ License: Harfbuzz
Files: src/gui/text/qharfbuzzng.cpp
src/gui/text/qharfbuzzng_p.h
Copyright: 2013 Konstantin Ritt
-License: LGPL-2.1-or-3 with Digia-1.1 exception
+License: LGPL-2.1-or-3 with Qt-1.1 exception
+
+Files: src/corelib/kernel/qsharedmemory_posix.cpp
+ src/corelib/kernel/qsystemsemaphore_posix.cpp
+Copyright: 2015 Konstantin Ritt <ritt.ks at gmail.com>
+ 2015 Klarälvdalens Datakonsult AB, a KDAB Group company, info at kdab.com
+License: LGPL-2.1-or-3 with Qt-1.1 exception
Files: src/testlib/3rdparty/cycle_p.h
Copyright: 2003, 2006 Matteo Frigo
@@ -706,7 +841,7 @@ License: libjpeg
CompuServe Incorporated."
Files: src/3rdparty/libpng/*
-Copyright: 2004, 2006-2012 Glenn Randers-Pehrson
+Copyright: 1998-2015 Glenn Randers-Pehrson
Andreas Dilger
Dave Martindale
Guy Eric Schalnat
@@ -762,6 +897,27 @@ Files: src/3rdparty/rfc6234/*
Copyright: 2011 IETF Trust
License: BSD-3-clause
+Files: src/3rdparty/sha3/brg_endian.h
+Copyright: 1998-2008, Brian Gladman, Worcester, UK
+License: brg-endian
+ The redistribution and use of this software (with or without changes)
+ is allowed without the payment of fees or royalties provided that:
+ .
+ 1. source code distributions include the above copyright notice, this
+ list of conditions and the following disclaimer;
+ .
+ 2. binary distributions include the above copyright notice, this list
+ of conditions and the following disclaimer in their documentation;
+ .
+ 3. the name of the copyright holder is not used to endorse products
+ built using this software without specific written permission.
+ .
+ DISCLAIMER
+ .
+ This software is provided 'as is' with no explicit or implied warranties
+ in respect of its properties, including, but not limited to, correctness
+ and/or fitness for purpose.
+
Files: src/3rdparty/sqlite/*
Copyright: -
License: public-domain
@@ -793,7 +949,7 @@ License: Zlib
misrepresented as being the original software.
3. This notice may not be removed or altered from any source distribution.
-License: LGPL-2.1-or-3 with Digia-1.1 exception
+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
@@ -802,16 +958,17 @@ License: LGPL-2.1-or-3 with Digia-1.1 exception
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.
+ 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`.
.
- Digia Qt LGPL Exception version 1.1:
+ 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
@@ -845,9 +1002,9 @@ 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
- from this software without specific prior written permission.
+ * Neither the name of The Qt Company Ltd and its Subsidiary(-ies) 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
"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
--
qtbase packaging
More information about the pkg-kde-commits
mailing list