[neon/qt6/qt6-declarative/Neon/release] debian: make it work

Carlos De Maine null at kde.org
Fri Dec 15 16:19:52 GMT 2023


Git commit fb7da9f6bbf1ecf9dda8b94699291d4537d62210 by Carlos De Maine.
Committed on 15/12/2023 at 17:19.
Pushed by carlosdem into branch 'Neon/release'.

make it work

M  +6    -5    debian/control
M  +1    -1    debian/qt6-declarative-doc.install
M  +13   -6    debian/rules

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

diff --git a/debian/control b/debian/control
index 873fae7..f09df96 100644
--- a/debian/control
+++ b/debian/control
@@ -20,11 +20,11 @@ Build-Depends: cmake,
                qt6-declarative-dev:native <cross>,
                qt6-languageserver-private-dev (>= 6.6.1~),
                qt6-shadertools-dev (>= 6.6.1~),
-               qt6-svg-dev (>= 6.6.1~),
-#Build-Depends-Indep: qt6-base-dev (>= 6.6~) <!nodoc>,
-#                     qt6-documentation-tools (>= 6.6~) <!nodoc>,
-#                     qt6-base-doc (>= 6.6~) <!nodoc>,
-#                     qt6-svg-dev (>= 6.6~) <!nodoc>,
+#               qt6-svg-dev (>= 6.6.1~),
+Build-Depends-Indep: qt6-base-dev (>= 6.6~) <!nodoc>,
+                     qt6-documentation-tools (>= 6.6~) <!nodoc>,
+                     qt6-base-doc (>= 6.6~) <!nodoc>,
+                     qt6-svg-dev (>= 6.6~) <!nodoc>,
 Standards-Version: 4.6.2
 Homepage: https://www.qt.io/developers/
 Vcs-Git: https://salsa.debian.org/qt-kde-team/qt6/qt6-declarative.git
@@ -102,6 +102,7 @@ Description: Qt 6 declarative development files
 
 Package: qt6-declarative-doc
 Architecture: all
+Build-Profile: <!nodoc>
 Section: kde
 X-Neon-MergedPackage: true
 Depends: qt6-base-doc,
diff --git a/debian/qt6-declarative-doc.install b/debian/qt6-declarative-doc.install
index 36c01e0..8536ff4 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 bd2b440..a7290ea 100755
--- a/debian/rules
+++ b/debian/rules
@@ -28,16 +28,23 @@ override_dh_auto_configure:
 		-DQT_UNITY_BUILD=ON \
 		$(extra_cmake_args)
 
+## attention to the negation
+#ifneq ($(filter neon_nodoc,$(DEB_BUILD_PROFILES)),)
 override_dh_auto_build-indep:
-	dh_auto_build
-#	dh_auto_build -- docs
+	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
 
 execute_after_dh_auto_install-arch:
 	# Reproducible builds: remove build paths from .prl files


More information about the Neon-commits mailing list