[neon/qt6/qt6-svg/Neon/release] debian: prepare to support nodoc bootstrapping

Carlos De Maine null at kde.org
Fri Dec 15 14:29:30 GMT 2023


Git commit 12d1f03985b3133777f7da4340a94963c1283227 by Carlos De Maine.
Committed on 15/12/2023 at 15:29.
Pushed by carlosdem into branch 'Neon/release'.

prepare to support nodoc bootstrapping

M  +4    -3    debian/control
M  +1    -1    debian/qt6-svg-doc.install
M  +14   -6    debian/rules

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

diff --git a/debian/control b/debian/control
index e14087d..a73c5a9 100644
--- a/debian/control
+++ b/debian/control
@@ -16,9 +16,9 @@ Build-Depends: cmake,
                pkg-kde-tools,
                qt6-base-dev (>= 6.6.1),
                zlib1g-dev
-#Build-Depends-Indep: qt6-base-dev (>= 6.6~) <!nodoc>,
-#                     qt6-documentation-tools (>= 6.6~) <!nodoc>,
-#                     qt6-base-doc (>= 6.6~) <!nodoc>,
+Build-Depends-Indep: qt6-base-dev (>= 6.6~) <!nodoc>,
+                     qt6-documentation-tools (>= 6.6~) <!nodoc>,
+                     qt6-base-doc (>= 6.6~) <!nodoc>,
 Standards-Version: 4.6.2
 Homepage: https://www.qt.io/developers/
 Vcs-Browser: https://salsa.debian.org/qt-kde-team/qt6/qt6-svg
@@ -67,6 +67,7 @@ Description: Qt 6 SVG - development files
 
 Package: qt6-svg-doc
 Architecture: all
+Build-Profile: <!nodoc>
 Section: kde
 X-Neon-MergedPackage: true
 Pre-Depends: ${misc:Pre-Depends}
diff --git a/debian/qt6-svg-doc.install b/debian/qt6-svg-doc.install
index 36c01e0..8536ff4 100644
--- a/debian/qt6-svg-doc.install
+++ b/debian/qt6-svg-doc.install
@@ -1 +1 @@
-#usr/share/qt6/doc/
+usr/share/qt6/doc/
diff --git a/debian/rules b/debian/rules
index 176b1b7..9b7894a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,6 +2,8 @@
 
 include /usr/share/dpkg/architecture.mk
 
+export PANGEA_ARCH_BIN_ONLY=FALSE
+
 export DEB_BUILD_MAINT_OPTIONS = hardening=+all optimize=-lto
 
 # need gcc 12.1 for mold to be able to process --gdb-index
@@ -24,16 +26,22 @@ override_dh_auto_configure:
 		-DQT_UNITY_BUILD=ON \
 		$(extra_cmake_args)
 
+ifneq ($(filter neon_nodoc,$(DEB_BUILD_PROFILES)),)
 override_dh_auto_build-indep:
-	dh_auto_build
-#	dh_auto_build -- docs
+	dh_auto_build -- docs
 
 override_dh_auto_install-indep:
-	DESTDIR=$(CURDIR)/debian/tmp dh_auto_build
-#	DESTDIR=$(CURDIR)/debian/tmp dh_auto_build -- install_docs
+	DESTDIR=$(CURDIR)/debian/tmp dh_auto_build -- install_docs
 	# Remove build path from index files.
-#	find $(CURDIR)/debian/tmp/usr/share/qt6/doc -type f -name *.index -exec \
-               sed -i 's@$(CURDIR)/@@g' {} \;
+	find $(CURDIR)/debian/tmp/usr/share/qt6/doc -type f -name *.index -exec \
+                sed -i 's@$(CURDIR)/@@g' {} \;
+else
+override_dh_auto_build-indep:
+	dh_auto_build
+
+override_dh_auto_install-indep:
+	DESTDIR=$(CURDIR)/debian/tmp dh_auto_build -- install
+endif
 
 execute_after_dh_auto_install-arch:
 	# Reproducible builds: remove build paths from .prl files


More information about the Neon-commits mailing list