[neon/qt6/qt6-tools/Neon/release] debian: missing installs

Carlos De Maine null at kde.org
Sun Oct 27 23:34:35 GMT 2024


Git commit 1eff45a91b03131535a208e9ef09add9df470904 by Carlos De Maine.
Committed on 27/10/2024 at 23:34.
Pushed by carlosdem into branch 'Neon/release'.

missing installs

M  +2    -1    debian/qt6-tools-dev.install
M  +9    -8    debian/rules

https://invent.kde.org/neon/qt6/qt6-tools/-/commit/1eff45a91b03131535a208e9ef09add9df470904

diff --git a/debian/qt6-tools-dev.install b/debian/qt6-tools-dev.install
index 64972ba..cecfc7a 100644
--- a/debian/qt6-tools-dev.install
+++ b/debian/qt6-tools-dev.install
@@ -14,9 +14,10 @@ usr/lib/${DEB_HOST_MULTIARCH}/qt6/metatypes/
 usr/lib/${DEB_HOST_MULTIARCH}/qt6/mkspecs/modules/
 usr/lib/${DEB_HOST_MULTIARCH}/qt6/modules/
 usr/lib/${DEB_HOST_MULTIARCH}/qt6/plugins/designer/
+usr/lib/${DEB_HOST_MULTIARCH}/qt6/plugins/help/
 usr/lib/qt6/bin/pixeltool
 usr/lib/qt6/bin/qdbusviewer
-#usr/lib/qt6/bin/qdistancefieldgenerator
+usr/lib/qt6/bin/qdistancefieldgenerator
 usr/lib/qt6/bin/qtdiag
 usr/lib/qt6/bin/qtdiag6
 usr/lib/qt6/bin/qtplugininfo
diff --git a/debian/rules b/debian/rules
index 0152ce4..813673d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,7 +4,7 @@ include /usr/share/dpkg/architecture.mk
 export DEB_BUILD_MAINT_OPTIONS = hardening=+all optimize=+lto
 
 #### uncomment when bootstrapping a new qt release ####
-export DEB_BUILD_PROFILES := ${DEB_BUILD_PROFILES} neon_nodoc
+#export DEB_BUILD_PROFILES := ${DEB_BUILD_PROFILES} nodoc
 
 export LLVM_INSTALL_DIR := $(shell llvm-config --prefix)
 %:
@@ -23,13 +23,7 @@ override_dh_auto_configure:
 override_dh_shlibdeps:
 	dh_shlibdeps --dpkg-shlibdeps-params=--ignore-missing-info
 
-ifeq ($(filter neon_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
-else
+ifeq ($(filter nodoc,$(DEB_BUILD_PROFILES)),)
 override_dh_auto_build-indep:
 	dh_auto_build -- docs
 
@@ -38,6 +32,13 @@ 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:


More information about the Neon-commits mailing list