[neon/qt6/qt6-base/Neon/release] debian: put the comparison outside the override_dh_**

Carlos De Maine null at kde.org
Fri Dec 6 01:34:02 GMT 2024


Git commit 0a479556babbdea869d795edff1d05feab0d5adf by Carlos De Maine.
Committed on 06/12/2024 at 01:34.
Pushed by carlosdem into branch 'Neon/release'.

put the comparison outside the override_dh_**

M  +9    -5    debian/rules

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

diff --git a/debian/rules b/debian/rules
index 25b92c5..464e8f8 100755
--- a/debian/rules
+++ b/debian/rules
@@ -13,6 +13,8 @@ export DEB_BUILD_OPTIONS DEB_BUILD_PROFILES
 
 sslpkgname := $(shell dpkg-query --show '--showformat=$${Depends}' libssl-dev | cut -d ' ' -f1)
 
+# the next statement obviously has inverted logic but nodoc is not beind added to
+# DEB_BUILD_OPTIONS DEB_BUILD_PROFILES for some reason
 ifneq (,$(filter nodoc,$(DEB_BUILD_PROFILES)),)
 	extra_build_args +=
 	extra_install_args +=
@@ -114,13 +116,16 @@ override_dh_auto_configure:
 override_dh_auto_build-indep:
 	dh_auto_build -- $(extra_build_args)
 
+ifeq ($(build_docs),true)
 override_dh_auto_install-indep:
 	DESTDIR=$(CURDIR)/debian/tmp dh_auto_build -- $(extra_install_args)
 	# Remove build path from index files if we are a doc build.
-	ifeq ($(build_docs),true)
-		find $(CURDIR)/debian/tmp/usr/share/qt6/doc -type f -name *.index -exec \
-			sed -i 's@$(CURDIR)/@@g' {} \;
-	endif
+	find $(CURDIR)/debian/tmp/usr/share/qt6/doc -type f -name *.index -exec \
+		sed -i 's@$(CURDIR)/@@g' {} \;
+else
+	override_dh_auto_install-indep:
+	DESTDIR=$(CURDIR)/debian/tmp dh_auto_build -- $(extra_install_args)
+endif
 
 execute_after_dh_auto_install-arch:
 	# Reproducible builds: remove build paths from .prl files
@@ -142,7 +147,6 @@ execute_after_dh_auto_install-arch:
 	sed -i 's,lib/qt6/bin/qmake,bin/$(DEB_HOST_GNU_TYPE)-qmake6,' \
 		debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/cmake/Qt6CoreTools/Qt6CoreToolsTargets-relwithdebinfo.cmake
 
-
 ### no longer needed??
 override_dh_makeshlibs:
 	dh_makeshlibs -XlibQt6EglFSDeviceIntegration -XlibQt6EglFsKmsGbmSupport -XlibQt6EglFsKmsSupport -XlibQt6XcbQpa


More information about the Neon-commits mailing list