[SCM] qtbase packaging branch, experimental, updated. debian/5.4.0+dfsg-4-25-g199b71b

Wed Feb 18 08:12:01 UTC 2015

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

The following commit has been merged in the experimental branch:
commit 199b71bb4cb6562d8a532a50fdbbe93e229eead5
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date:   Wed Feb 18 11:11:11 2015 +0300

    Update debian/copyright.
---
 debian/changelog |  1 +
 debian/copyright | 36 +++++++++++++-----------------------
 2 files changed, 14 insertions(+), 23 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 1aae617..886f0e4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -28,6 +28,7 @@ qtbase-opensource-src (5.4.0+dfsg-5) UNRELEASED; urgency=medium
   * Remove references to ia64 and s390 from the symbols files.
     Build logs for these architectures are no longer available.
   * Move QtOpenGL CMake files from qtbase5-dev to libqt5opengl5-dev.
+  * Update debian/copyright.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Tue, 30 Dec 2014 23:42:00 +0100
 
diff --git a/debian/copyright b/debian/copyright
index 18a92a8..46c80fb 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -3,8 +3,8 @@ Upstream-Name: qtbase-opensource-src
 Source: http://releases.qt-project.org/qt5/*/submodules/
 
 Files: *
-Copyright: 2012 Digia Plc and/or its subsidiary(-ies)
-License: LGPL-2.1-or-3 with Digia-1.1 exception or GPL-3
+Copyright: 2012-2015 Digia Plc and/or its subsidiary(-ies)
+License: LGPL-2.1-or-3 with Digia-1.1 exception
 
 Files: examples/* doc/src/snippets/* src/*/doc/snippets/* tests/manual/qlocale/*
        src/winmain/qtmain_win.cpp src/tools/qdoc/doc/examples/componentset/*
@@ -24,6 +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>
+           2013-2015 Dmitry Shachnev <mitya57 at debian.org>
 License: LGPL-2.1-or-3 with Digia-1.1 exception
 
 Files: src/testlib/3rdparty/callgrind_p.h
@@ -93,7 +94,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 or GPL-3
+License: LGPL-2.1-or-3 with Digia-1.1 exception
 
 Files: src/3rdparty/xcb/xcb-util-keysyms/keysyms.c
        src/3rdparty/xcb/xcb-util/xcb_aux.c
@@ -125,7 +126,7 @@ Files: src/network/kernel/qdnslookup_p.h
        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 or GPL-3
+License: LGPL-2.1-or-3 with Digia-1.1 exception
 
 Files: src/network/doc/snippets/code/src_network_kernel_qdnslookup.cpp
        examples/network/dnslookup/dnslookup.cpp
@@ -227,14 +228,14 @@ Files: config.tests/qpa/directfb/directfb.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 or GPL-3
+License: LGPL-2.1-or-3 with Digia-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 or GPL-3
+License: LGPL-2.1-or-3 with Digia-1.1 exception
 
 Files: src/gui/painting/qt_mips_asm_dsp_p.h
        src/gui/painting/qdrawhelper_mips_dsp_p.h
@@ -242,22 +243,22 @@ 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 or GPL-3
+License: LGPL-2.1-or-3 with Digia-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 or GPL-3
+License: LGPL-2.1-or-3 with Digia-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 or GPL-3
+License: LGPL-2.1-or-3 with Digia-1.1 exception
 
 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-or-3 with Digia-1.1 exception or GPL-3
+License: LGPL-2.1-or-3 with Digia-1.1 exception
 
 Files: src/corelib/codecs/qjpunicode.cpp
        src/corelib/codecs/qsjiscodec_p.h
@@ -268,7 +269,7 @@ 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 or GPL-3
+License: LGPL-2.1-or-3 with Digia-1.1 exception
 
 Files: src/3rdparty/angle/*
 Copyright: 2002-2010 The ANGLE Project Authors.
@@ -445,7 +446,7 @@ Files: tests/manual/widgets/itemviews/delegate/example.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-or-3 with Digia-1.1 exception or GPL-3
+License: LGPL-2.1-or-3 with Digia-1.1 exception
 
 Files: src/3rdparty/freetype/src/pcf/pcfutil.c
 Copyright: 1990-1998 The Open Group
@@ -775,17 +776,6 @@ License: LGPL-2.1-or-3 with Digia-1.1 exception
  Furthermore, you are not required to apply this additional permission to a
  modified version of the Library.
 
-License: GPL-3
- Alternatively, this file may be used under the terms of the GNU General
- Public License version 3.0 as published by the Free Software Foundation
- and appearing in the file LICENSE.GPL included in the packaging of this
- file. Please review the following information to ensure the GNU General
- Public License version 3.0 requirements will be met:
- http://www.gnu.org/copyleft/gpl.html.
- .
- On Debian systems, the complete text of the GNU Public Licenses can be found
- in `/usr/share/common-licenses/GPL-3`.
-
 License: BSD-3-clause
  You may use this file under the terms of the BSD license as follows:
  .

-- 
qtbase packaging

