[neon/qt6/qt6-shadertools/Neon/release] debian: back to full build

[Carlos De Maine]

Git commit 084150aaf920dc969b66f8785ba31b7e1a22ab71 by Carlos De Maine.
Committed on 30/04/2024 at 09:26.
Pushed by carlosdem into branch 'Neon/release'.

back to full build

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

https://invent.kde.org/neon/qt6/qt6-shadertools/-/commit/084150aaf920dc969b66f8785ba31b7e1a22ab71

diff --git a/debian/control b/debian/control
index 5ec6c99..710aba5 100644
--- a/debian/control
+++ b/debian/control
@@ -15,9 +15,9 @@ Build-Depends: cmake,
                qt6-base-dev (>= 6.7.0~),
                qt6-shader-baker <cross>,
                qt6-shadertools-dev:native <cross>
-#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-shadertools-dev.install b/debian/qt6-shadertools-dev.install
index a821427..c4d54a1 100644
--- a/debian/qt6-shadertools-dev.install
+++ b/debian/qt6-shadertools-dev.install
@@ -6,7 +6,7 @@ usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6ShaderToolsTools/
 usr/lib/${DEB_HOST_MULTIARCH}/libQt6ShaderTools.prl
 usr/lib/${DEB_HOST_MULTIARCH}/libQt6ShaderTools.so
 usr/lib/${DEB_HOST_MULTIARCH}/pkgconfig/Qt6ShaderTools.pc
-#usr/lib/${DEB_HOST_MULTIARCH}/qt6/examples/
+usr/lib/${DEB_HOST_MULTIARCH}/qt6/examples/
 usr/lib/${DEB_HOST_MULTIARCH}/qt6/mkspecs/modules/qt_lib_shadertools.pri
 usr/lib/${DEB_HOST_MULTIARCH}/qt6/mkspecs/modules/qt_lib_shadertools_private.pri
 usr/lib/${DEB_HOST_MULTIARCH}/qt6/metatypes/qt6shadertools_*_metatypes.json
diff --git a/debian/qt6-shadertools-doc.install b/debian/qt6-shadertools-doc.install
index 36c01e0..8536ff4 100644
--- a/debian/qt6-shadertools-doc.install
+++ b/debian/qt6-shadertools-doc.install
@@ -1 +1 @@
-#usr/share/qt6/doc/
+usr/share/qt6/doc/
diff --git a/debian/rules b/debian/rules
index b2d295c..7dbd88e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -28,20 +28,20 @@ override_dh_auto_configure:
 		$(cmake_extra_args)
 
 #ifneq ($(filter nodoc,$(DEB_BUILD_PROFILES)),)
-#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' {} \;
-#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
+	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' {} \;
+#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: