[neon/qt6/qt6-positioning/Neon/release] debian: cludge it

Carlos De Maine null at kde.org
Mon Oct 28 05:30:23 GMT 2024


Git commit 120e8b133422317e248a594e25bc4a551becc8fa by Carlos De Maine.
Committed on 28/10/2024 at 05:30.
Pushed by carlosdem into branch 'Neon/release'.

cludge it

M  +1    -1    debian/qt6-positioning-doc.install
M  +8    -8    debian/rules

https://invent.kde.org/neon/qt6/qt6-positioning/-/commit/120e8b133422317e248a594e25bc4a551becc8fa

diff --git a/debian/qt6-positioning-doc.install b/debian/qt6-positioning-doc.install
index 36c01e0..8536ff4 100644
--- a/debian/qt6-positioning-doc.install
+++ b/debian/qt6-positioning-doc.install
@@ -1 +1 @@
-#usr/share/qt6/doc/
+usr/share/qt6/doc/
diff --git a/debian/rules b/debian/rules
index 82873b9..dce0f36 100755
--- a/debian/rules
+++ b/debian/rules
@@ -11,6 +11,14 @@ ifneq ($(DEB_BUILD_ARCH),$(DEB_HOST_ARCH))
 	extra_cmake_args += -DQT_HOST_PATH=/usr
 endif
 
+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
+endif
+
 %:
 	dh $@ --with pkgkde_symbolshelper --buildsystem=cmake+ninja
 
@@ -22,7 +30,6 @@ override_dh_auto_configure:
 		-DQT_UNITY_BUILD=ON \
 		$(extra_cmake_args)
 
-ifneq ($(filter nodoc,$(DEB_BUILD_PROFILES)),)
 override_dh_auto_build-indep:
 	dh_auto_build -- docs
 
@@ -31,13 +38,6 @@ override_dh_auto_install-indep:
 	# 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:
 	# Reproducible builds: remove build paths from .prl files


More information about the Neon-commits mailing list