[neon/qt6/qt6-base/Neon/release] debian: prepare to support bootstrap on nodoc build profile

Carlos De Maine null at kde.org
Fri Dec 15 13:45:21 GMT 2023


Git commit 104c7695d7b6913af1eff481afaa7e45cee359b7 by Carlos De Maine.
Committed on 15/12/2023 at 14:45.
Pushed by carlosdem into branch 'Neon/release'.

prepare to support bootstrap on nodoc build profile

M  +3    -3    debian/control
M  +1    -1    debian/qt6-base-doc.install
M  +12   -6    debian/rules

https://invent.kde.org/neon/qt6/qt6-base/-/commit/104c7695d7b6913af1eff481afaa7e45cee359b7

diff --git a/debian/control b/debian/control
index a8b545d..493ce58 100644
--- a/debian/control
+++ b/debian/control
@@ -103,9 +103,9 @@ Build-Depends: cmake,
                shared-mime-info,
                unixodbc-dev,
                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
 Section: libs
 Homepage: https://www.qt.io/developers/
diff --git a/debian/qt6-base-doc.install b/debian/qt6-base-doc.install
index 36c01e0..8536ff4 100644
--- a/debian/qt6-base-doc.install
+++ b/debian/qt6-base-doc.install
@@ -1 +1 @@
-#usr/share/qt6/doc/
+usr/share/qt6/doc/
diff --git a/debian/rules b/debian/rules
index 2287672..f4c037a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -125,16 +125,22 @@ 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
 
+ifneq ($(filter nodoc,$(DEB_BUILD_PROFILES)),)
 override_dh_auto_build-indep:
-#	dh_auto_build -- docs
-	dh_auto_build
+	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
 
 ### no longer needed??
 #override_dh_makeshlibs:


More information about the Neon-commits mailing list