[SCM] qtbase packaging branch, experimental, updated. debian/5.3.2+dfsg-4-5-g99a68b5

Dmitry Shachnev mitya57-guest at moszumanska.debian.org
Sat Dec 13 10:20:35 UTC 2014 

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

The following commit has been merged in the experimental branch:
commit 99a68b51f99cad721c538d2fc540f8fad1e128d4
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date:   Sat Dec 13 13:20:13 2014 +0300

    Update debian/copyright to reflect LGPLv3 addition.
---
 debian/changelog |  1 +
 debian/copyright | 50 ++++++++++++++++++++++++++------------------------
 2 files changed, 27 insertions(+), 24 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 5db725f..1eb6bb5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,7 @@ qtbase-opensource-src (5.4.0+dfsg-1) UNRELEASED; urgency=medium
   * Drop fix_sparc_atomics.patch, applied upstream.
   * Update .install files.
   * Bump ABI version to 5.4.0.
+  * Update debian/copyright to reflect LGPLv3 addition.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Thu, 11 Dec 2014 15:52:26 +0300
 
diff --git a/debian/copyright b/debian/copyright
index 934cf51..e1f453a 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -4,7 +4,7 @@ Source: http://releases.qt-project.org/qt5/*/submodules/
 
 Files: *
 Copyright: 2012 Digia Plc and/or its subsidiary(-ies)
-License: LGPL-2.1 with Digia-1.1 exception or GPL-3
+License: LGPL-2.1-or-3 with Digia-1.1 exception or GPL-3
 
 Files: examples/* doc/src/snippets/* src/*/doc/snippets/* tests/manual/qlocale/*
        src/winmain/qtmain_win.cpp src/tools/qdoc/doc/examples/componentset/*
@@ -24,7 +24,7 @@ Copyright: 2007-2013 Fathi Boudra <fabo at debian.org>
            2005-2007 Brian Nelson <pyro at debian.org>
            2012-2013 Zoltán Balogh <zoltan.balogh at canonical.com>
            2012-2013 Timo Jyrinki <timo.jyrinki at canonical.com>
-License: LGPL-2.1 with Digia-1.1 exception
+License: LGPL-2.1-or-3 with Digia-1.1 exception
 
 Files: src/testlib/3rdparty/callgrind_p.h
        src/testlib/3rdparty/valgrind_p.h
@@ -36,20 +36,20 @@ License: Hybrid-BSD
 
 Files: tests/auto/cmake/* src/gui/kernel/qplatformmenu.h src/gui/kernel/qplatformsystemtrayicon.h src/gui/kernel/qplatformsystemtrayicon_qpa.cpp src/corelib/global/qtypetraits.h src/corelib/itemmodels/qidentityproxymodel.cpp src/corelib/itemmodels/qidentityproxymodel.h src/corelib/doc/snippets/code/src_gui_itemviews_qidentityproxymodel.cpp tests/manual/qmetatype/declare_metatype_noninline.h tests/manual/qmetatype/tst_qmetatype.cpp tests/manual/qmetatype/declare_metatype_noninline.cpp tests/auto/widgets/kernel/qwidgetmetatype/tst_qwidgetmetatype.cpp tests/auto/tools/moc/cxx11-explicit-override-control.h tests/auto/tools/moc/cxx11-final-classes.h tests/auto/tools/qdbuscpp2xml/test1.h 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 with Digia-1.1 exception
+License: LGPL-2.1-or-3 with Digia-1.1 exception
 
 Files: tests/manual/cocoa/menus/main.cpp src/plugins/platforms/cocoa/qcocoamenubar.mm src/plugins/platforms/cocoa/qcocoamenuitem.mm src/plugins/platforms/cocoa/qcocoamenu.h src/plugins/platforms/cocoa/qcocoasystemtrayicon.mm src/plugins/platforms/cocoa/qcocoasystemtrayicon.h src/plugins/platforms/cocoa/qcocoamenubar.h src/plugins/platforms/cocoa/qcocoamenuitem.h src/plugins/platforms/cocoa/qcocoamenu.mm
 Copyright: 2011 Klarälvdalens Datakonsult AB, a KDAB Group company
            2007-2008 Apple, Inc.
-License: LGPL-2.1 with Digia-1.1 exception
+License: LGPL-2.1-or-3 with Digia-1.1 exception
 
 Files: src/plugins/platforms/qnx/* src/plugins/bearer/blackberry/* config.tests/unix/slog2/slog2.cpp mkspecs/blackberry-x86-qcc/qplatformdefs.h mkspecs/qnx-x86-qcc/qplatformdefs.h mkspecs/blackberry-armv7le-qcc/qplatformdefs.h mkspecs/qnx-armv7le-qcc/qplatformdefs.h src/corelib/io/qstandardpaths_blackberry.cpp rc/corelib/io/qurl.cpp src/corelib/kernel/qeventdispatcher_blackberry.cpp src/corelib/kernel/qeventdispatcher_blackberry_p.h tests/auto/corelib/io/qurl/tst_qurl.cpp
 Copyright: 2009-2012 Research In Motion
-License: LGPL-2.1 with Digia-1.1 exception
+License: LGPL-2.1-or-3 with Digia-1.1 exceptionn
 
 Files: config.tests/unix/pcre/pcre.cpp src/3rdparty/pcre/import_from_pcre_tarball.sh src/corelib/tools/qregularexpression.cpp src/corelib/tools/qhash.cpp src/corelib/tools/qregularexpression.h src/corelib/doc/snippets/code/src_corelib_tools_qregularexpression.cpp tests/auto/tools/rcc/tst_rcc.cpp tests/auto/corelib/tools/qregularexpression/tst_qregularexpression.h tests/auto/corelib/tools/qregularexpression/tst_qregularexpression.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 with Digia-1.1 exception or GPL-3
+License: LGPL-2.1-or-3 with Digia-1.1 exceptionn or GPL-3
 
 Files: src/3rdparty/xcb/xcb-util-keysyms/keysyms.c src/3rdparty/xcb/xcb-util/xcb_aux.c src/3rdparty/xcb/include/xcb/xcb_renderutil.h src/3rdparty/xcb/xcb-util-renderutil/util.c src/3rdparty/xcb/xcb-util/xcb_aux.c src/3rdparty/xcb/include/xcb/xcb_bitops.h src/3rdparty/xcb/include/xcb/xcb_image.h src/3rdparty/xcb/include/xcb/xcb_pixel.h src/3rdparty/xcb/xcb-util-image/xcb_image.c src/3rdparty/xcb/xcb-util/event.c src/3rdparty/xcb/include/xcb/xcb_event.h src/3rdparty/xcb/include/xcb/xcb_icccm.h src/3rdparty/xcb/xcb-util-wm/icccm.c
 Copyright: 2006-2008 Jamey Sharp
@@ -63,7 +63,7 @@ License: MIT
 
 Files: src/network/kernel/qdnslookup_p.h src/network/kernel/qdnslookup_unix.cpp src/network/kernel/qdnslookup.h src/network/kernel/qdnslookup_win.cpp 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 with Digia-1.1 exception or GPL-3
+License: LGPL-2.1-or-3 with Digia-1.1 exceptionn or GPL-3
 
 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
@@ -128,31 +128,31 @@ License: W3C Software License (19980720)
 
 Files: config.tests/qpa/directfb/directfb.cpp config.tests/arch/arch.cpp config.tests/common/avx2/avx2.cpp src/printsupport/kernel/qtprintsupportglobal.h src/xml/qtxmlglobal.h src/gui/image/qimage_avx.cpp src/gui/painting/qdrawhelper_avx.cpp src/corelib/thread/qmutex.cpp src/corelib/thread/qmutex_linux.cpp src/corelib/thread/qmutex_p.h src/corelib/global/qglobal.h src/corelib/global/qcompilerdetection.h src/corelib/tools/qsimd.cpp src/corelib/io/qipaddress_p.h src/corelib/io/qurlquery.cpp src/corelib/io/qurl.h src/corelib/io/qurl_p.h src/corelib/io/qipaddress.cpp src/corelib/io/qurlrecode.cpp src/corelib/io/qurlquery.h src/corelib/io/qurl.cpp 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/corelib/tools/qsharedpointer/tst_qsharedpointer.cpp tests/auto/corelib/tools/qsharedpointer/nontracked.h tests/auto/corelib/tools/qsharedpointer/forwarddeclared.h tests/auto/corelib/tools/qsharedpointer/nontracked.cpp tests/auto/corelib/tools/qsharedpointer/forwarddeclared.cpp tests/auto/corelib/io/qurlquery/tst_qurlquery.cpp tests/auto/corelib/io/qurl/tst_qurl.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 with Digia-1.1 exception or GPL-3
+License: LGPL-2.1-or-3 with Digia-1.1 exceptionn or GPL-3
 
 Files: mkspecs/common/android/qplatformdefs.h mkspecs/unsupported/linux-android-armeabi-v7a-g++/qplatformdefs.h mkspecs/unsupported/linux-android-armeabi-g++/qplatformdefs.h mkspecs/unsupported/linux-android-x86-g++/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 with Digia-1.1 exception or GPL-3
+License: LGPL-2.1-or-3 with Digia-1.1 exceptionn or GPL-3
 
 Files: src/gui/painting/qt_mips_asm_dsp_p.h src/gui/painting/qdrawhelper_mips_dsp_p.h src/gui/painting/qdrawhelper_mips_dsp.cpp src/gui/painting/qdrawhelper_mips_dsp_asm.S src/gui/painting/qdrawhelper_mips_dspr2_asm.S
 Copyright: 2012 MIPS Technologies
-License: LGPL-2.1 with Digia-1.1 exception or GPL-3
+License: LGPL-2.1-or-3 with Digia-1.1 exceptionn or GPL-3
 
 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 with Digia-1.1 exception or GPL-3
+License: LGPL-2.1-or-3 with Digia-1.1 exceptionn or GPL-3
 
 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 with Digia-1.1 exception or GPL-3
+License: LGPL-2.1-or-3 with Digia-1.1 exceptionn or GPL-3
 
 Files: tests/benchmarks/corelib/tools/qalgorithms/tst_qalgorithms.cpp tests/benchmarks/corelib/kernel/qcoreapplication/main.cpp
 Copyright: 2011-2012 Robin Burchell
-License: LGPL-2.1 with Digia-1.1 exception or GPL-3
+License: LGPL-2.1-or-3 with Digia-1.1 exceptionn or GPL-3
 
 Files: src/corelib/codecs/qjpunicode.cpp src/corelib/codecs/qjpunicode.cpp src/corelib/codecs/qsjiscodec_p.h src/corelib/codecs/qsjiscodec_p.h src/corelib/codecs/qjiscodec_p.h src/corelib/codecs/qjiscodec_p.h src/corelib/codecs/qsjiscodec.cpp src/corelib/codecs/qeucjpcodec.cpp src/corelib/codecs/qeucjpcodec.cpp src/corelib/codecs/qjpunicode_p.h src/corelib/codecs/qjpunicode_p.h src/corelib/codecs/qeucjpcodec_p.h src/corelib/codecs/qeucjpcodec_p.h src/corelib/codecs/qjiscodec.cpp
 Copyright: 1999 Serika Kurusugawa
-License: LGPL-2.1 with Digia-1.1 exception or GPL-3
+License: LGPL-2.1-or-3 with Digia-1.1 exceptionn or GPL-3
 
 Files: src/3rdparty/angle/*
 Copyright: 2002-2010 The ANGLE Project Authors.
@@ -325,7 +325,7 @@ License:
 
 Files: tests/manual/widgets/itemviews/delegate/example.cpp tests/manual/widgets/itemviews/qheaderview/qheaderviewtest1.cpp tests/manual/widgets/qgraphicsview/rubberband/rubberbandtest.cpp 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 with Digia-1.1 exception or GPL-3
+License: LGPL-2.1-or-3 with Digia-1.1 exceptionn or GPL-3
 
 Files: src/3rdparty/freetype/src/pcf/pcfutil.c
 Copyright: 1990-1998 The Open Group
@@ -613,21 +613,23 @@ 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 with Digia-1.1 exception
- GNU Lesser General Public License version 2.1:
+License: LGPL-2.1-or-3 with Digia-1.1 exceptionn
+ GNU Lesser General Public License:
  This file may be used under the terms of the GNU Lesser General Public
- License version 2.1 as published by the Free Software Foundation and
- appearing in the file LICENSE.LGPL included in the packaging of this
- file. Please review the following information to ensure the GNU Lesser
- General Public License version 2.1 requirements will be met:
- http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+ 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
- can be found in `/usr/share/common-licenses/LGPL-2.1`.
+ 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

-- 
qtbase packaging

More information about the pkg-kde-commits mailing list