[neon/qt6/qt6-declarative/Neon/unstable] debian: merge stable

[Jonathan Riddell]

Git commit c712648498894e75b41b33d61cb5915f695ac8ad by Jonathan Riddell.
Committed on 25/10/2024 at 10:34.
Pushed by jriddell into branch 'Neon/unstable'.

merge stable

M  +1    -1    debian/control
M  +1    -1    debian/qt6-declarative-doc.install
M  +10   -10   debian/rules

https://invent.kde.org/neon/qt6/qt6-declarative/-/commit/c712648498894e75b41b33d61cb5915f695ac8ad

diff --git a/debian/control b/debian/control
index 3f1602c..cfaa43a 100644
--- a/debian/control
+++ b/debian/control
@@ -416,4 +416,4 @@ Package: qt6-declarative-private-dev
 Architecture: all
 Depends: qt6-declarative-dev, ${misc:Depends}
 Description: Dummy transitional
- Transitional dummy package.
\ No newline at end of file
+ Transitional dummy package.
diff --git a/debian/qt6-declarative-doc.install b/debian/qt6-declarative-doc.install
index 8536ff4..36c01e0 100644
--- a/debian/qt6-declarative-doc.install
+++ b/debian/qt6-declarative-doc.install
@@ -1 +1 @@
-usr/share/qt6/doc/
+#usr/share/qt6/doc/
diff --git a/debian/rules b/debian/rules
index 7e2725a..988b1b0 100755
--- a/debian/rules
+++ b/debian/rules
@@ -26,20 +26,20 @@ override_dh_auto_configure:
 
 ## attention to the negation
 #ifneq ($(filter neon_nodoc,$(DEB_BUILD_PROFILES)),)
-override_dh_auto_build-indep:
-	dh_auto_build -- docs
+#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 \
+#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
+override_dh_auto_build-indep:
+	dh_auto_build
 
-#override_dh_auto_install-indep:
-#	DESTDIR=$(CURDIR)/debian/tmp dh_auto_build -- install
+override_dh_auto_install-indep:
+	DESTDIR=$(CURDIR)/debian/tmp dh_auto_build -- install
 #endif
 
 execute_after_dh_auto_install-arch: