[neon/qt6/qt6-tools/Neon/release] debian: doc build

Carlos De Maine null at kde.org
Sat Dec 7 06:14:13 GMT 2024


Git commit 33769d00cf5bd812ca9ad13ec4e98ce54f28f0bb by Carlos De Maine.
Committed on 07/12/2024 at 06:14.
Pushed by carlosdem into branch 'Neon/release'.

doc build

M  +1    -1    debian/qt6-tools-doc.install
M  +6    -6    debian/rules

https://invent.kde.org/neon/qt6/qt6-tools/-/commit/33769d00cf5bd812ca9ad13ec4e98ce54f28f0bb

diff --git a/debian/qt6-tools-doc.install b/debian/qt6-tools-doc.install
index d22b0e0..6a0b95c 100644
--- a/debian/qt6-tools-doc.install
+++ b/debian/qt6-tools-doc.install
@@ -1 +1 @@
-#usr/share/qt6/doc
+usr/share/qt6/doc
diff --git a/debian/rules b/debian/rules
index 68110eb..8429204 100755
--- a/debian/rules
+++ b/debian/rules
@@ -11,15 +11,14 @@ export LLVM_INSTALL_DIR := $(shell llvm-config --prefix)
 #export DEB_BUILD_PROFILES := ${DEB_BUILD_PROFILES} nodoc
 
 #### uncomment when bootstrapping a new qt release ####
-DEB_BUILD_OPTIONS="nodoc"
-DEB_BUILD_PROFILES="nodoc"
-export DEB_BUILD_OPTIONS DEB_BUILD_PROFILES
+#DEB_BUILD_PROFILES="nodoc"
+#export DEB_BUILD_PROFILES
 
 sslpkgname := $(shell dpkg-query --show '--showformat=$${Depends}' libssl-dev | cut -d ' ' -f1)
 
-# the next statement obviously has to have inverted logic (new)to work for nodoc as
-# nodoc is not beind added to DEB_BUILD_OPTIONS or DEB_BUILD_PROFILES for some reason
-ifneq (,$(filter nodoc,$(DEB_BUILD_PROFILES)),)
+# the next statement obviously has to have inverted logic (ifneq instad of ifeq) to work
+# for a nodoc build as nodoc is not being added to DEB_BUILD_PROFILES for some reason
+ifeq (,$(filter nodoc,$(DEB_BUILD_PROFILES)),)
 	extra_build_args +=
 	extra_install_args +=
 	build_docs += false
@@ -69,3 +68,4 @@ override_dh_shlibdeps:
 execute_after_dh_auto_install-arch:
 	# Reproducible builds: remove build paths from .prl files
 	sed -i -e '/^QMAKE_PRL_BUILD_DIR/d' debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/libQt6*.prl
+


More information about the Neon-commits mailing list