[neon/qt6/qt6-tools/Neon/release] debian: back to proper build

[Carlos De Maine]

Git commit 61b1b6b518ed87d383111ab3baac2132f096273f by Carlos De Maine.
Committed on 29/04/2024 at 15:35.
Pushed by carlosdem into branch 'Neon/release'.

back to proper build

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

https://invent.kde.org/neon/qt6/qt6-tools/-/commit/61b1b6b518ed87d383111ab3baac2132f096273f

diff --git a/debian/control b/debian/control
index ba0f03b..b38afbb 100644
--- a/debian/control
+++ b/debian/control
@@ -21,9 +21,9 @@ Build-Depends: clang,
                pkg-kde-tools,
                qt6-base-dev (>= 6.7.0~),
                qt6-declarative-dev (>= 6.7.0~)
-#Build-Depends-Indep: qt6-base-dev (>= 6.7~) <!nodoc>,
-#                     qt6-base-doc (>= 6.7~) <!nodoc>,
-#                     qt6-documentation-tools (>= 6.7~) <!nodoc>,
+Build-Depends-Indep: qt6-base-dev (>= 6.7~) <!nodoc>,
+                     qt6-base-doc (>= 6.7~) <!nodoc>,
+                     qt6-documentation-tools (>= 6.7~) <!nodoc>,
 Standards-Version: 4.6.2
 Homepage: https://www.qt.io/developers/
 Vcs-Browser: https://salsa.debian.org/qt-kde-team/qt6/qt6-tools
diff --git a/debian/qt6-tools-doc.install b/debian/qt6-tools-doc.install
index d22b0e0..6a0b95c 100644
--- a/debian/qt6-tools-doc.install
+++ b/debian/qt6-tools-doc.install
@@ -1 +1 @@
-#usr/share/qt6/doc
+usr/share/qt6/doc
diff --git a/debian/rules b/debian/rules
index e38a284..c595488 100755
--- a/debian/rules
+++ b/debian/rules
@@ -24,21 +24,21 @@ override_dh_shlibdeps:
 	dh_shlibdeps --dpkg-shlibdeps-params=--ignore-missing-info
 
 ## attention to the negation
-#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
+ifneq ($(filter nodoc,$(DEB_BUILD_PROFILES)),)
 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: