[neon/qt6/qt6-base/Neon/release] debian: back to docs build

[Carlos De Maine]

Git commit 7333673fe7e785304de98a5f0f7b7ee99eadf996 by Carlos De Maine.
Committed on 07/12/2024 at 02:46.
Pushed by carlosdem into branch 'Neon/release'.

back to docs build

M  +1    -1    debian/qt6-base-doc.install
M  +2    -2    debian/qt6-base.install
M  +5    -6    debian/rules

https://invent.kde.org/neon/qt6/qt6-base/-/commit/7333673fe7e785304de98a5f0f7b7ee99eadf996

diff --git a/debian/qt6-base-doc.install b/debian/qt6-base-doc.install
index 164be57..1379c86 100644
--- a/debian/qt6-base-doc.install
+++ b/debian/qt6-base-doc.install
@@ -1 +1 @@
-#usr/share/qt6/doc/q*
+usr/share/qt6/doc/q*
diff --git a/debian/qt6-base.install b/debian/qt6-base.install
index 77325ac..4996ca1 100644
--- a/debian/qt6-base.install
+++ b/debian/qt6-base.install
@@ -1,9 +1,9 @@
 #!/usr/bin/dh-exec
-/usr/bin/
+usr/bin/
 usr/lib/${DEB_HOST_MULTIARCH}/libQt6*.so.*
 usr/lib/${DEB_HOST_MULTIARCH}/qt6/examples/
 usr/lib/${DEB_HOST_MULTIARCH}/qt6/modules/
 usr/lib/${DEB_HOST_MULTIARCH}/qt6/plugins/
 usr/lib/${DEB_HOST_MULTIARCH}/qt6/qt6.conf
 usr/lib/qt6/bin/qmake6
-usr/lib/qt6/libexec/qt-internal-configure-examples
\ No newline at end of file
+usr/lib/qt6/libexec/qt-internal-configure-examples
diff --git a/debian/rules b/debian/rules
index dc93ee8..c21fb57 100755
--- a/debian/rules
+++ b/debian/rules
@@ -7,15 +7,14 @@ include /usr/share/dpkg/architecture.mk
 export DEB_BUILD_MAINT_OPTIONS = hardening=+all optimize=+lto
 
 #### 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 inverted logic but nodoc is not beind added to
-# DEB_BUILD_OPTIONS 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