[SCM] qtbase packaging branch, experimental, updated. debian/5.9.1+dfsg-10-6-g7f7345b

[Dmitry Shachnev]

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

The following commit has been merged in the experimental branch:
commit 7f7345b8fb4b3622c8c882dd28cc53738e90fce7
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date:   Sun Sep 24 16:10:42 2017 +0300

    Update debian/copyright.
---
 debian/changelog |  1 +
 debian/copyright | 54 +++++++++++++++++++++---------------------------------
 2 files changed, 22 insertions(+), 33 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 5e6e91e..227b8fb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,7 @@ qtbase-opensource-src (5.9.2+dfsg-1) UNRELEASED; urgency=medium
   * Stop excluding src/3rdparty/zlib/doc/rfc*.txt from the tarball,
     these files are no longer shipped by upstream.
   * Update symbols files from the current build log.
+  * Update debian/copyright.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sat, 23 Sep 2017 23:28:13 +0300
 
diff --git a/debian/copyright b/debian/copyright
index 3ee72c6..d015ca3 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,4 +1,4 @@
-Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: qtbase-opensource-src
 Source: https://download.qt.io/official_releases/qt/*/submodules/
 Files-Excluded: tests/auto/corelib/tools/qbytearray/rfc3252.txt
@@ -568,6 +568,12 @@ 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-2.1-or-3 with Qt-1.1 exception
+
+Files: tests/auto/tools/qmake/testdata/rawString/object2.h
+Copyright: 2015 The Qt Company Ltd.
+License: LGPL-2.1-or-3 with Qt-1.1 exception
+
 ## LGPL-3 or GPL-2
 
 Files: src/corelib/tools/qcollator_macx.cpp
@@ -584,8 +590,7 @@ Copyright: 2013 Aleix Pol Gonzalez <aleixpol at kde.org>
            2016 The Qt Company Ltd.
 License: LGPL-3 or GPL-2
 
-Files: config.tests/unix/sctp/sctp.cpp
-       src/network/socket/qsctpserver.cpp
+Files: src/network/socket/qsctpserver.cpp
        src/network/socket/qsctpserver.h
        src/network/socket/qsctpserver_p.h
        src/network/socket/qsctpsocket.cpp
@@ -600,12 +605,12 @@ Copyright: 2015-2016 Alex Trotsenko <alex1973tr at gmail.com>
            2016 The Qt Company Ltd.
 License: LGPL-3 or GPL-2
 
-Files: 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/common/qnx/qplatformdefs.h
+Files: src/3rdparty/libpng/import_from_libpng_tarball.sh
+       src/3rdparty/zlib/import_from_zlib_tarball.sh
+Copyright: 2017 André Klitzing
+License: LGPL-3 or GPL-2
+
+Files: mkspecs/common/qnx/qplatformdefs.h
        mkspecs/qnx-armle-v7-qcc/qplatformdefs.h
        mkspecs/qnx-x86-qcc/qplatformdefs.h
        src/corelib/io/qfileselector.h
@@ -919,15 +924,7 @@ Files: src/corelib/tools/qstring_mips_dsp_asm.S
 Copyright: 2013 Imagination Technologies Limited, www.imgtec.com
 License: LGPL-3 or GPL-2
 
-Files: config.tests/common/atomic64/atomic64.cpp
-       config.tests/common/atomicfptr/atomicfptr.cpp
-       config.tests/common/avx2/avx2.cpp
-       config.tests/common/avx512/avx512.cpp
-       config.tests/common/c++14/c++14.cpp
-       config.tests/common/c++1z/c++1z.cpp
-       config.tests/qpa/directfb/directfb.cpp
-       config.tests/unix/cloexec/cloexec.cpp
-       config.tests/unix/eventfd/main.cpp
+Files: config.tests/avx512/avx512.cpp
        mkspecs/features/data/unix/findclasslist.pl
        src/corelib/global/qglobal_p.h
        src/corelib/global/qglobalstatic.h
@@ -1092,6 +1089,7 @@ Files: bin/syncqt.pl
        src/network/kernel/qnetworkinterface.cpp
        src/network/kernel/qnetworkinterface_unix.cpp
        src/network/kernel/qnetworkinterface_win.cpp
+       src/network/kernel/qnetworkproxy_libproxy.cpp
        src/network/socket/qabstractsocket.cpp
        src/network/socket/qabstractsocketengine_p.h
        src/network/socket/qnativesocketengine.cpp
@@ -1104,7 +1102,7 @@ Files: bin/syncqt.pl
        src/testlib/qtest.h
        src/testlib/qtestcase.cpp
        src/widgets/kernel/qwidget.cpp
-Copyright: 2016 Intel Corporation.
+Copyright: 2016-2017 Intel Corporation.
            2016-2017 The Qt Company Ltd.
 License: LGPL-3 or GPL-2
 
@@ -1195,13 +1193,7 @@ Copyright: 2016 Jolla Ltd, author: <gunnar.sletta at jollamobile.com>
            2016 The Qt Company Ltd.
 License: LGPL-3 or GPL-2
 
-Files: config.tests/unix/journald/journald.c
-       config.tests/unix/mtdev/mtdev.cpp
-Copyright: 2013-2014 Jolla Ltd, author: <robin.burchell at jollamobile.com>
-License: LGPL-3 or GPL-2
-
-Files: config.tests/unix/pcre2/pcre2.cpp
-       mkspecs/haiku-g++/qplatformdefs.h
+Files: mkspecs/haiku-g++/qplatformdefs.h
        src/3rdparty/pcre2/import_from_pcre2_tarball.sh
        src/corelib/global/qhooks.cpp
        src/corelib/global/qhooks_p.h
@@ -1526,10 +1518,6 @@ Copyright: 2013 Samuel Gaist <samuel.gaist at edeltech.ch>
            2016 The Qt Company Ltd.
 License: LGPL-3 or GPL-2
 
-Files: config.tests/unix/syslog/syslog.c
-Copyright: 2015 Tasuku Suzuki <stasuku at gmail.com>
-License: LGPL-3 or GPL-2
-
 Files: src/plugins/platforms/xcb/qxcbsessionmanager.cpp
        src/plugins/platforms/xcb/qxcbsessionmanager.h
 Copyright: 2013 Teo Mrnjavac <teo at kde.org>
@@ -1985,9 +1973,9 @@ License: wintab
  The text and information contained in this file may be freely used,
  copied, or distributed without compensation or licensing restrictions.
 
-Files: src/3rdparty/zlib/*
-Copyright: 1995-2010 Jean-loup Gailly
-           1995-2010 Mark Adler
+Files: src/3rdparty/zlib/src/*
+Copyright: 1995-2017 Jean-loup Gailly
+           1995-2017 Mark Adler
 License: Zlib
  This software is provided 'as-is', without any express or implied
  warranty.  In no event will the authors be held liable for any damages

-- 
qtbase packaging