[neon/qt6/qt6-location/Neon/release] debian: qt6-tools not qt6-documentation-tools && bump version deps

Carlos De Maine null at kde.org
Wed Apr 30 14:38:44 BST 2025


Git commit 34716dc32a3a69bb148d380c46bc3a15c2262710 by Carlos De Maine.
Committed on 30/04/2025 at 13:38.
Pushed by carlosdem into branch 'Neon/release'.

qt6-tools not qt6-documentation-tools && bump version deps

M  +7    -7    debian/control
M  +0    -11   debian/rules

https://invent.kde.org/neon/qt6/qt6-location/-/commit/34716dc32a3a69bb148d380c46bc3a15c2262710

diff --git a/debian/control b/debian/control
index 25b28fe..5311b52 100644
--- a/debian/control
+++ b/debian/control
@@ -14,16 +14,16 @@ Build-Depends: cmake,
                ninja-build,
                pkgconf,
                pkg-kde-tools,
-               qt6-base-dev (>= 6.8.2~),
-               qt6-declarative-dev (>= 6.8.2~),
-               qt6-positioning-dev (>= 6.8.2~),
-               qt6-shadertools-dev (>= 6.8.2~),
+               qt6-base-dev (>= 6.9.0~),
+               qt6-declarative-dev (>= 6.9.0~),
+               qt6-positioning-dev (>= 6.9.0~),
+               qt6-shadertools-dev (>= 6.9.0~),
                xauth <!nocheck>,
                xvfb <!nocheck>,
                zlib1g-dev
-Build-Depends-Indep: qt6-base-dev (>= 6.8~) <!nodoc>,
-                     qt6-documentation-tools (>= 6.8~) <!nodoc>,
-                     qt6-base-doc (>= 6.8~) <!nodoc>,
+Build-Depends-Indep: qt6-base-dev (>= 6.9~) <!nodoc>,
+                     qt6-tools (>= 6.9~) <!nodoc>,
+                     qt6-base-doc (>= 6.9~) <!nodoc>,
 Standards-Version: 4.6.2
 Homepage: https://www.qt.io/developers/
 Vcs-Browser: https://salsa.debian.org/qt-kde-team/qt6/qt6-location
diff --git a/debian/rules b/debian/rules
index 5387519..21e56c4 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,9 +3,6 @@ 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} nodoc
-
 # QT_HOST_PATH isn't passed in cross-builds
 ifneq ($(DEB_BUILD_ARCH),$(DEB_HOST_ARCH))
 	extra_cmake_args += \
@@ -26,13 +23,6 @@ override_dh_auto_configure:
 		$(extra_cmake_args) \
 		-DQT_NO_PACKAGE_VERSION_CHECK=TRUE
 
-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
-else
 override_dh_auto_build-indep:
 	dh_auto_build -- docs
 
@@ -41,7 +31,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' {} \;
-endif
 
 execute_after_dh_auto_install-arch:
 	# Reproducible builds: remove build paths from .prl files


More information about the Neon-commits mailing list