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

Carlos De Maine null at kde.org
Sun Dec 10 08:56:33 GMT 2023


Git commit 4397d29b8fee3b508f32af217e543d317ae7450d by Carlos De Maine.
Committed on 10/12/2023 at 09:56.
Pushed by carlosdem into branch 'Neon/release'.

lints and internal version deps

M  +40   -26   debian/control
M  +1    -0    debian/qt6-quick3dphysics-dev.install
M  +0    -1    debian/qt6-quick3dphysics-doc.install
A  +1    -0    debian/qt6-quick3dphysics.lintian-overrides
M  +8    -7    debian/source/lintian-overrides

https://invent.kde.org/neon/qt6/qt6-quick3dphysics/-/commit/4397d29b8fee3b508f32af217e543d317ae7450d

diff --git a/debian/control b/debian/control
index 4ee9888..af1d49c 100644
--- a/debian/control
+++ b/debian/control
@@ -11,22 +11,14 @@ Build-Depends: cmake,
                ninja-build,
                pkg-config,
                pkg-kde-tools,
-               qml6-module-quick3d,
-               qml6-module-quick3d-assetutils,
-               qml6-module-quick3d-effects,
-               qml6-module-quick3d-helpers,
-               qml6-module-quick3d-particleeffects,
-               qml6-module-quick3d-particles3d,
-               qt6-base-dev,
-               qt6-base-private-dev,
-               qt6-declarative-dev,
-               qt6-declarative-private-dev,
-               qt6-qmltooling-quick3dprofiler-plugin,
-               qt6-quick3d-dev,
+               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,
-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-quick3dphysics
@@ -38,7 +30,15 @@ Architecture: any
 Section: kde
 X-Neon-MergedPackage: true
 Pre-Depends: ${misc:Pre-Depends}
-Depends: qml6-module-qtquick, ${misc:Depends}, ${shlibs:Depends}
+Depends: qt6-declarative,
+         ${misc:Depends},
+         ${shlibs:Depends}
+Provides: libqt6quick3dphysics6,
+          libqt6quick3dphysicshelpers6,
+          qml6-module-qtquick3d-physics,
+Replaces: libqt6quick3dphysics6,
+          libqt6quick3dphysicshelpers6,
+          qml6-module-qtquick3d-physics,
 Description: Qt 6 Quick 3D Physics library
  Qt is a cross-platform C++ application framework. Qt's primary feature
  is its rich set of widgets that provide standard GUI functionality.
@@ -49,7 +49,17 @@ Package: qt6-quick3dphysics-dev
 Architecture: any
 Section: kde
 X-Neon-MergedPackage: true
-Depends: qt6-base-dev, qt6-quick3dphysics (= ${binary:Version}), ${misc:Depends}
+Pre-Depends: ${misc:Pre-Depends}
+Depends: qt6-base-dev,
+         qt6-quick3dphysics (= ${binary:Version}),
+         ${misc:Depends},
+         ${shlibs:Depends}
+Provides: qt6-quick3dphysics-dev-tools,
+          qt6-quick3dphysics-doc-dev
+          qt6-quick3dphysics-example,
+Replaces: qt6-quick3dphysics-dev-tools,
+          qt6-quick3dphysics-doc-dev
+          qt6-quick3dphysics-example,
 Description: Qt 6 Quick 3D Physics library
  Qt is a cross-platform C++ application framework. Qt's primary feature
  is its rich set of widgets that provide standard GUI functionality.
@@ -60,10 +70,14 @@ Package: qt6-quick3dphysics-doc
 Architecture: all
 Section: kde
 X-Neon-MergedPackage: true
+Pre-Depends: ${misc:Pre-Depends}
 Depends: qt6-base-doc,
          qt6-quick3dphysics-dev (= ${binary:Version}),
-         ${misc:Depends}
-Description: Qt 6 Quick 3D Physics library - development files
+         ${misc:Depends},
+         ${shlibs:Depends}
+Provides: qt6-quick3dphysics-doc-html,
+Replaces: qt6-quick3dphysics-doc-html,
+         Description: Qt 6 Quick 3D Physics library - 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.
  .
@@ -72,42 +86,42 @@ Description: Qt 6 Quick 3D Physics library - development files
 
 Package: libqt6quick3dphysics6
 Architecture: all
-Depends: qt6-quick3dphysics
+Depends: qt6-quick3dphysics, ${misc:Depends}
 Description: Dummy transitional
  Transitional dummy package.
 
 Package: libqt6quick3dphysicshelpers6
 Architecture: all
-Depends: qt6-quick3dphysics
+Depends: qt6-quick3dphysics, ${misc:Depends}
 Description: Dummy transitional
  Transitional dummy package.
 
 Package: qml6-module-qtquick3d-physics
 Architecture: all
-Depends: qt6-quick3dphysics
+Depends: qt6-quick3dphysics, ${misc:Depends}
 Description: Dummy transitional
  Transitional dummy package.
 
 Package: qt6-quick3dphysics-dev-tools
 Architecture: all
-Depends: qt6-quick3dphysics-dev
+Depends: qt6-quick3dphysics-dev, ${misc:Depends}
 Description: Dummy transitional
  Transitional dummy package.
 
 Package: qt6-quick3dphysics-doc-dev
 Architecture: all
-Depends: qt6-quick3dphysics-dev
+Depends: qt6-quick3dphysics-dev, ${misc:Depends}
 Description: Dummy transitional
  Transitional dummy package.
 
 Package: qt6-quick3dphysics-doc-html
 Architecture: all
-Depends: qt6-quick3dphysics-doc
+Depends: qt6-quick3dphysics-doc, ${misc:Depends}
 Description: Dummy transitional
  Transitional dummy package.
 
 Package: qt6-quick3dphysics-examples
 Architecture: all
-Depends: qt6-quick3dphysics-doc
+Depends: qt6-quick3dphysics-dev, ${misc:Depends}
 Description: Dummy transitional
  Transitional dummy package.
diff --git a/debian/qt6-quick3dphysics-dev.install b/debian/qt6-quick3dphysics-dev.install
index 699e0de..66f0391 100644
--- a/debian/qt6-quick3dphysics-dev.install
+++ b/debian/qt6-quick3dphysics-dev.install
@@ -13,6 +13,7 @@ usr/lib/${DEB_HOST_MULTIARCH}/libQt6Quick3DPhysics.so
 usr/lib/${DEB_HOST_MULTIARCH}/libQt6Quick3DPhysicsHelpers.prl
 usr/lib/${DEB_HOST_MULTIARCH}/libQt6Quick3DPhysicsHelpers.so
 usr/lib/${DEB_HOST_MULTIARCH}/pkgconfig/
+usr/lib/${DEB_HOST_MULTIARCH}/qt6/examples/
 usr/lib/${DEB_HOST_MULTIARCH}/qt6/metatypes/
 usr/lib/${DEB_HOST_MULTIARCH}/qt6/mkspecs/modules/
 usr/lib/${DEB_HOST_MULTIARCH}/qt6/modules/
diff --git a/debian/qt6-quick3dphysics-doc.install b/debian/qt6-quick3dphysics-doc.install
index ccdb08c..8536ff4 100644
--- a/debian/qt6-quick3dphysics-doc.install
+++ b/debian/qt6-quick3dphysics-doc.install
@@ -1,2 +1 @@
-usr/lib/${DEB_HOST_MULTIARCH}/qt6/examples/
 usr/share/qt6/doc/
diff --git a/debian/qt6-quick3dphysics.lintian-overrides b/debian/qt6-quick3dphysics.lintian-overrides
new file mode 100644
index 0000000..c1ec5ec
--- /dev/null
+++ b/debian/qt6-quick3dphysics.lintian-overrides
@@ -0,0 +1 @@
+qt6-quick3dphysics: package-name-doesnt-match-sonames libQt6Quick3DPhysics6 libQt6Quick3DPhysicsHelpers6
diff --git a/debian/source/lintian-overrides b/debian/source/lintian-overrides
index 171c880..0fdf849 100644
--- a/debian/source/lintian-overrides
+++ b/debian/source/lintian-overrides
@@ -1,9 +1,10 @@
 # Lintian gives a false positive for the globbing order.
 # See https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=970274
-qt6-quick3dphysics source: globbing-patterns-out-of-order examples/* *.qdoc examples/quick3dphysics/cannon/doc/src/qtquick3dphysics-examples-cannon.qdoc
-qt6-quick3dphysics source: globbing-patterns-out-of-order examples/* *.qdoc examples/quick3dphysics/compoundshapes/doc/src/qtquick3dphysics-examples-compoundshapes.qdoc
-qt6-quick3dphysics source: globbing-patterns-out-of-order examples/* *.qdoc examples/quick3dphysics/customshapes/doc/src/qtquick3dphysics-examples-customshapes.qdoc
-qt6-quick3dphysics source: globbing-patterns-out-of-order examples/* *.qdoc examples/quick3dphysics/impeller/doc/src/qtquick3dphysics-examples-impeller.qdoc
-qt6-quick3dphysics source: globbing-patterns-out-of-order examples/* *.qdoc examples/quick3dphysics/mass/doc/src/qtquick3dphysics-examples-mass.qdoc
-qt6-quick3dphysics source: globbing-patterns-out-of-order examples/* *.qdoc examples/quick3dphysics/material/doc/src/qtquick3dphysics-examples-material.qdoc
-qt6-quick3dphysics source: globbing-patterns-out-of-order examples/* *.qdoc examples/quick3dphysics/simple/doc/src/qtquick3dphysics-examples-simple.qdoc
+qt6-quick3dphysics source: globbing-patterns-out-of-order examples/* *.qdoc examples/quick3dphysics/cannon/doc/src/qtquick3dphysics-examples-cannon.qdoc [debian/copyright:46]
+qt6-quick3dphysics source: globbing-patterns-out-of-order examples/* *.qdoc examples/quick3dphysics/charactercontroller/doc/src/qtquick3dphysics-examples-charactercontroller.qdoc [debian/copyright:46]
+qt6-quick3dphysics source: globbing-patterns-out-of-order examples/* *.qdoc examples/quick3dphysics/compoundshapes/doc/src/qtquick3dphysics-examples-compoundshapes.qdoc [debian/copyright:46]
+qt6-quick3dphysics source: globbing-patterns-out-of-order examples/* *.qdoc examples/quick3dphysics/customshapes/doc/src/qtquick3dphysics-examples-customshapes.qdoc [debian/copyright:46]
+qt6-quick3dphysics source: globbing-patterns-out-of-order examples/* *.qdoc examples/quick3dphysics/impeller/doc/src/qtquick3dphysics-examples-impeller.qdoc [debian/copyright:46]
+qt6-quick3dphysics source: globbing-patterns-out-of-order examples/* *.qdoc examples/quick3dphysics/mass/doc/src/qtquick3dphysics-examples-mass.qdoc [debian/copyright:46]
+qt6-quick3dphysics source: globbing-patterns-out-of-order examples/* *.qdoc examples/quick3dphysics/material/doc/src/qtquick3dphysics-examples-material.qdoc [debian/copyright:46]
+qt6-quick3dphysics source: globbing-patterns-out-of-order examples/* *.qdoc examples/quick3dphysics/simple/doc/src/qtquick3dphysics-examples-simple.qdoc [debian/copyright:46]


More information about the Neon-commits mailing list