[neon/qt6/qt6-base/Neon/unstable] debian: ore lints and drop outdated rules overrides

[Carlos De Maine]

Git commit cdbf7ad1d0801b92ede013cfea826aa4e146f722 by Carlos De Maine.
Committed on 25/11/2023 at 08:31.
Pushed by carlosdem into branch 'Neon/unstable'.

ore lints and drop outdated rules overrides

D  +0    -1    debian/.gitattributes
D  +0    -1    debian/.gitignore
M  +3    -3    debian/qt6-base-dev.lintian-overrides
M  +5    -5    debian/qt6-base.lintian-overrides
M  +4    -4    debian/rules

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

diff --git a/debian/.gitattributes b/debian/.gitattributes
deleted file mode 100644
index 6a03163..0000000
--- a/debian/.gitattributes
+++ /dev/null
@@ -1 +0,0 @@
-changelog merge=dpkg-mergechangelogs
diff --git a/debian/.gitignore b/debian/.gitignore
deleted file mode 100644
index 027271b..0000000
--- a/debian/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-files
diff --git a/debian/qt6-base-dev.lintian-overrides b/debian/qt6-base-dev.lintian-overrides
index 1cdd48e..d9abdf3 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: 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]
\ No newline at end of file
+qt6-base-dev: no-code-sections [usr/lib/${DEB_HOST_MULTIARCH}/libQt6ExampleIcons.a]
\ No newline at end of file
diff --git a/debian/qt6-base.lintian-overrides b/debian/qt6-base.lintian-overrides
index d92cd58..e765105 100644
--- a/debian/qt6-base.lintian-overrides
+++ b/debian/qt6-base.lintian-overrides
@@ -1,8 +1,8 @@
-qt6-base: no-manual-page usr/bin/aarch64-linux-gnu-qmake6
+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/qtpaths6
 qt6-base: package-name-doesnt-match-sonames libQt6Concurrent6 libQt6Core6 libQt6DBus6 libQt6EglFSDeviceIntegration6 libQt6EglFsKmsGbmSupport6 libQt6EglFsKmsSupport6 libQt6Gui6 libQt6Network6 libQt6OpenGL6 libQt6OpenGLWidgets6 libQt6PrintSupport6 libQt6Sql6 libQt6Test6 libQt6Widgets6 libQt6XcbQpa6 libQt6Xml6
-qt6-base: ships-undeclared-shared-library libQt6EglFSDeviceIntegration 6 for usr/lib/*libQt6EglFSDeviceIntegration.so.6.6.0
-qt6-base: ships-undeclared-shared-library libQt6EglFsKmsGbmSupport 6 for usr/lib/*libQt6EglFsKmsGbmSupport.so.6.6.0
-qt6-base: ships-undeclared-shared-library libQt6EglFsKmsSupport 6 for usr/lib/*libQt6EglFsKmsSupport.so.6.6.0
-qt6-base: ships-undeclared-shared-library libQt6XcbQpa 6 for usr/lib/*libQt6XcbQpa.so.6.6.0
+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
diff --git a/debian/rules b/debian/rules
index 3e3b29f..be90207 100755
--- a/debian/rules
+++ b/debian/rules
@@ -134,8 +134,8 @@ override_dh_auto_install-indep:
 	find $(CURDIR)/debian/tmp/usr/share/qt6/doc -type f -name *.index -exec \
 		sed -i 's@$(CURDIR)/@@g' {} \;
 
-override_dh_makeshlibs:
-	dh_makeshlibs -XlibQt6EglFSDeviceIntegration -XlibQt6EglFsKmsGbmSupport -XlibQt6EglFsKmsSupport -XlibQt6XcbQpa
+#override_dh_makeshlibs:
+#	dh_makeshlibs -XlibQt6EglFSDeviceIntegration -XlibQt6EglFsKmsGbmSupport -XlibQt6EglFsKmsSupport -XlibQt6XcbQpa
 
-execute_after_dh_shlibdeps-arch:
-	echo libssl:Depends=$(sslpkgname) >> debian/libqt6network6.substvars
+#execute_after_dh_shlibdeps-arch:
+#	echo libssl:Depends=$(sslpkgname) >> debian/libqt6network6.substvars