[neon/qt6/qt6-base/Neon/unstable] debian: fix build deps and lintians

[Carlos De Maine]

Git commit f12473e1104b5bd6b9e5fa4b97b7244f75c8453d by Carlos De Maine.
Committed on 27/04/2024 at 10:49.
Pushed by carlosdem into branch 'Neon/unstable'.

fix build deps and lintians

M  +4    -6    debian/control
M  +4    -4    debian/qt6-base-dev.lintian-overrides
M  +12   -4    debian/qt6-base.lintian-overrides

https://invent.kde.org/neon/qt6/qt6-base/-/commit/f12473e1104b5bd6b9e5fa4b97b7244f75c8453d

diff --git a/debian/control b/debian/control
index a2df435..0b859b5 100644
--- a/debian/control
+++ b/debian/control
@@ -7,10 +7,10 @@ Build-Depends: cmake,
                default-libmysqlclient-dev,
                dh-exec,
                firebird-dev [linux-any],
-               g++-12,
-               gcc-12,
+               g++,
+               gcc,
                glslang-tools,
-#               glslc,
+               glslc,
                libatspi2.0-dev,
                libb2-dev,
                libbrotli-dev,
@@ -24,7 +24,6 @@ Build-Depends: cmake,
                libgbm-dev [linux-any],
                libgif-dev,
                libgl-dev,
-               libgl1-mesa-dev,
                libgles-dev,
                libglib2.0-dev,
                libglu1-mesa-dev | libglu-dev,
@@ -148,7 +147,7 @@ Pre-Depends: ${misc:Pre-Depends},
 Depends: default-libmysqlclient-dev,
          firebird-dev,
          glslang-tools,
-#         glslc,
+         glslc,
          libatspi2.0-dev,
          libb2-dev,
          libbrotli-dev,
@@ -162,7 +161,6 @@ Depends: default-libmysqlclient-dev,
          libgif-dev,
          libgbm-dev,
          libgl-dev,
-         libgl1-mesa-dev,
          libgles-dev,
          libglib2.0-dev,
          libglu1-mesa-dev | libglu-dev,
diff --git a/debian/qt6-base-dev.lintian-overrides b/debian/qt6-base-dev.lintian-overrides
index cfe704e..e35afab 100644
--- a/debian/qt6-base-dev.lintian-overrides
+++ b/debian/qt6-base-dev.lintian-overrides
@@ -1,4 +1,4 @@
-qt6-base-dev: executable-not-elf-or-script usr/lib/*/cmake/Qt6/libexec/qt-internal-ninja.bat.in
-qt6-base-dev: executable-not-elf-or-script usr/lib/*/cmake/Qt6/libexec/qt-internal-strip.bat.in
-
-qt6-base-dev: no-code-sections [usr/lib/*/libQt6ExampleIcons.a]
\ No newline at end of file
+qt6-base-dev: executable-not-elf-or-script [usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6/libexec/qt-internal-ninja.bat.in]
+qt6-base-dev: executable-not-elf-or-script [usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6/libexec/qt-internal-strip.bat.in]
+qt6-base-dev: no-code-sections [usr/lib/*/libQt6ExampleIcons.a]
+qt6-base-dev: no-manual-page [usr/bin/qtpaths6]
diff --git a/debian/qt6-base.lintian-overrides b/debian/qt6-base.lintian-overrides
index 277e923..b66cb3e 100644
--- a/debian/qt6-base.lintian-overrides
+++ b/debian/qt6-base.lintian-overrides
@@ -6,7 +6,15 @@ qt6-base: package-name-doesnt-match-sonames libQt6Concurrent6 libQt6Core6 libQt6
 
 qt6-base: script-uses-bin-env /bin/env [usr/lib/*/qt6/examples/corelib/serialization/cbordump/cbortag.py]
 
-qt6-base: ships-undeclared-shared-library libQt6EglFSDeviceIntegration6 for usr/lib/${DEB_HOST_MULTIARCH}/libQt6EglFSDeviceIntegration.so.6.6.0
-qt6-base: ships-undeclared-shared-library libQt6EglFsKmsGbmSupport6 for usr/lib/${DEB_HOST_MULTIARCH}/libQt6EglFsKmsGbmSupport.so.6.6.0
-qt6-base: ships-undeclared-shared-library libQt6EglFsKmsSupport6 for usr/lib/${DEB_HOST_MULTIARCH}/libQt6EglFsKmsSupport.so.6.6.0
-qt6-base: ships-undeclared-shared-library libQt6XcbQpa6 for usr/lib/${DEB_HOST_MULTIARCH}/libQt6XcbQpa.so.6.6.0
+qt6-base: ships-undeclared-shared-library libQt6EglFSDeviceIntegration6 for usr/lib/${DEB_HOST_MULTIARCH}/libQt6EglFSDeviceIntegration.so.6.*.*
+qt6-base: ships-undeclared-shared-library libQt6EglFsKmsGbmSupport6 for usr/lib/${DEB_HOST_MULTIARCH}/libQt6EglFsKmsGbmSupport.so.6.*.*
+qt6-base: ships-undeclared-shared-library libQt6EglFsKmsSupport6 for usr/lib/${DEB_HOST_MULTIARCH}/libQt6EglFsKmsSupport.so.6.*.*
+qt6-base: ships-undeclared-shared-library libQt6XcbQpa6 for usr/lib/${DEB_HOST_MULTIARCH}/libQt6XcbQpa.so.6.*.*
+
+qt6-base: ships-undeclared-shared-library libQt6EglFSDeviceIntegration 6 for usr/lib/${DEB_HOST_MULTIARCH}/libQt6EglFSDeviceIntegration.so.6.*.* [shlibs]
+qt6-base: ships-undeclared-shared-library libQt6EglFsKmsGbmSupport 6 for usr/lib/${DEB_HOST_MULTIARCH}/libQt6EglFsKmsGbmSupport.so.6.*.* [shlibs]
+qt6-base: ships-undeclared-shared-library libQt6EglFsKmsSupport 6 for usr/lib/${DEB_HOST_MULTIARCH}/libQt6EglFsKmsSupport.so.6.*.* [shlibs]
+qt6-base: ships-undeclared-shared-library libQt6XcbQpa 6 for usr/lib/${DEB_HOST_MULTIARCH}/libQt6XcbQpa.so.6.*.* [shlibs]
+
+qt6-base: no-manual-page [usr/bin/aarch64-linux-gnu-qmake6]
+qt6-base: no-manual-page [usr/bin/qmake6]