[neon/qt/qbs/Neon/release] debian: debian/copyright: Fixup and merge copyright blocks

[Marius Gripsgard]

Git commit de13c6cb770bc0be6be4f37d97b32bc9660794e9 by Marius Gripsgard.
Committed on 22/02/2022 at 23:31.
Pushed by jriddell into branch 'Neon/release'.

debian/copyright: Fixup and merge copyright blocks

M  +25   -36   debian/copyright

https://invent.kde.org/neon/qt/qbs/commit/de13c6cb770bc0be6be4f37d97b32bc9660794e9

diff --git a/debian/copyright b/debian/copyright
index 1dfd14a..b98055c 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -81,6 +81,7 @@ Copyright: 2015, Petroules Corporation
 License: BSD-3-clause
 
 Files: src/lib/corelib/buildgraph/transformerchangetracking.*
+       src/shared/variant/variant.h
        tests/*
 Copyright: 2016-2018, The Qt Company Ltd.
 License: GPL-3 with Qt-1.0 exception
@@ -227,16 +228,25 @@ Files: share/qbs/modules/codesign/android.qbs
 Copyright: 2021, Raphaël Cotty <raphael.cotty at gmail.com>
 License: LGPL-2.1-or-3 with Qt-1.1 exception
 
-Files: share/qbs/module-providers/qbspkgconfig.qbs
- src/lib/corelib/jsextensions/pkgconfigjs.cpp
- src/lib/corelib/jsextensions/pkgconfigjs.h
- src/lib/pkgconfig/pcpackage.cpp
- src/lib/pkgconfig/pcpackage.h
- src/lib/pkgconfig/pcparser.cpp
- src/lib/pkgconfig/pcparser.h
- src/lib/pkgconfig/pkgconfig.cpp
- src/lib/pkgconfig/pkgconfig.h
-Copyright: 2021, Ivan Komissarov (abbapoh at gmail.com)
+Files: scripts/build-qbs-with-cmake.sh
+       scripts/cpu-count.sh
+       scripts/run-analyzer.sh
+       scripts/test-qbs.sh
+       scripts/test-qt.sh
+       scripts/build-qbs-doc.sh
+       src/app/qbs-setup-toolchains/clangclprobe.cpp
+       src/app/qbs-setup-toolchains/clangclprobe.h
+       share/qbs/module-providers/qbspkgconfig.qbs *!230
+       src/lib/corelib/jsextensions/pkgconfigjs.cpp
+       src/lib/corelib/jsextensions/pkgconfigjs.h
+       src/lib/pkgconfig/pcpackage.cpp
+       src/lib/pkgconfig/pcpackage.h
+       src/lib/pkgconfig/pcparser.cpp
+       src/lib/pkgconfig/pcparser.h
+       src/lib/pkgconfig/pkgconfig.cpp
+       src/lib/pkgconfig/pkgconfig.h
+       tests/auto/blackbox/testdata-qt/moc-compiler-defines/object.h
+Copyright: 2019-2021, Ivan Komissarov <abbapoh at gmail.com>
 License: LGPL-3 or GPL-2
 
 Files: share/qbs/imports/qbs/Probes/CosmicProbe.qbs
@@ -252,18 +262,10 @@ Files: share/qbs/imports/qbs/Probes/CosmicProbe.qbs
 Copyright: 2021, Denis Shienkov <denis.shienkov at gmail.com>
 License: LGPL-3 or GPL-2
 
-Files: src/lib/corelib/tools/porting.h
-Copyright: 2021, The Qt Company Ltd.
-License: LGPL-3 or GPL-2
-
 Files: src/shared/variant/variant.hpp
 Copyright: Michael Park, 2015-2017
 License: BSL-1.0
 
-Files: src/shared/variant/variant.h
-Copyright: 2017, The Qt Company Ltd.
-License: GPL-3 with Qt-1.0 exception
-
 Files: src/lib/corelib/language/moduleproviderloader.cpp
  src/lib/corelib/language/moduleproviderloader.h
 Copyright: 2021, Ivan Komissarov (abbapoh at gmail.com)
@@ -368,7 +370,9 @@ Files: doc/reference/items/convenience/library.qdoc
        doc/reference/items/probe/path-probe.qdoc
        doc/reference/items/probe/pkgconfig-probe.qdoc
        doc/reference/modules/capnprotocpp-module.qdoc
-Copyright: 2018-2020, Ivan Komissarov <abbapoh at gmail.com>
+       doc/reference/module-providers/qbspkgconfig-module-provider.qdoc
+       doc/reference/module-providers/qt-module-provider.qdoc
+Copyright: 2018-2021, Ivan Komissarov <abbapoh at gmail.com>
 License: GFDL-NIV-1.3
 
 Files: doc/reference/modules/codesign-module.qdoc
@@ -430,24 +434,13 @@ Files: docker/focal/entrypoint.sh
 Copyright: 2019, Richard Weickelt <richard at weickelt.de>
 License: LGPL-3 or GPL-2
 
-Files: scripts/build-qbs-with-cmake.sh
-       scripts/cpu-count.sh
-       scripts/run-analyzer.sh
-       scripts/test-qbs.sh
-       scripts/test-qt.sh
-       src/app/qbs-setup-toolchains/clangclprobe.cpp
-       src/app/qbs-setup-toolchains/clangclprobe.h
-       tests/auto/blackbox/testdata-qt/moc-compiler-defines/object.h
-Copyright: 2019-2020, Ivan Komissarov <abbapoh at gmail.com>
-License: LGPL-3 or GPL-2
-
 Files: doc/reference/module-providers/qbspkgconfig-module-provider.qdoc
- doc/reference/module-providers/qt-module-provider.qdoc
+       doc/reference/module-providers/qt-module-provider.qdoc
 Copyright: 2021, Ivan Komissarov (abbapoh at gmail.com)
 License: GFDL-NIV-1.3
 
 Files: tests/auto/pkgconfig/tst_pkgconfig.cpp
- tests/auto/pkgconfig/tst_pkgconfig.h
+       tests/auto/pkgconfig/tst_pkgconfig.h
 Copyright: 2021, Ivan Komissarov (abbapoh at gmail.com)
 License: GPL-3 with Qt-1.0 exception
 
@@ -467,10 +460,6 @@ Files: scripts/test-for-android.sh
 Copyright: 2019, Richard Weickelt.
 License: LGPL-3 or GPL-2
 
-Files: scripts/build-qbs-doc.sh
-Copyright: 2021, Ivan Komissarov (abbapoh at gmail.com).
-License: LGPL-3 or GPL-2
-
 Files: scripts/test-qt4.sh
 Copyright: 2020, Raphael Cotty
 License: LGPL-3 or GPL-2