[neon/qt6/qt6-base/Neon/unstable] debian: drop patch to see if it fixes the problem that all cmake files in cmake/Qt6BuildInternals/StandaloneTests/ do not work leading to cmake linting errors

Carlos De Maine null at kde.org
Sat Nov 25 10:24:01 GMT 2023


Git commit 26a99a522f714eafc7fdfa5ad66eeebc2871bdfc by Carlos De Maine.
Committed on 25/11/2023 at 11:24.
Pushed by carlosdem into branch 'Neon/unstable'.

drop patch to see if it fixes the problem that all cmake files in cmake/Qt6BuildInternals/StandaloneTests/ do not work leading to cmake linting errors

M  +1    -1    debian/patches/series
M  +3    -3    debian/qt6-base-dev.lintian-overrides
M  +1    -1    debian/qt6-base.lintian-overrides

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

diff --git a/debian/patches/series b/debian/patches/series
index ac8f47b..c703ebd 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -22,7 +22,7 @@ Add-SH-detection.patch
 
 # Debian specific
 remove_privacy_breaches.diff
-build_path_embedded_qtbuildinternalsextra_cmake.patch
+#build_path_embedded_qtbuildinternalsextra_cmake.patch
 cross.patch
 force_shared_libzstd.patch
 #no_htmlinfo_example.patch #### no longer required
diff --git a/debian/qt6-base-dev.lintian-overrides b/debian/qt6-base-dev.lintian-overrides
index d9abdf3..cfe704e 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/${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: 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/${DEB_HOST_MULTIARCH}/libQt6ExampleIcons.a]
\ No newline at end of file
+qt6-base-dev: no-code-sections [usr/lib/*/libQt6ExampleIcons.a]
\ No newline at end of file
diff --git a/debian/qt6-base.lintian-overrides b/debian/qt6-base.lintian-overrides
index e765105..db20aca 100644
--- a/debian/qt6-base.lintian-overrides
+++ b/debian/qt6-base.lintian-overrides
@@ -1,4 +1,4 @@
-qt6-base: no-manual-page usr/bin/${DEB_HOST_MULTIARCH}-qmake6
+qt6-base: no-manual-page usr/bin/*-qmake6
 qt6-base: no-manual-page usr/bin/qmake6
 qt6-base: no-manual-page usr/bin/qtpaths6
 qt6-base: package-name-doesnt-match-sonames libQt6Concurrent6 libQt6Core6 libQt6DBus6 libQt6EglFSDeviceIntegration6 libQt6EglFsKmsGbmSupport6 libQt6EglFsKmsSupport6 libQt6Gui6 libQt6Network6 libQt6OpenGL6 libQt6OpenGLWidgets6 libQt6PrintSupport6 libQt6Sql6 libQt6Test6 libQt6Widgets6 libQt6XcbQpa6 libQt6Xml6


More information about the Neon-commits mailing list