[neon/qt6/qt6-tools/Neon/release] debian: add symbolic links to user facing tools

[Carlos De Maine]

Git commit 7d818b371976be4153a2068125ebae554e87ae83 by Carlos De Maine.
Committed on 27/10/2024 at 23:19.
Pushed by carlosdem into branch 'Neon/release'.

add symbolic links to user facing tools

M  +2    -1    debian/control
A  +7    -0    debian/qt6-tools-dev.links
A  +5    -0    debian/qt6-tools.links
M  +3    -2    debian/rules

https://invent.kde.org/neon/qt6/qt6-tools/-/commit/7d818b371976be4153a2068125ebae554e87ae83

diff --git a/debian/control b/debian/control
index 97ef04f..ba3c75b 100644
--- a/debian/control
+++ b/debian/control
@@ -7,6 +7,8 @@ Build-Depends: clang,
                cmake,
                debhelper-compat (= 13),
                libclang-dev,
+               libcurl4-openssl-dev | libcurl4-dev,
+               libedit-dev,
                libgl-dev,
 #               liblitehtml-dev (>= 0.6~),
                libssl-dev,
@@ -87,7 +89,6 @@ Description: Qt 6 Tools - development files
  applications.
 
 Package: qt6-tools-doc
-Build-Profiles: <!nodoc>
 Architecture: all
 Section: kde
 X-Neon-MergedPackage: true
diff --git a/debian/qt6-tools-dev.links b/debian/qt6-tools-dev.links
new file mode 100644
index 0000000..4cb1d59
--- /dev/null
+++ b/debian/qt6-tools-dev.links
@@ -0,0 +1,7 @@
+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
+usr/lib/qt6/bin/qtdiag6 usr/lib/qt6/bin/qtdiag6
+usr/lib/qt6/bin/qtplugininfo usr/bin/qtplugininfo6
diff --git a/debian/qt6-tools.links b/debian/qt6-tools.links
new file mode 100644
index 0000000..d3f5492
--- /dev/null
+++ b/debian/qt6-tools.links
@@ -0,0 +1,5 @@
+usr/lib/qt6/bin/assistant usr/bin/assistant6
+usr/lib/qt6/bin/designer usr/bin/designer6
+usr/lib/qt6/bin/linguist usr/bin/linguist6
+usr/lib/qt6/bin/qdbus usr/bin/qdbus6
+usr/lib/qt6/bin/qdoc usr/bin/qdoc6
diff --git a/debian/rules b/debian/rules
index 65dc2a0..0152ce4 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} neon_nodoc
 
 export LLVM_INSTALL_DIR := $(shell llvm-config --prefix)
 %:
@@ -16,13 +16,14 @@ override_dh_auto_configure:
 		-DCMAKE_LIBRARY_PATH=$(DEB_HOST_MULTIARCH) \
 		-DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON \
 		-DCMAKE_SKIP_INSTALL_RPATH=ON \
+		-DINSTALL_PUBLICBINDIR=/usr/bin \
 		-DQT_UNITY_BUILD=ON \
 		$(extra_cmake_args)
 
 override_dh_shlibdeps:
 	dh_shlibdeps --dpkg-shlibdeps-params=--ignore-missing-info
 
-ifeq ($(filter nodoc,$(DEB_BUILD_PROFILES)),)
+ifeq ($(filter neon_nodoc,$(DEB_BUILD_PROFILES)),)
 override_dh_auto_build-indep:
 	dh_auto_build