[neon/qt6/qt6-declarative/Neon/release] debian: sort out nodoc logic

Carlos De Maine null at kde.org
Sun Oct 27 23:38:22 GMT 2024


Git commit b405e17b1245d1c53f9d90b520c68672b2f0e1b2 by Carlos De Maine.
Committed on 27/10/2024 at 23:38.
Pushed by carlosdem into branch 'Neon/release'.

sort out nodoc logic

M  +0    -1    debian/control
M  +4    -2    debian/rules

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

diff --git a/debian/control b/debian/control
index 4d6b675..134ac42 100644
--- a/debian/control
+++ b/debian/control
@@ -101,7 +101,6 @@ Description: Qt 6 declarative development files
 
 Package: qt6-declarative-doc
 Architecture: all
-Build-Profile: <!nodoc>
 Section: kde
 X-Neon-MergedPackage: true
 Depends: qt6-base-doc, qt6-declarative-dev, ${misc:Depends}, ${shlibs:Depends}
diff --git a/debian/rules b/debian/rules
index ef80b02..d86f026 100755
--- a/debian/rules
+++ b/debian/rules
@@ -5,6 +5,9 @@ include /usr/share/dpkg/architecture.mk
 
 export DEB_BUILD_MAINT_OPTIONS = hardening=+all optimize=+lto
 
+#### uncomment when bootstrapping a new qt release ####
+#export DEB_BUILD_PROFILES := ${DEB_BUILD_PROFILES} nodoc
+
 # QT_HOST_PATH isn't passed in cross-builds
 ifneq ($(DEB_BUILD_ARCH),$(DEB_HOST_ARCH))
 	extra_cmake_args += \
@@ -24,8 +27,7 @@ override_dh_auto_configure:
 		-DQT_UNITY_BUILD=ON \
 		$(extra_cmake_args)
 
-## attention to the negation
-ifneq ($(filter neon_nodoc,$(DEB_BUILD_PROFILES)),)
+ifeq ($(filter nodoc,$(DEB_BUILD_PROFILES)),)
 override_dh_auto_build-indep:
 	dh_auto_build -- docs
 


More information about the Neon-commits mailing list