[neon/qt6/qt6-websockets/Neon/release] debian: fix installs

[Carlos De Maine]

Git commit f3d00ebc2f9d4cddde4037ae0b0ae345aee65d42 by Carlos De Maine.
Committed on 01/05/2025 at 12:42.
Pushed by carlosdem into branch 'Neon/release'.

fix installs

M  +2    -4    debian/qt6-websockets-dev.install
M  +1    -12   debian/rules

https://invent.kde.org/neon/qt6/qt6-websockets/-/commit/f3d00ebc2f9d4cddde4037ae0b0ae345aee65d42

diff --git a/debian/qt6-websockets-dev.install b/debian/qt6-websockets-dev.install
index 087593a..8e09e8f 100644
--- a/debian/qt6-websockets-dev.install
+++ b/debian/qt6-websockets-dev.install
@@ -1,7 +1,5 @@
-usr/include/${DEB_HOST_MULTIARCH}/qt6/QtWebSockets/
-usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6BuildInternals/
-usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6Qml/
-usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6WebSockets/
+usr/include/${DEB_HOST_MULTIARCH}/qt6/
+usr/lib/${DEB_HOST_MULTIARCH}/cmake/
 usr/lib/${DEB_HOST_MULTIARCH}/libQt6WebSockets.prl
 usr/lib/${DEB_HOST_MULTIARCH}/libQt6WebSockets.so
 usr/lib/${DEB_HOST_MULTIARCH}/pkgconfig/
diff --git a/debian/rules b/debian/rules
index 3670cc5..f6d9890 100755
--- a/debian/rules
+++ b/debian/rules
@@ -6,17 +6,6 @@ include /usr/share/dpkg/architecture.mk
 
 export DEB_BUILD_MAINT_OPTIONS = hardening=+all optimize=+lto
 
-#### uncomment when bootstrapping a new qt release ####
-#export DEB_BUILD_PROFILES := ${DEB_BUILD_PROFILES} nodoc
-
-ifeq (,$(filter nodoc,$(DEB_BUILD_PROFILES)),)
-override_dh_auto_build-indep:
-	dh_auto_build
-
-override_dh_auto_install-indep:
-	DESTDIR=$(CURDIR)/debian/tmp dh_auto_build -- install
-endif
-
 # QT_HOST_PATH isn't passed in cross-builds
 ifneq ($(DEB_BUILD_ARCH),$(DEB_HOST_ARCH))
 	cmake_extra_args += \
@@ -34,7 +23,7 @@ override_dh_auto_configure:
 		-DCMAKE_LIBRARY_PATH=$(DEB_HOST_MULTIARCH) \
 		-DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON \
 		-DQT_UNITY_BUILD=ON \
-		$(extra_cmake_args)
+		$(cmake_extra_args)
 
 override_dh_auto_build-indep:
 	dh_auto_build -- docs