[neon/qt6/qt6-svg/Neon/release] debian: Revert "cludge it"

Carlos De Maine null at kde.org
Wed Apr 30 06:26:40 BST 2025


Git commit e1cfd6cb114f232e988d22c5b65ed1bc83ee0f17 by Carlos De Maine.
Committed on 30/04/2025 at 05:25.
Pushed by carlosdem into branch 'Neon/release'.

Revert "cludge it"

This reverts commit 864ca36aa043b3a8ea72a1ec7a2d634cfcba6b8d.

M  +8    -8    debian/rules

https://invent.kde.org/neon/qt6/qt6-svg/-/commit/e1cfd6cb114f232e988d22c5b65ed1bc83ee0f17

diff --git a/debian/rules b/debian/rules
index f6965d0..8d71a36 100755
--- a/debian/rules
+++ b/debian/rules
@@ -7,14 +7,6 @@ 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))
 	extra_cmake_args += \
@@ -34,6 +26,13 @@ override_dh_auto_configure:
 		-DQT_UNITY_BUILD=ON \
 		$(extra_cmake_args)
 
+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
 
@@ -42,6 +41,7 @@ override_dh_auto_install-indep:
 	# Remove build path from index files.
 	find $(CURDIR)/debian/tmp/usr/share/qt6/doc -type f -name *.index -exec \
                 sed -i 's@$(CURDIR)/@@g' {} \;
+endif
 
 execute_after_dh_auto_install-arch:
 	# Reproducible builds: remove build paths from .prl files



More information about the Neon-commits mailing list