[neon/qt6/qt6-tools/Neon/release] debian: put the exe's back and try clang/llvm 14

[Carlos De Maine]

Git commit a238d49142bb732a731ba2ba2f65dcba4891add5 by Carlos De Maine.
Committed on 23/10/2023 at 07:37.
Pushed by carlosdem into branch 'Neon/release'.

put the exe's back and try clang/llvm 14

M  +7    -5    debian/control
M  +7    -0    debian/qt6-tools-dev.install
M  +0    -7    debian/qt6-tools.install

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

diff --git a/debian/control b/debian/control
index c12c661..127fb4d 100644
--- a/debian/control
+++ b/debian/control
@@ -3,16 +3,16 @@ Section: libs
 Priority: optional
 Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
 Uploaders: Patrick Franz <deltaone at debian.org>
-Build-Depends: clang-15,
+Build-Depends: clang-14,
                cmake,
                debhelper-compat (= 13),
-               libclang-15-dev,
+               libclang-14-dev,
                libgl-dev,
 #               liblitehtml-dev,
                libssl-dev,
                libvulkan-dev [linux-any],
                libxcb-xkb-dev,
-               llvm-15-dev,
+               llvm-14-dev,
                libxkbcommon-dev,
                libzstd-dev,
                ninja-build,
@@ -37,8 +37,9 @@ Provides: qt6-designer-abi (= 6.4.2),
           qt6-help-abi (= 6.4.2),
           qt6-uitools-abi (= 6.4.2)
 Pre-Depends: ${misc:Pre-Depends}
-Depends: llvm-15,
+Depends: llvm-14,
          qt6-base,
+         qt6-declarative,
          ${misc:Depends},
          ${shlibs:Depends}
 Description: Qt 6 Designer library
@@ -53,8 +54,9 @@ Package: qt6-tools-dev
 Architecture: any
 Section: kde
 X-Neon-MergedPackage: true
-Depends: llvm-15-dev,
+Depends: llvm-14-dev,
          qt6-base-dev,
+         qt6-declarative-dev,
          qt6-tools (= ${binary:Version}),
          ${misc:Depends}
 Description: Qt 6 Tools - development files
diff --git a/debian/qt6-tools-dev.install b/debian/qt6-tools-dev.install
index b7f2cb4..a72bef1 100644
--- a/debian/qt6-tools-dev.install
+++ b/debian/qt6-tools-dev.install
@@ -33,3 +33,10 @@ usr/lib/${DEB_HOST_MULTIARCH}/qt6/metatypes/
 usr/lib/${DEB_HOST_MULTIARCH}/pkgconfig/
 usr/lib/${DEB_HOST_MULTIARCH}/qt6/mkspecs/modules/
 usr/lib/${DEB_HOST_MULTIARCH}/qt6/modules/
+usr/lib/qt6/bin/pixeltool
+usr/lib/qt6/bin/qdbusviewer
+usr/lib/qt6/bin/qdistancefieldgenerator
+usr/lib/qt6/bin/qtdiag
+usr/lib/qt6/bin/qtdiag6
+usr/lib/qt6/bin/qtplugininfo
+usr/lib/qt6/libexec/lprodump
diff --git a/debian/qt6-tools.install b/debian/qt6-tools.install
index 57d503a..87d6be8 100644
--- a/debian/qt6-tools.install
+++ b/debian/qt6-tools.install
@@ -9,15 +9,8 @@ usr/lib/qt6/bin/lconvert
 usr/lib/qt6/bin/linguist
 usr/lib/qt6/bin/lrelease
 usr/lib/qt6/bin/lupdate
-usr/lib/qt6/bin/pixeltool
 usr/lib/qt6/bin/qdbus
 usr/lib/qt6/bin/qdoc
-usr/lib/qt6/bin/qdbusviewer
-usr/lib/qt6/bin/qdistancefieldgenerator
-usr/lib/qt6/bin/qtdiag
-usr/lib/qt6/bin/qtdiag6
-usr/lib/qt6/bin/qtplugininfo
-usr/lib/qt6/libexec/lprodump
 usr/lib/qt6/libexec/lrelease-pro
 usr/lib/qt6/libexec/lupdate-pro
 usr/lib/qt6/libexec/qhelpgenerator