Change path for libexec.

debian/changelog

@@ -1,5 +1,8 @@
 qt6-base (6.2.1+dfsg-2) UNRELEASED; urgency=medium
 
+  [ Patrick Franz ]
+  * Change path for libexec.
+
  -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Tue, 09 Nov 2021 20:03:10 +0100
 
 qt6-base (6.2.1+dfsg-1) experimental; urgency=medium

debian/qt6-base-dev-tools.install

@@ -1,13 +1,3 @@
-usr/lib/${DEB_HOST_MULTIARCH}/qt6/libexec/android_emulator_launcher.sh
-usr/lib/${DEB_HOST_MULTIARCH}/qt6/libexec/cmake_automoc_parser
-usr/lib/${DEB_HOST_MULTIARCH}/qt6/libexec/moc
-usr/lib/${DEB_HOST_MULTIARCH}/qt6/libexec/qlalr
-usr/lib/${DEB_HOST_MULTIARCH}/qt6/libexec/qt-internal-configure-tests
-usr/lib/${DEB_HOST_MULTIARCH}/qt6/libexec/qvkgen
-usr/lib/${DEB_HOST_MULTIARCH}/qt6/libexec/rcc
-usr/lib/${DEB_HOST_MULTIARCH}/qt6/libexec/syncqt.pl
-usr/lib/${DEB_HOST_MULTIARCH}/qt6/libexec/tracegen
-usr/lib/${DEB_HOST_MULTIARCH}/qt6/libexec/uic
 usr/lib/qt6/bin/androiddeployqt
 usr/lib/qt6/bin/androidtestrunner
 usr/lib/qt6/bin/qdbuscpp2xml
@@ -19,3 +9,13 @@ usr/lib/qt6/bin/qt-cmake-standalone-test
 usr/lib/qt6/bin/qt-configure-module
 usr/lib/qt6/bin/qtpaths
 usr/lib/qt6/bin/qtpaths6
+usr/lib/qt6/libexec/android_emulator_launcher.sh
+usr/lib/qt6/libexec/cmake_automoc_parser
+usr/lib/qt6/libexec/moc
+usr/lib/qt6/libexec/qlalr
+usr/lib/qt6/libexec/qt-internal-configure-tests
+usr/lib/qt6/libexec/qvkgen
+usr/lib/qt6/libexec/rcc
+usr/lib/qt6/libexec/syncqt.pl
+usr/lib/qt6/libexec/tracegen
+usr/lib/qt6/libexec/uic

debian/qt6-base-dev.install

@@ -2009,7 +2009,6 @@ usr/lib/${DEB_HOST_MULTIARCH}/metatypes/qt6sql_none_metatypes.json
 usr/lib/${DEB_HOST_MULTIARCH}/metatypes/qt6test_none_metatypes.json
 usr/lib/${DEB_HOST_MULTIARCH}/metatypes/qt6xcbqpaprivate_none_metatypes.json
 usr/lib/${DEB_HOST_MULTIARCH}/metatypes/qt6xml_none_metatypes.json
-usr/lib/${DEB_HOST_MULTIARCH}/qt6/libexec/ensure_pro_file.cmake
 usr/lib/${DEB_HOST_MULTIARCH}/qt6/mkspecs/modules/qt_lib_concurrent.pri
 usr/lib/${DEB_HOST_MULTIARCH}/qt6/mkspecs/modules/qt_lib_concurrent_private.pri
 usr/lib/${DEB_HOST_MULTIARCH}/qt6/mkspecs/modules/qt_lib_core.pri
@@ -2041,6 +2040,7 @@ usr/lib/${DEB_HOST_MULTIARCH}/qt6/mkspecs/modules/qt_lib_widgets_private.pri
 usr/lib/${DEB_HOST_MULTIARCH}/qt6/mkspecs/modules/qt_lib_xcb_qpa_lib_private.pri
 usr/lib/${DEB_HOST_MULTIARCH}/qt6/mkspecs/modules/qt_lib_xml.pri
 usr/lib/${DEB_HOST_MULTIARCH}/qt6/mkspecs/modules/qt_lib_xml_private.pri
+usr/lib/qt6/libexec/ensure_pro_file.cmake
 usr/share/qt6/doc/config/exampleurl-qt3d.qdocconf
 usr/share/qt6/doc/config/exampleurl-qtactiveqt.qdocconf
 usr/share/qt6/doc/config/exampleurl-qtandroidextras.qdocconf

debian/rules

@@ -28,6 +28,7 @@ override_dh_auto_configure:
 		-DCMAKE_INSTALL_PREFIX=/usr \
 		-DINSTALL_BINDIR=lib/qt6/bin \
 		-DINSTALL_LIBDIR=lib/$(DEB_HOST_MULTIARCH) \
+		-DINSTALL_LIBEXECDIR=lib/qt6/libexec \
 		-DINSTALL_ARCHDATADIR=lib/$(DEB_HOST_MULTIARCH)/qt6 \
 		-DINSTALL_EXAMPLESDIR=lib/$(DEB_HOST_MULTIARCH)/qt6/examples \
 		-DINSTALL_DATADIR=share/qt6 \
@@ -73,7 +74,7 @@ override_dh_auto_configure:
 
 execute_after_dh_auto_install:
 	# Policy § 10.4. Remove this if https://bugs.debian.org/904409 gets fixed.
-	sed -i 's,bin/env perl,bin/perl,' debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/qt6/libexec/*.pl \
+	sed -i 's,bin/env perl,bin/perl,' debian/tmp/usr/lib/qt6/libexec/*.pl \
 		debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/qt6/mkspecs/features/data/unix/findclasslist.pl
 
 	# Reproducible builds: remove build paths from .prl files