[neon/qt6/qt6-quick3d/Neon/release] debian: lints and internal version deps

Carlos De Maine null at kde.org
Sat Dec 9 11:11:52 GMT 2023


Git commit b17ec556f6c909fb6cda0a513273347405490c8b by Carlos De Maine.
Committed on 09/12/2023 at 12:11.
Pushed by carlosdem into branch 'Neon/release'.

lints and internal version deps

M  +111  -41   debian/control
M  +0    -85   debian/copyright
A  +1    -0    debian/qt6-quick3d-dev.lintian-overrides
A  +1    -0    debian/qt6-quick3d.lintian-overrides

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

diff --git a/debian/control b/debian/control
index f87f7ff..1964f4f 100644
--- a/debian/control
+++ b/debian/control
@@ -18,14 +18,14 @@ Build-Depends: cmake,
                ninja-build,
                pkg-config,
                pkg-kde-tools,
-               qt6-base-dev (>= 6.4.2+dfsg~),
-               qt6-declarative-dev (>= 6.4.2+dfsg~),
-               qt6-quicktimeline-dev (>= 6.4.2~),
-               qt6-shadertools-dev (>= 6.4.2~),
+               qt6-base-dev (>= 6.6.1~),
+               qt6-declarative-dev (>= 6.6.1~),
+               qt6-quicktimeline-dev (>= 6.6.1~),
+               qt6-shadertools-dev (>= 6.6.1~),
                zlib1g-dev
-Build-Depends-Indep: qt6-base-dev (>= 6.4~) <!nodoc>,
-                     qt6-documentation-tools (>= 6.4~) <!nodoc>,
-                     qt6-base-doc (>= 6.4~) <!nodoc>,
+Build-Depends-Indep: qt6-base-dev (>= 6.6~) <!nodoc>,
+                     qt6-documentation-tools (>= 6.6~) <!nodoc>,
+                     qt6-base-doc (>= 6.6~) <!nodoc>,
 Standards-Version: 4.6.2
 Homepage: https://www.qt.io/developers/
 Vcs-Browser: https://salsa.debian.org/qt-kde-team/qt6/qt6-quick3d
@@ -37,9 +37,64 @@ Architecture: any
 Section: kde
 X-Neon-MergedPackage: true
 Pre-Depends: ${misc:Pre-Depends}
-Depends: libqt6quick3d6 (= ${binary:Version}),
-         ${misc:Depends},
-         ${shlibs:Depends}
+Depends: ${misc:Depends}, ${shlibs:Depends}
+Provides: libqt6quick3d6,
+          libqt6quick3dassetimport6,
+          libqt6quick3dassetutils6,
+          libqt6quick3deffects6,
+          libqt6quick3dglslparser6,
+          libqt6quick3dhelpers6,
+          libqt6quick3diblbaker6,
+          libqt6quick3dparticleeffects6
+          libqt6quick3dparticles6,
+          libqt6quick3druntimerender6,
+          libqt6quick3dutils6,
+          qml6-module-quick3d,
+          qml6-module-quick3d-assetutils,
+          qml6-module-quick3d-effects,
+          qml6-module-quick3d-helpers,
+          qml6-module-quick3d-particleeffects,
+          qml6-module-quick3d-particles3d,
+          qt6-qmltooling-quick3dprofiler-plugin,
+          qt6-quick3d-assetimporters-plugin,
+Replaces: libqt6quick3d6,
+          libqt6quick3dassetimport6,
+          libqt6quick3dassetutils6,
+          libqt6quick3deffects6,
+          libqt6quick3dglslparser6,
+          libqt6quick3dhelpers6,
+          libqt6quick3diblbaker6,
+          libqt6quick3dparticleeffects6
+          libqt6quick3dparticles6,
+          libqt6quick3druntimerender6,
+          libqt6quick3dutils6,
+          qml6-module-quick3d,
+          qml6-module-quick3d-assetutils,
+          qml6-module-quick3d-effects,
+          qml6-module-quick3d-helpers,
+          qml6-module-quick3d-particleeffects,
+          qml6-module-quick3d-particles3d,
+          qt6-qmltooling-quick3dprofiler-plugin,
+          qt6-quick3d-assetimporters-plugin,
+Breaks: libqt6quick3d6,
+        libqt6quick3dassetimport6,
+        libqt6quick3dassetutils6,
+        libqt6quick3deffects6,
+        libqt6quick3dglslparser6,
+        libqt6quick3dhelpers6,
+        libqt6quick3diblbaker6,
+        libqt6quick3dparticleeffects6
+        libqt6quick3dparticles6,
+        libqt6quick3druntimerender6,
+        libqt6quick3dutils6,
+        qml6-module-quick3d,
+        qml6-module-quick3d-assetutils,
+        qml6-module-quick3d-effects,
+        qml6-module-quick3d-helpers,
+        qml6-module-quick3d-particleeffects,
+        qml6-module-quick3d-particles3d,
+        qt6-qmltooling-quick3dprofiler-plugin,
+        qt6-quick3d-assetimporters-plugin,
 Description: Qt 6 Quick 3D library
  Qt is a cross-platform C++ application framework. Qt's primary feature
  is its rich set of widgets that provide standard GUI functionality.
@@ -50,10 +105,20 @@ Package: qt6-quick3d-dev
 Architecture: any
 Section: kde
 X-Neon-MergedPackage: true
+Pre-Depends: ${misc:Pre-Depends}
 Depends: qt6-base-dev,
          qt6-quick3d (= ${binary:Version}),
-         qt6-quick3d-dev-tools (= ${binary:Version}),
-         ${misc:Depends}
+         ${misc:Depends},
+         ${shlibs:Depends}
+Provides: qt6-quick3d-dev-tools,
+          qt6-quick3d-doc-dev,
+          qt6-quick3d-examples,
+Replaces: qt6-quick3d-dev-tools,
+          qt6-quick3d-doc-dev,
+          qt6-quick3d-examples,
+Breaks: qt6-quick3d-dev-tools,
+        qt6-quick3d-doc-dev,
+        qt6-quick3d-examples,
 Description: Qt 6 Quick 3D - development files
  Qt is a cross-platform C++ application framework. Qt's primary feature
  is its rich set of widgets that provide standard GUI functionality.
@@ -65,9 +130,14 @@ Package: qt6-quick3d-doc
 Architecture: all
 Section: kde
 X-Neon-MergedPackage: true
+Pre-Depends: ${misc:Pre-Depends}
 Depends: qt6-base-doc,
          qt6-quick3d-dev (= ${binary:Version}),
-         ${misc:Depends}
+         ${misc:Depends},
+         ${shlibs:Depends}
+Provides: qt6-quick3d-doc-html,
+Replaces: qt6-quick3d-doc-html,
+Breaks: qt6-quick3d-doc-html,
 Description: Qt 6 Quick 3D - documentation files
  Qt is a cross-platform C++ application framework. Qt's primary feature
  is its rich set of widgets that provide standard GUI functionality.
@@ -77,61 +147,61 @@ Description: Qt 6 Quick 3D - documentation files
 
 Package: libqt6quick3d6
 Architecture: all
-Depends: qt6-quick3d
+Depends: qt6-quick3d, ${misc:Depends}
 Description: Dummy transitional
  Transitional dummy package.
 
 Package: libqt6quick3dassetimport6
 Architecture: all
-Depends: qt6-quick3d
+Depends: qt6-quick3d, ${misc:Depends}
 Description: Dummy transitional
  Transitional dummy package.
 
 Package: libqt6quick3dassetutils6
 Architecture: all
-Depends: qt6-quick3d
+Depends: qt6-quick3d, ${misc:Depends}
 Description: Dummy transitional
  Transitional dummy package.
 
 Package: libqt6quick3deffects6
 Architecture: all
-Depends: qt6-quick3d
+Depends: qt6-quick3d, ${misc:Depends}
 Description: Dummy transitional
  Transitional dummy package.
 
 Package: libqt6quick3dglslparser6
 Architecture: all
-Depends: qt6-quick3d
+Depends: qt6-quick3d, ${misc:Depends}
 Description: Dummy transitional
  Transitional dummy package.
 
 Package: libqt6quick3dhelpers6
 Architecture: all
-Depends: qt6-quick3d
+Depends: qt6-quick3d, ${misc:Depends}
 Description: Dummy transitional
  Transitional dummy package.
 
 Package: libqt6quick3diblbaker6
 Architecture: all
-Depends: qt6-quick3d
+Depends: qt6-quick3d, ${misc:Depends}
 Description: Dummy transitional
  Transitional dummy package.
 
 Package: libqt6quick3dparticleeffects6
 Architecture: all
-Depends: qt6-quick3d
+Depends: qt6-quick3d, ${misc:Depends}
 Description: Dummy transitional
  Transitional dummy package.
 
 Package: libqt6quick3dparticles6
 Architecture: all
-Depends: qt6-quick3d
+Depends: qt6-quick3d, ${misc:Depends}
 Description: Dummy transitional
  Transitional dummy package.
 
 Package: libqt6quick3druntimerender6
 Architecture: all
-Depends: qt6-quick3d
+Depends: qt6-quick3d, ${misc:Depends}
 Description: Dummy transitional
  Transitional dummy package.
 
@@ -143,72 +213,72 @@ Description: Dummy transitional
 
 Package: qt6-quick3d-assetimporters-plugin
 Architecture: all
-Depends: qt6-quick3d
+Depends: qt6-quick3d, ${misc:Depends}
 Description: Dummy transitional
  Transitional dummy package.
 
 Package: qml6-module-quick3d
 Architecture: all
-Depends: qt6-quick3d
+Depends: qt6-quick3d, ${misc:Depends}
 Description: Dummy transitional
  Transitional dummy package.
 
-Package: qml6-module-quick3d-helpers
+Package: qml6-module-quick3d-assetutils
 Architecture: all
-Depends: qt6-quick3d
+Depends: qt6-quick3d, ${misc:Depends}
 Description: Dummy transitional
  Transitional dummy package.
 
-Package: qml6-module-quick3d-assetutils
+Package: qml6-module-quick3d-effects
 Architecture: all
-Depends: qt6-quick3d
+Depends: qt6-quick3d, ${misc:Depends}
 Description: Dummy transitional
  Transitional dummy package.
 
-Package: qml6-module-quick3d-particleeffects
+Package: qml6-module-quick3d-helpers
 Architecture: all
-Depends: qt6-quick3d
+Depends: qt6-quick3d, ${misc:Depends}
 Description: Dummy transitional
  Transitional dummy package.
 
-Package: qml6-module-quick3d-particles3d
+Package: qml6-module-quick3d-particleeffects
 Architecture: all
-Depends: qt6-quick3d
+Depends: qt6-quick3d, ${misc:Depends}
 Description: Dummy transitional
  Transitional dummy package.
 
-Package: qml6-module-quick3d-effects
+Package: qml6-module-quick3d-particles3d
 Architecture: all
-Depends: qt6-quick3d
+Depends: qt6-quick3d, ${misc:Depends}
 Description: Dummy transitional
  Transitional dummy package.
 
 Package: qt6-qmltooling-quick3dprofiler-plugin
 Architecture: all
-Depends: qt6-quick3d
+Depends: qt6-quick3d, ${misc:Depends}
 Description: Dummy transitional
  Transitional dummy package.
 
 Package: qt6-quick3d-dev-tools
 Architecture: all
-Depends: qt6-quick3d-dev
+Depends: qt6-quick3d-dev, ${misc:Depends}
 Description: Dummy transitional
-  Transitional dummy package.
+ Transitional dummy package.
 
 Package: qt6-quick3d-doc-dev
 Architecture: all
-Depends: qt6-quick3d-dev
+Depends: qt6-quick3d-dev, ${misc:Depends}
 Description: Dummy transitional
  Transitional dummy package.
 
 Package: qt6-quick3d-doc-html
 Architecture: all
-Depends: qt6-quick3d-doc
+Depends: qt6-quick3d-doc, ${misc:Depends}
 Description: Dummy transitional
  Transitional dummy package.
 
 Package: qt6-quick3d-examples
 Architecture: all
-Depends: qt6-quick3d-dev
+Depends: qt6-quick3d-dev, ${misc:Depends}
 Description: Dummy transitional
  Transitional dummy package.
diff --git a/debian/copyright b/debian/copyright
index 2fba30e..2250b42 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -16,55 +16,6 @@ Files: .clang-format
 Copyright: 2016 Olivier Goffart <ogoffart at woboq.com>
 License: BSD-3-clause
 
-Files: conanfile.py
-Copyright: 2021 The Qt Company Ltd.
-License: GPL-3 with Qt-1.0 exception
-
-Files: src/3rdparty/assimp/*
-Copyright: 2006-2020 assimp team / ASSIMP Development Team
-License: BSD-3-clause
-
-Files: src/3rdparty/assimp/src/cmake-modules/HunterGate.cmake
-Copyright: 2013-2019 Ruslan Baratov
-License: BSD-2-clause
-
-Files: src/3rdparty/assimp/src/cmake-modules/Coveralls*
-Copyright: 2014 Joakim Söderberg <joakim.soderberg at gmail.com>
-License: Expat
-
-Files: src/3rdparty/assimp/src/code/AssetLib/M3D/m3d.h
-Copyright: 2019 bzt (bztsrc at gitlab)
-License: Expat
-
-Files: src/3rdparty/assimp/src/contrib/stb/stb_image.h
-Copyright: NONE
-License: Unlicense
-
-Files: src/3rdparty/assimp/src/contrib/clipper/*
-Copyright: 2010-2012 Angus Johnson
-License: Boost-1.0
-
-Files: src/3rdparty/assimp/src/contrib/draco/*
-Copyright: 2016-2020, The Draco Authors.
-License: Apache-2.0
-
-Files: src/3rdparty/assimp/src/contrib/gtest/*
-Copyright: 2003-2015, Google Inc.
-License: BSD-3-clause
-
-Files: src/3rdparty/assimp/src/contrib/draco/src/draco/tools/fuzz/*
-       src/3rdparty/assimp/src/contrib/gtest/scripts/upload.py
-Copyright: 2007, 2020, Google Inc.
-License: Apache-2.0
-
-Files: src/3rdparty/assimp/src/contrib/Open3DGC/*
-Copyright: 2013 Khaled Mammou - Advanced Micro Devices, Inc.
-License: Expat
-
-Files: src/3rdparty/assimp/src/contrib/Open3DGC/o3dgcArithmeticCodec.cpp
-       src/3rdparty/assimp/src/contrib/Open3DGC/o3dgcArithmeticCodec.h
-Copyright: 2004 Amir Said (said at ieee.org) & William A. Pearlman (pearlw at ecse.rpi.edu)
-License: BSD-2-clause
 
 Files: src/3rdparty/assimp/src/contrib/openddlparser/*
 Copyright: 2014-2020 Kim Kulling
@@ -89,18 +40,6 @@ Copyright: Rich Geldreich (miniz author)
            Kuba Podgórski
 License: Unlicense
 
-Files: src/3rdparty/assimp/src/contrib/zlib/*
-Copyright: 1995-2017 Jean-loup Gailly and Mark Adler
-License: Zlib
-
-Files: src/3rdparty/assimp/src/contrib/zlib/contrib/ada/*
-Copyright: 2002-2004 Dmitriy Anisimkov
-License: GPL-3
-
-Files: src/3rdparty/assimp/src/contrib/zlib/contrib/dotzlib/*
-Copyright: Henrik Ravn 2004
-License: Boost-1.0
-
 Files: src/3rdparty/assimp/src/contrib/zlib/contrib/iostream2/*
 Copyright: 1997 Christian Michelsen Research AS
 License: NTP
@@ -163,30 +102,6 @@ Files: examples/*
 Copyright: 2019-2021 The Qt Company Ltd.
 License: BSD-3-clause
 
-Files: tests/auto/quick3d_lancelot/quick3d/tst_quick3d.cpp
-       tests/auto/quick3d_lancelot/scenegrabber/dynamicgeometry.*
-       tests/auto/quick3d_lancelot/scenegrabber/dynamictexturedata.*
-       tests/auto/quick3d_lancelot/scenegrabber/indextrianglestopology.*
-       tests/auto/quick3d_lancelot/scenegrabber/main.cpp
-       tests/auto/quick3d_lancelot/scenegrabber/nonindextrianglestopology.*
-       tests/auto/quick3d_lancelot/scenegrabber/pointstopology.*
-       tests/auto/quick3d_lancelot/hostinfo.sh
-       tests/auto/quick3d_lancelot/shared/baselineprotocol.*
-       tests/auto/quick3d_lancelot/shared/lookup3.cpp
-       tests/auto/quick3d_lancelot/shared/qbaselinetest.*
-       tests/auto/quick3d_visual/buffermanager/tst_buffermanager.cpp
-       tests/auto/quick3d_visual/input/data/DragAnywhereSlider.qml
-       tests/auto/quick3d_visual/input/tst_input.cpp
-       tests/auto/quick3d_visual/multiwindow/tst_multiwindow.cpp
-       tests/auto/quick3d_visual/picking/tst_picking.cpp
-       tests/auto/quick3d_visual/rendercontrol/tst_rendercontrol.cpp
-       tests/auto/quick3d_visual/shared/util.*
-       tests/auto/quick3d_visual/simplescene/tst_simplescene.cpp
-       tests/auto/quick3d_visual/smoketest/tst_smoketest.cpp
-       tests/manual/loader2/*
-Copyright: 2016-2021 The Qt Company Ltd.
-License: GPL-3 with Qt-1.0 exception
-
 Files: *.qdoc
 Copyright: 2019-2021 The Qt Company Ltd.
 License: GFDL-NIV-1.3
diff --git a/debian/qt6-quick3d-dev.lintian-overrides b/debian/qt6-quick3d-dev.lintian-overrides
new file mode 100644
index 0000000..bc5659c
--- /dev/null
+++ b/debian/qt6-quick3d-dev.lintian-overrides
@@ -0,0 +1 @@
+qt6-quick3d-dev: no-code-sections [usr/lib/x86_64-linux-gnu/libQt6BundledEmbree.a]
diff --git a/debian/qt6-quick3d.lintian-overrides b/debian/qt6-quick3d.lintian-overrides
new file mode 100644
index 0000000..2ca66b6
--- /dev/null
+++ b/debian/qt6-quick3d.lintian-overrides
@@ -0,0 +1 @@
+package-name-doesnt-match-sonames libQt6Quick3D6 libQt6Quick3DAssetImport6 libQt6Quick3DAssetUtils6 libQt6Quick3DEffects6 libQt6Quick3DGlslParser6 libQt6Quick3DHelpers6 libQt6Quick3DHelpersImpl6 libQt6Quick3DIblBaker6 libQt6Quick3DParticleEffects6 libQt6Quick3DParticles6 libQt6Quick3DRuntimeRender6 libQt6Quick3DUtils6


More information about the Neon-commits mailing list