[neon/qt6/qt6-quick3d/Neon/release] debian: linting

[Carlos De Maine]

Git commit 76e6c7772685c1b4336eb236c07defbc9daea89c by Carlos De Maine.
Committed on 14/12/2023 at 05:39.
Pushed by carlosdem into branch 'Neon/release'.

linting

M  +2    -2    debian/control
M  +35   -36   debian/copyright
M  +0    -4    debian/source/lintian-overrides

https://invent.kde.org/neon/qt6/qt6-quick3d/-/commit/76e6c7772685c1b4336eb236c07defbc9daea89c

diff --git a/debian/control b/debian/control
index 3aadf2b..71aaf8a 100644
--- a/debian/control
+++ b/debian/control
@@ -88,7 +88,7 @@ Section: kde
 X-Neon-MergedPackage: true
 Pre-Depends: ${misc:Pre-Depends}
 Depends: qt6-base-doc,
-         qt6-quick3d-dev (= ${binary:Version}),
+         qt6-quick3d-dev,
          ${misc:Depends},
          ${shlibs:Depends}
 Provides: qt6-quick3d-doc-html,
@@ -161,7 +161,7 @@ Description: Dummy transitional
 
 Package: libqt6quick3dutils6
 Architecture: all
-Depends: qt6-quick3d
+Depends: qt6-quick3d, ${misc:Depends}
 Description: Dummy transitional
  Transitional dummy package.
 
diff --git a/debian/copyright b/debian/copyright
index 2250b42..f21a247 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -7,16 +7,48 @@ Copyright: 2019-2021 The Qt Company Ltd.
            2008-2014 NVIDIA Corporation
 License: GPL-3+
 
+Files: .clang-format
+Copyright: 2016 Olivier Goffart <ogoffart at woboq.com>
+License: BSD-3-clause
+
+Files: *.qdoc
+Copyright: 2019-2021 The Qt Company Ltd.
+License: GFDL-NIV-1.3
+
 Files: debian/*
 Copyright: 2021-2022 Patrick Franz <deltaone at debian.org>
            2021 Lu YaNing <dluyaning at gmail.com>
 License: GPL-3+
 
-Files: .clang-format
-Copyright: 2016 Olivier Goffart <ogoffart at woboq.com>
+Files: examples/*
+       tests/auto/quick3d_lancelot/data/*.qml
+       tests/auto/quick3d_lancelot/scenegrabber/skingeometry.*
+       tests/auto/quick3d_visual/buffermanager/data/*
+       tests/auto/quick3d_visual/buffermanager/gradienttexture.cpp
+       tests/auto/quick3d_visual/buffermanager/gradienttexture.h
+       tests/auto/tools/shadergen/qml/*.qml
+       tests/manual/3d_input/*
+       tests/manual/blendmodes/*
+       tests/manual/dynamic3DTest/*
+       tests/manual/dynamicenvmap/*
+       tests/manual/instancing/*
+       tests/manual/lightmap_concept/*
+       tests/manual/loader/*
+       tests/manual/modelblendparticles/*
+       tests/manual/modelparticles/*
+       tests/manual/offscreenrendermode/*
+       tests/manual/principledmaterial/*
+       tests/manual/projectionmodes/*
+       tests/manual/reflectionprobe/*
+       tests/manual/repeater3d/*
+       tests/manual/ssao/*
+       tests/manual/stereoscopic/SceneNode.qml
+       tests/manual/unlit_lit_test/*
+       tests/manual/vertexAttributes/*
+       tests/manual/view3DDeleteTest/*
+Copyright: 2019-2021 The Qt Company Ltd.
 License: BSD-3-clause
 
-
 Files: src/3rdparty/assimp/src/contrib/openddlparser/*
 Copyright: 2014-2020 Kim Kulling
 License: Expat
@@ -73,39 +105,6 @@ Files: src/plugins/qmldbg_quick3dprofiler/*
 Copyright: 2021 The Qt Company Ltd.
 License: LGPL-3 or GPL-2
 
-Files: examples/*
-       tests/auto/quick3d_lancelot/data/*.qml
-       tests/auto/quick3d_lancelot/scenegrabber/skingeometry.*
-       tests/auto/quick3d_visual/buffermanager/data/*
-       tests/auto/quick3d_visual/buffermanager/gradienttexture.cpp
-       tests/auto/quick3d_visual/buffermanager/gradienttexture.h
-       tests/auto/tools/shadergen/qml/*.qml
-       tests/manual/3d_input/*
-       tests/manual/blendmodes/*
-       tests/manual/dynamic3DTest/*
-       tests/manual/dynamicenvmap/*
-       tests/manual/instancing/*
-       tests/manual/lightmap_concept/*
-       tests/manual/loader/*
-       tests/manual/modelblendparticles/*
-       tests/manual/modelparticles/*
-       tests/manual/offscreenrendermode/*
-       tests/manual/principledmaterial/*
-       tests/manual/projectionmodes/*
-       tests/manual/reflectionprobe/*
-       tests/manual/repeater3d/*
-       tests/manual/ssao/*
-       tests/manual/stereoscopic/SceneNode.qml
-       tests/manual/unlit_lit_test/*
-       tests/manual/vertexAttributes/*
-       tests/manual/view3DDeleteTest/*
-Copyright: 2019-2021 The Qt Company Ltd.
-License: BSD-3-clause
-
-Files: *.qdoc
-Copyright: 2019-2021 The Qt Company Ltd.
-License: GFDL-NIV-1.3
-
 License: GPL-3+
  This program is free software: you can redistribute it and/or modify
  it under the terms of the GNU General Public License version 3 or (at
diff --git a/debian/source/lintian-overrides b/debian/source/lintian-overrides
index 10ecc96..a6c1bf7 100644
--- a/debian/source/lintian-overrides
+++ b/debian/source/lintian-overrides
@@ -1,10 +1,6 @@
 # to make lintian/ftp-master happy :-/
 qt6-quick3d source: license-problem-json-evil src/3rdparty/assimp/src/contrib/rapidjson/license.txt
 
-# False positive: files under JSON license are not actually present
-# (they would be at i.e. src/3rdparty/assimp/contrib/rapidjson/bin/jsonchecker/ if they were)
-qt6-quick3d source: license-problem-json-evil [src/3rdparty/assimp/src/contrib/rapidjson/license.txt]
-
 # The file is not shipped, neither is the source code next to it built,
 # but the contents of the chm are entirely generated from the source
 # code.