[neon/qt6/qt6-declarative/Neon/release] debian: dh-exec for nodoc installs & nodoc logic in rules

[Carlos De Maine]

Git commit b0056b1491e59dd99119e6a8569d9593c0f45567 by Carlos De Maine.
Committed on 30/04/2025 at 11:58.
Pushed by carlosdem into branch 'Neon/release'.

dh-exec for nodoc installs & nodoc logic in rules

M  +7    -6    debian/control
M  +1    -0    debian/qt6-declarative-dev.install
M  +9    -1    debian/rules

https://invent.kde.org/neon/qt6/qt6-declarative/-/commit/b0056b1491e59dd99119e6a8569d9593c0f45567

diff --git a/debian/control b/debian/control
index 51b890f..f90f996 100644
--- a/debian/control
+++ b/debian/control
@@ -5,6 +5,7 @@ Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
 Uploaders: Patrick Franz <deltaone at debian.org>
 Build-Depends: cmake,
                debhelper-compat (= 13),
+               dh-exec,
                libgl-dev,
                liblttng-ust-dev [linux-any],
                libssl-dev,
@@ -14,14 +15,14 @@ Build-Depends: cmake,
                ninja-build,
                pkgconf,
                pkg-kde-tools,
-               qt6-base-dev (>=6.8.3~),
+               qt6-base-dev (>=6.9.0~),
 #               qt6-declarative-dev:native <cross>,
-               qt6-languageserver-dev (>=6.8.3~),
-               qt6-location-dev,
-               qt6-positioning-dev,
+               qt6-languageserver-dev (>=6.9.0~),
+               qt6-location-dev (>=6.8.3~),
+               qt6-positioning-dev (>=6.8.3~),
                qt6-shadertools-dev (>=6.8.3~),
-               qt6-svg-dev,
-               qt6-tools-dev,
+               qt6-svg-dev (>=6.8.3~),
+               qt6-tools-dev (>=6.8.3~),
 Build-Depends-Indep: qt6-base-dev (>=6.8~) <!nodoc>,
                      qt6-base-doc (>=6.8~) <!nodoc>,
                      qt6-documentation-tools (>=6.8~) <!nodoc>,
diff --git a/debian/qt6-declarative-dev.install b/debian/qt6-declarative-dev.install
old mode 100644
new mode 100755
index 6c326a0..8600cde
--- a/debian/qt6-declarative-dev.install
+++ b/debian/qt6-declarative-dev.install
@@ -1,3 +1,4 @@
+#!/usr/bin/dh-exec
 usr/include/
 usr/lib/${DEB_HOST_MULTIARCH}/*.a
 usr/lib/${DEB_HOST_MULTIARCH}/*.prl
diff --git a/debian/rules b/debian/rules
index bfabacc..51295bd 100755
--- a/debian/rules
+++ b/debian/rules
@@ -43,6 +43,13 @@ override_dh_makeshlibs:
 #override_dh_qmldeps:
 #	LD_LIBRARY_PATH=debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/ dh_qmldeps
 
+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
+else
 override_dh_auto_build-indep:
 	dh_auto_build -- docs
 
@@ -50,7 +57,8 @@ override_dh_auto_install-indep:
 	DESTDIR=$(CURDIR)/debian/tmp dh_auto_build -- install_docs
 	# Remove build path from index files.
 	find $(CURDIR)/debian/tmp/usr/share/qt6/doc -type f -name *.index -exec \
-               sed -i 's@$(CURDIR)/@@g' {} \;
+                sed -i 's@$(CURDIR)/@@g' {} \;
+endif
 
 execute_after_dh_auto_install-arch:
 	# Reproducible builds: remove build paths from .prl files