[neon/qt/qt3d/Neon/testing] debian: Update debian/copyright.

Dmitry Shachnev null at kde.org
Tue May 18 14:56:08 BST 2021


Git commit 45c85f6348b9e570b1147343261acdb3ca2a6fe4 by Dmitry Shachnev.
Committed on 22/11/2020 at 17:57.
Pushed by sitter into branch 'Neon/testing'.

Update debian/copyright.

M  +1    -0    debian/changelog
M  +22   -5    debian/copyright

https://invent.kde.org/neon/qt/qt3d/commit/45c85f6348b9e570b1147343261acdb3ca2a6fe4

diff --git a/debian/changelog b/debian/changelog
index 615f915..5eec6e7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,7 @@ qt3d-opensource-src (5.15.2+dfsg-1) UNRELEASED; urgency=medium
   * Bump Qt build-dependencies to 5.15.2.
   * Build-depend only on the needed documentation tools, not on the
     large qttools5-dev-tools package.
+  * Update debian/copyright.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Fri, 20 Nov 2020 20:13:21 +0300
 
diff --git a/debian/copyright b/debian/copyright
index 92a2526..29937ef 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -30,14 +30,14 @@ Copyright: 2007-2012 Fathi Boudra <fabo at debian.org>
 License: LGPL-3 or GPL-2
 
 Files: src/3rdparty/assimp/*
-Copyright: 2006-2017 assimp team / ASSIMP Development Team
+Copyright: 2006-2018 assimp team / ASSIMP Development Team
            2005-2007 Paul Hsieh
            2002 Randy Reddig & seaw0lf
 License: BSD-3-clause
 
 Files: src/3rdparty/assimp/contrib/clipper/*
 Copyright: 2010-2012 Angus Johnson
-License: Boost-1.0
+License: BSL-1.0
 
 Files: src/3rdparty/assimp/contrib/irrXML/*
 Copyright: 2002-2005 Nikolaus Gebhardt
@@ -67,6 +67,12 @@ License: Expat
 Comment: license.txt mentions the JSON license, however the files to which
  it applied are actually stripped.
 
+Files: src/3rdparty/assimp/contrib/rapidjson/include/rapidjson/msinttypes/inttypes.h
+       src/3rdparty/assimp/contrib/rapidjson/include/rapidjson/msinttypes/stdint.h
+Copyright: 2006-2013 Alexander Chemeris
+           2015 THL A29 Limited
+License: BSD-3-clause
+
 Files: src/3rdparty/assimp/contrib/unzip/*
 Copyright: 1990-2000 Info-ZIP
            1998-2005 Gilles Vollant
@@ -74,7 +80,12 @@ License: Zlib
 
 Files: src/3rdparty/assimp/contrib/utf8cpp/*
 Copyright: 2006 Nemanja Trifunovic
-License: Boost-1.0
+License: BSL-1.0
+
+Files: src/3rdparty/assimp/contrib/zip/*
+Copyright: Rich Geldreich (miniz author)
+           Kuba Podgórski
+License: Unlicense
 
 Files: src/3rdparty/imgui/*
 Copyright: 2014-2018 Omar Cornut
@@ -99,7 +110,6 @@ Files: examples/*
        src/extras/shaders/*
        src/quick3d/quick3dextras/qt3dquickwindow.cpp
        src/quick3d/quick3dextras/qt3dquickwindow.h
-       tests/auto/render/*.qml
        tests/manual/*
 Copyright: 2014-2019 Klarälvdalens Datakonsult AB (KDAB)
            2016-2020 The Qt Company Ltd.
@@ -140,6 +150,13 @@ Copyright: 2016-2017 The Qt Company Ltd.
            2014-2019 Klarälvdalens Datakonsult AB (KDAB)
 License: LGPL-3 or GPL-2
 
+Files: tests/auto/extras/qtext2dentity/*
+       tests/auto/global/aspects_startup_shutdown/tst_aspects_startup_shutdown.cpp
+       tests/auto/render/*.qml
+Copyright: 2019 The Qt Company Ltd.
+           2016-2019 Klarälvdalens Datakonsult AB (KDAB)
+License: BSD-3-clause
+
 Files: examples/qt3d/exampleresources/assets/cubemaps/miramar/*
 Copyright: 2005 Jockum Skoglund <hipshot at zfight.com>
 License: miramar
@@ -670,7 +687,7 @@ License: CC-BY-4.0
      that apply to the Licensor or You, including from the legal
      processes of any jurisdiction or authority.
 
-License: Boost-1.0
+License: BSL-1.0
  Boost Software License - Version 1.0 - August 17th, 2003
  http://www.boost.org/LICENSE_1_0.txt
  .



More information about the Neon-commits mailing list