[neon/qt6/qt6-tools/Neon/release] debian: sync to salsa

[Carlos De Maine]

Git commit 20fdfe2e68e3450fd28ff082ea8b85cdb83ea856 by Carlos De Maine.
Committed on 29/04/2025 at 01:14.
Pushed by carlosdem into branch 'Neon/release'.

sync to salsa

M  +13   -5    debian/control
M  +5    -4    debian/qt6-tools-dev.links
A  +1    -0    debian/qt6-tools-doc.links
M  +8    -44   debian/rules

https://invent.kde.org/neon/qt6/qt6-tools/-/commit/20fdfe2e68e3450fd28ff082ea8b85cdb83ea856

diff --git a/debian/control b/debian/control
index 8defa39..2b82164 100644
--- a/debian/control
+++ b/debian/control
@@ -16,13 +16,14 @@ Build-Depends: clang,
                libxcb-xkb-dev,
                libxkbcommon-dev,
                libzstd-dev (>= 1.3),
+               llvm,
                llvm-dev,
                mold,
                ninja-build,
                pkgconf,
                pkg-kde-tools,
-               qt6-base-dev (>= 6.8.2~),
-               qt6-declarative-dev (>= 6.8.2~)
+               qt6-base-dev (>= 6.9.0~),
+               qt6-declarative-dev (>= 6.9.0~)
 Build-Depends-Indep: qt6-base-dev (>= 6.8~) <!nodoc>,
                      qt6-base-doc (>= 6.8~) <!nodoc>,
                      qt6-documentation-tools (>= 6.8~) <!nodoc>,
@@ -41,11 +42,12 @@ Depends: qt6-base,
          qt6-declarative,
          ${misc:Depends},
          ${shlibs:Depends}
-Provides: qt6-designer-private-abi (= 6.8.2),
-          qt6-help-private-abi (= 6.8.2),
-          qt6-uitools-private-abi (= 6.8.2),
+Provides: qt6-designer-private-abi (= 6.9.0),
+          qt6-help-private-abi (= 6.9.0),
+          qt6-uitools-private-abi (= 6.9.0),
 Replaces: assistant-qt6,
           designer-qt6,
+          designer-qt6-plugins,
           libqt6designer6,
           libqt6designer6t64
           libqt6designercomponents6,
@@ -167,6 +169,12 @@ Depends: qt6-tools, ${misc:Depends}
 Description: Dummy transitional
  Transitional dummy package.
 
+Package: designer-qt6-plugins
+Architecture: all
+Depends: qt6-tools, ${misc:Depends}
+Description: Dummy transitional
+ Transitional dummy package.
+
 Package: linguist-qt6
 Architecture: all
 Depends: qt6-tools, ${misc:Depends}
diff --git a/debian/qt6-tools-dev.links b/debian/qt6-tools-dev.links
index a2149a4..ba1f3d4 100644
--- a/debian/qt6-tools-dev.links
+++ b/debian/qt6-tools-dev.links
@@ -1,7 +1,8 @@
+# qtdiag and qtdiag6 are identical files
+usr/lib/qt6/bin/qtdiag6 usr/lib/qt6/bin/qtdiag
+
 usr/lib/qt6/bin/pixeltool usr/bin/pixeltool6
-usr/lib/qt6/bin/qdbusviewer usr/bin/qdbusviewer6
 usr/lib/qt6/bin/qdistancefieldgenerator usr/bin/qdistancefieldgenerator6
-# qtdiag and qtdiag6 are identical files
-#usr/lib/qt6/bin/qtdiag usr/bin/qtdiag #clashes with qtchooser
-usr/lib/qt6/bin/qtdiag6 usr/lib/qt6/bin/qtdiag6
 usr/lib/qt6/bin/qtplugininfo usr/bin/qtplugininfo6
+usr/lib/qt6/bin/qdbusviewer usr/bin/qdbusviewer6
+usr/lib/qt6/bin/qtdiag usr/bin/qtdiag6
diff --git a/debian/qt6-tools-doc.links b/debian/qt6-tools-doc.links
new file mode 100644
index 0000000..df589d9
--- /dev/null
+++ b/debian/qt6-tools-doc.links
@@ -0,0 +1 @@
+usr/share/qt6/doc usr/share/doc/qt6-tools-doc-html/html
diff --git a/debian/rules b/debian/rules
index 7ea78a2..b26918c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,40 +1,9 @@
 #!/usr/bin/make -f
-export DH_VERBOSE = 1
-
-# Use already defined DEB_HOST_* variables.
 include /usr/share/dpkg/architecture.mk
 
 export DEB_BUILD_MAINT_OPTIONS = hardening=+all optimize=+lto
-export LLVM_INSTALL_DIR := $(shell llvm-config --prefix)
-
-#### uncomment when bootstrapping a new qt release ####
-#export DEB_BUILD_PROFILES := ${DEB_BUILD_PROFILES} nodoc
-
-#### uncomment when bootstrapping a new qt release ####
-#DEB_BUILD_PROFILES="nodoc"
-#export DEB_BUILD_PROFILES
 
-sslpkgname := $(shell dpkg-query --show '--showformat=$${Depends}' libssl-dev | cut -d ' ' -f1)
-
-# the next statement obviously has to have inverted logic (ifneq instad of ifeq) to work
-# for a nodoc build as nodoc is not being added to DEB_BUILD_PROFILES for some reason
-ifeq (,$(filter nodoc,$(DEB_BUILD_PROFILES)),)
-	extra_build_args +=
-	extra_install_args +=
-	build_docs += false
-else
-	extra_build_args += docs
-	extra_install_args += install_docs
-	build_docs += true
-endif
-
-# QT_HOST_PATH isn't passed in cross-builds
-ifneq ($(DEB_BUILD_ARCH),$(DEB_HOST_ARCH))
-	cmake_extra_args += \
-		-DQT_HOST_PATH=/usr \
-		-DQT_HOST_PATH_CMAKE_DIR=/usr/lib/$(DEB_BUILD_MULTIARCH)/cmake \
-		-DQT_BUILD_TOOLS_WHEN_CROSSCOMPILING=ON
-endif
+export LLVM_INSTALL_DIR := $(shell llvm-config --prefix)
 
 %:
 	dh $@ --with pkgkde_symbolshelper --buildsystem=cmake+ninja
@@ -48,22 +17,17 @@ override_dh_auto_configure:
 		-DQT_UNITY_BUILD=ON \
 		$(extra_cmake_args)
 
+override_dh_shlibdeps:
+	dh_shlibdeps --dpkg-shlibdeps-params=--ignore-missing-info
+
 override_dh_auto_build-indep:
-	dh_auto_build -- $(extra_build_args)
+	dh_auto_build -- docs
 
-ifeq ($(build_docs),true)
 override_dh_auto_install-indep:
-	DESTDIR=$(CURDIR)/debian/tmp dh_auto_build -- $(extra_install_args)
-	# Remove build path from index files if we are a doc build.
+	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_install-indep:
-	DESTDIR=$(CURDIR)/debian/tmp dh_auto_build -- $(extra_install_args)
-endif
-
-override_dh_shlibdeps:
-	dh_shlibdeps --dpkg-shlibdeps-params=--ignore-missing-info
+               sed -i 's@$(CURDIR)/@@g' {} \;
 
 execute_after_dh_auto_install-arch:
 	# Reproducible builds: remove build paths from .prl files