[neon/extras/qca2/Neon/release] debian: rules: fix QCA_FEATURE_INSTALL_DIR for qt6

Pino Toscano null at kde.org
Thu May 16 14:04:46 BST 2024


Git commit ceb33ace448b5b7d4d554a70eedd573d0857032f by Pino Toscano.
Committed on 17/07/2023 at 03:20.
Pushed by jriddell into branch 'Neon/release'.

rules: fix QCA_FEATURE_INSTALL_DIR for qt6

M  +2    -0    debian/changelog
M  +1    -1    debian/rules

https://invent.kde.org/neon/extras/qca2/-/commit/ceb33ace448b5b7d4d554a70eedd573d0857032f

diff --git a/debian/changelog b/debian/changelog
index 3837071..02046a7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,8 @@ qca2 (2.3.6-5) UNRELEASED; urgency=medium
 
   [ Pino Toscano ]
   * Fix typo in plugins recommend in libqca-qt6-2.
+  * Fix qt6 path in QCA_FEATURE_INSTALL_DIR for the Qt 6 build (although it is
+    not actually used).
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Mon, 17 Jul 2023 05:15:00 +0200
 
diff --git a/debian/rules b/debian/rules
index 06db426..d9695f7 100755
--- a/debian/rules
+++ b/debian/rules
@@ -25,7 +25,7 @@ override_dh_auto_configure:
 	dh_auto_configure --builddirectory=build-qt6 -- \
 	    $(COMMON_CMAKE_ARGS) \
 	    -DBUILD_WITH_QT6=ON \
-	    -DQCA_FEATURE_INSTALL_DIR="/usr/lib/$(DEB_HOST_MULTIARCH)/qt5/mkspecs/features"
+	    -DQCA_FEATURE_INSTALL_DIR="/usr/lib/$(DEB_HOST_MULTIARCH)/qt6/mkspecs/features"
 
 override_dh_auto_build-arch:
 	dh_auto_build --builddirectory=build



More information about the Neon-commits mailing list