[neon/qt6/qt6-3d/Neon/release] debian: internal dep versions and lints

Carlos De Maine null at kde.org
Sun Dec 10 01:58:14 GMT 2023


Git commit 92f0b6bc7e0e2a0e1710ce4c45318dc1c4075caf by Carlos De Maine.
Committed on 10/12/2023 at 02:58.
Pushed by carlosdem into branch 'Neon/release'.

internal dep versions and lints

M  +125  -67   debian/control
A  +1    -0    debian/qt6-3d.lintian-overrides
M  +0    -11   debian/source/lintian-overrides

https://invent.kde.org/neon/qt6/qt6-3d/-/commit/92f0b6bc7e0e2a0e1710ce4c45318dc1c4075caf

diff --git a/debian/control b/debian/control
index 5d3b3f6..63d4b71 100644
--- a/debian/control
+++ b/debian/control
@@ -17,17 +17,17 @@ Build-Depends: cmake,
                ninja-build,
                pkg-config,
                pkg-kde-tools,
-               qt6-base-dev (>= 6.4.1+dfsg~),
-               qt6-declarative-dev (>= 6.4.1+dfsg~),
-               qt6-multimedia-dev (>= 6.4.1~),
-               qt6-quick3d-dev,
-               qt6-shadertools-dev (>= 6.4.1~),
+               qt6-base-dev (>= 6.6.1~),
+               qt6-declarative-dev (>= 6.6.1~),
+               qt6-multimedia-dev (>= 6.6.1~),
+               qt6-quick3d-dev (>= 6.6.1~),
+               qt6-shadertools-dev (>= 6.6.1~),
                xauth <!nocheck>,
                xvfb <!nocheck>,
                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-3d
@@ -39,9 +39,55 @@ Architecture: any
 Section: kde
 X-Neon-MergedPackage: true
 Pre-Depends: ${misc:Pre-Depends}
-Depends: libqt63dcore6 (= ${binary:Version}),
-         ${misc:Depends},
-         ${shlibs:Depends}
+Depends: ${misc:Depends}, ${shlibs:Depends}
+Provides: libqt63danimation6,
+          libqt63dcore6,
+          libqt63dextras6,
+          libqt63dinput6,
+          libqt63dlogic6,
+          libqt63dquick6,
+          libqt63dquickanimation6,
+          libqt63dquickextras6,
+          libqt63dquickinput6,
+          libqt63dquickrender6,
+          libqt63dquickscene2d6,
+          libqt63drender6,
+          qml6-module-qt3d-animation,
+          qml6-module-qt3d-core,
+          qml6-module-qt3d-extras,
+          qml6-module-qt3d-input,
+          qml6-module-qt3d-logic,
+          qml6-module-qt3d-render,
+          qml6-module-qt3d-scene2d,
+          qml6-module-qt3d-scene3d,
+          qt6-3d-assimpsceneimport-plugin,
+          qt6-3d-defaultgeometryloader-plugin,
+          qt6-3d-gltfsceneio-plugin,
+          qt6-3d-scene2d-plugin,
+Replaces: libqt63danimation6,
+          libqt63dcore6,
+          libqt63dextras6,
+          libqt63dinput6,
+          libqt63dlogic6,
+          libqt63dquick6,
+          libqt63dquickanimation6,
+          libqt63dquickextras6,
+          libqt63dquickinput6,
+          libqt63dquickrender6,
+          libqt63dquickscene2d6,
+          libqt63drender6,
+          qml6-module-qt3d-animation,
+          qml6-module-qt3d-core,
+          qml6-module-qt3d-extras,
+          qml6-module-qt3d-input,
+          qml6-module-qt3d-logic,
+          qml6-module-qt3d-render,
+          qml6-module-qt3d-scene2d,
+          qml6-module-qt3d-scene3d,
+          qt6-3d-assimpsceneimport-plugin,
+          qt6-3d-defaultgeometryloader-plugin,
+          qt6-3d-gltfsceneio-plugin,
+          qt6-3d-scene2d-plugin,
 Description: Qt 6 3D Core library
  Qt is a cross-platform C++ application framework. Qt's primary feature
  is its rich set of widgets that provide standard GUI functionality.
@@ -52,7 +98,13 @@ Package: qt6-3d-dev
 Architecture: any
 Section: kde
 X-Neon-MergedPackage: true
-Depends: qt6-3d (= ${binary:Version}), qt6-base-dev, ${misc:Depends}
+Pre-Depends: ${misc:Pre-Depends}
+Depends: qt6-3d (= ${binary:Version}),
+         qt6-base-dev,
+         ${misc:Depends},
+         ${shlibs:Depends}
+Provides: qt6-3d-doc-dev, qt6-3d-examples,
+Replaces: qt6-3d-doc-dev, qt6-3d-examples,
 Description: Qt 6 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.
@@ -64,172 +116,178 @@ Package: qt6-3d-doc
 Architecture: all
 Section: kde
 X-Neon-MergedPackage: true
-Depends: qt6-3d-dev (= ${binary:Version}), qt6-base-doc, ${misc:Depends}
-Description: Qt 6 3D - documentation files
+Pre-Depends: ${misc:Pre-Depends}
+Depends: qt6-3d-dev (= ${binary:Version}),
+         qt6-base-doc,
+         ${misc:Depends},
+         ${shlibs:Depends}
+Provides: qt6-3d-doc-html,
+Replaces: qt6-3d-doc-html,
+         Description: Qt 6 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.
  .
  This package contains the documentation files used to help build Qt 6
  applications using Qt 3D library.
 
-Package: libqt63dcore6
+Package: libqt63danimation6
 Architecture: all
-Depends: qt6-3d
+Depends: qt6-3d, ${misc:Depends}
 Description: Dummy transitional
  Transitional dummy package.
 
-Package: libqt63dquick6
+Package: libqt63dcore6
 Architecture: all
-Depends: qt6-3d
+Depends: qt6-3d, ${misc:Depends}
 Description: Dummy transitional
  Transitional dummy package.
 
-Package: libqt63dquickrender6
+Package: libqt63dextras6
 Architecture: all
-Depends: qt6-3d
+Depends: qt6-3d, ${misc:Depends}
 Description: Dummy transitional
  Transitional dummy package.
 
 Package: libqt63dinput6
 Architecture: all
-Depends: qt6-3d
+Depends: qt6-3d, ${misc:Depends}
 Description: Dummy transitional
  Transitional dummy package.
 
-Package: libqt63drender6
+Package: libqt63dlogic6
 Architecture: all
-Depends: qt6-3d
+Depends: qt6-3d, ${misc:Depends}
 Description: Dummy transitional
  Transitional dummy package.
 
-Package: libqt63dlogic6
+Package: libqt63dquick6
 Architecture: all
-Depends: qt6-3d
+Depends: qt6-3d, ${misc:Depends}
 Description: Dummy transitional
  Transitional dummy package.
 
-Package: libqt63dquickinput6
+Package: libqt63dquickrender6
 Architecture: all
-Depends: qt6-3d
+Depends: qt6-3d, ${misc:Depends}
 Description: Dummy transitional
  Transitional dummy package.
 
-Package: libqt63dquickextras6
+Package: libqt63dquickanimation6
 Architecture: all
-Depends: qt6-3d
+Depends: qt6-3d, ${misc:Depends}
 Description: Dummy transitional
  Transitional dummy package.
 
-Package: libqt63dextras6
+Package: libqt63dquickextras6
 Architecture: all
-Depends: qt6-3d
+Depends: qt6-3d, ${misc:Depends}
 Description: Dummy transitional
  Transitional dummy package.
 
-Package: libqt63dquickscene2d6
+Package: libqt63dquickinput6
 Architecture: all
-Depends: qt6-3d
+Depends: qt6-3d, ${misc:Depends}
 Description: Dummy transitional
  Transitional dummy package.
 
-Package: libqt63danimation6
+Package: libqt63dquickscene2d6
 Architecture: all
-Depends: qt6-3d
+Depends: qt6-3d, ${misc:Depends}
 Description: Dummy transitional
  Transitional dummy package.
 
-Package: libqt63dquickanimation6
+Package: libqt63drender6
 Architecture: all
-Depends: qt6-3d
+Depends: qt6-3d, ${misc:Depends}
 Description: Dummy transitional
  Transitional dummy package.
 
-Package: qt6-3d-gltfsceneio-plugin
+Package: qml6-module-qt3d-animation
 Architecture: all
-Depends: qt6-3d
+Depends: qt6-3d, ${misc:Depends}
 Description: Dummy transitional
  Transitional dummy package.
 
-Package: qt6-3d-assimpsceneimport-plugin
+Package: qml6-module-qt3d-core
 Architecture: all
-Depends: qt6-3d
+Depends: qt6-3d, ${misc:Depends}
 Description: Dummy transitional
  Transitional dummy package.
 
-Package: qt6-3d-defaultgeometryloader-plugin
+Package: qml6-module-qt3d-extras
 Architecture: all
-Depends: qt6-3d
+Depends: qt6-3d, ${misc:Depends}
 Description: Dummy transitional
  Transitional dummy package.
 
-Package: qt6-3d-scene2d-plugin
+Package: qml6-module-qt3d-input
 Architecture: all
-Depends: qt6-3d
+Depends: qt6-3d, ${misc:Depends}
 Description: Dummy transitional
  Transitional dummy package.
 
-Package: qml6-module-qt3d-core
+Package: qml6-module-qt3d-logic
 Architecture: all
-Depends: qt6-3d
+Depends: qt6-3d, ${misc:Depends}
 Description: Dummy transitional
  Transitional dummy package.
 
-Package: qml6-module-qt3d-animation
+Package: qml6-module-qt3d-render
 Architecture: all
-Depends: qt6-3d
+Depends: qt6-3d, ${misc:Depends}
 Description: Dummy transitional
  Transitional dummy package.
 
-Package: qml6-module-qt3d-extras
+Package: qml6-module-qtquick-scene2d
 Architecture: all
-Depends: qt6-3d
+Depends: qt6-3d, ${misc:Depends}
 Description: Dummy transitional
  Transitional dummy package.
 
-Package: qml6-module-qt3d-input
+Package: qml6-module-qtquick-scene3d
 Architecture: all
-Depends: qt6-3d
+Depends: qt6-3d, ${misc:Depends}
 Description: Dummy transitional
  Transitional dummy package.
 
-Package: qml6-module-qt3d-logic
+Package: qt6-3d-assimpsceneimport-plugin
 Architecture: all
-Depends: qt6-3d
+Depends: qt6-3d, ${misc:Depends}
 Description: Dummy transitional
  Transitional dummy package.
 
-Package: qml6-module-qt3d-render
+Package: qt6-3d-defaultgeometryloader-plugin
 Architecture: all
-Depends: qt6-3d
+Depends: qt6-3d, ${misc:Depends}
 Description: Dummy transitional
  Transitional dummy package.
 
-Package: qml6-module-qtquick-scene3d
+Package: qt6-3d-doc-dev
 Architecture: all
-Depends: qt6-3d
+Depends: qt6-3d-dev, ${misc:Depends}
 Description: Dummy transitional
  Transitional dummy package.
 
-Package: qml6-module-qtquick-scene2d
+Package: qt6-3d-doc-html
 Architecture: all
-Depends: qt6-3d
+Depends: qt6-3d-doc, ${misc:Depends}
 Description: Dummy transitional
  Transitional dummy package.
 
-Package: qt6-3d-doc-dev
+Package: qt6-3d-examples
 Architecture: all
-Depends: qt6-3d-dev
+Depends: qt6-3d-dev, ${misc:Depends}
 Description: Dummy transitional
  Transitional dummy package.
 
-Package: qt6-3d-doc-html
+Package: qt6-3d-gltfsceneio-plugin
 Architecture: all
-Depends: qt6-3d-doc
+Depends: qt6-3d, ${misc:Depends}
 Description: Dummy transitional
  Transitional dummy package.
 
-Package: qt6-3d-examples
+Package: qt6-3d-scene2d-plugin
 Architecture: all
-Depends: qt6-3d-dev
+Depends: qt6-3d, ${misc:Depends}
 Description: Dummy transitional
  Transitional dummy package.
diff --git a/debian/qt6-3d.lintian-overrides b/debian/qt6-3d.lintian-overrides
new file mode 100644
index 0000000..2d47182
--- /dev/null
+++ b/debian/qt6-3d.lintian-overrides
@@ -0,0 +1 @@
+qt6-3d: package-name-doesnt-match-sonames libQt63DAnimation6 libQt63DCore6 libQt63DExtras6 libQt63DInput6 libQt63DLogic6 libQt63DQuick6 libQt63DQuickAnimation6 libQt63DQuickExtras6 libQt63DQuickInput6 libQt63DQuickRender6 libQt63DQuickScene2D6 libQt63DRender6
diff --git a/debian/source/lintian-overrides b/debian/source/lintian-overrides
index dcc2b9b..41ee985 100644
--- a/debian/source/lintian-overrides
+++ b/debian/source/lintian-overrides
@@ -1,14 +1,3 @@
-# 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-3d 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.
-qt6-3d source: source-contains-prebuilt-ms-help-file [src/3rdparty/assimp/src/contrib/zlib/contrib/dotzlib/DotZLib.chm]
-qt6-3d source: source-contains-prebuilt-ms-help-file [src/3rdparty/assimp/src/doc/AssimpCmdDoc_Html/AssimpCmdDoc.chm]
-qt6-3d source: source-contains-prebuilt-ms-help-file [src/3rdparty/assimp/src/doc/AssimpDoc_Html/AssimpDoc.chm]
-
 # to make lintian/ftp-master happy :-/
 qt6-3d source: license-problem-json-evil src/3rdparty/assimp/src/contrib/rapidjson/license.txt
 qt6-3d source: source-contains-prebuilt-ms-help-file src/3rdparty/assimp/src/contrib/zlib/contrib/dotzlib/DotZLib.chm


More information about the Neon-commits mailing list