[neon/qt6/qt6-base/Neon/stable] debian: Revert "one more no docs build"

Carlos De Maine null at kde.org
Tue Sep 3 14:21:09 BST 2024


Git commit dbd30e2c8d81ee901e83168fcd58b8ca7d19a818 by Carlos De Maine.
Committed on 03/09/2024 at 13:21.
Pushed by carlosdem into branch 'Neon/stable'.

Revert "one more no docs build"

This reverts commit 6e2f467f81095ce4a7941bdcbbfdd231d3a8064b

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

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

diff --git a/debian/control b/debian/control
index 0533282..cd0981f 100644
--- a/debian/control
+++ b/debian/control
@@ -101,9 +101,9 @@ Build-Depends: cmake,
                shared-mime-info,
                unixodbc-dev,
                zlib1g-dev,
-#Build-Depends-Indep: qt6-base-dev (>= 6.7~) <!nodoc>,
-#                    qt6-documentation-tools (>= 6.7~) <!nodoc>,
-#                   qt6-base-doc (>= 6.7~) <!nodoc>,
+Build-Depends-Indep: qt6-base-dev (>= 6.7~) <!nodoc>,
+                    qt6-documentation-tools (>= 6.7~) <!nodoc>,
+                   qt6-base-doc (>= 6.7~) <!nodoc>,
 Standards-Version: 4.6.2
 Homepage: https://www.qt.io/developers/
 Rules-Requires-Root: no
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 c14769c..20d24bb 100755
--- a/debian/rules
+++ b/debian/rules
@@ -122,20 +122,20 @@ execute_after_dh_auto_install-arch:
 		debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/cmake/Qt6CoreTools/Qt6CoreToolsTargets-relwithdebinfo.cmake
 
 #ifeq ($(filter nodoc,$(DEB_BUILD_PROFILES)),)
+#override_dh_auto_build-indep:
+#	dh_auto_build
+
+#override_dh_auto_install-indep:
+#	DESTDIR=$(CURDIR)/debian/tmp dh_auto_build -- install
+#else
 override_dh_auto_build-indep:
-	dh_auto_build
+	dh_auto_build -- docs
 
 override_dh_auto_install-indep:
-	DESTDIR=$(CURDIR)/debian/tmp dh_auto_build -- install
-#else
-#override_dh_auto_build-indep:
-#	dh_auto_build -- docs
-#
-#override_dh_auto_install-indep:
-#	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' {} \;
+	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' {} \;
 #endif
 
 ### no longer needed??


More information about the Neon-commits mailing list