[neon/extras/kuserfeedback/Neon/unstable] debian: make the 6 package install to the /usr/kf6/prefix for now

[Carlos De Maine]

Git commit 7a29d658e96ad253d2befb3e348cf48a2be11150 by Carlos De Maine.
Committed on 16/03/2023 at 00:08.
Pushed by carlosdem into branch 'Neon/unstable'.

make the 6 package install to the /usr/kf6/prefix for now

M  +5    -5    debian/kuserfeedback6-bin.install
M  +6    -6    debian/kuserfeedback6-dev.install
M  +1    -1    debian/kuserfeedback6-doc.install
M  +3    -3    debian/libkuserfeedback6core1.install
M  +1    -1    debian/libkuserfeedback6widgets1.install
M  +2    -2    debian/qml-module-org-kde-userfeedback6.install
M  +9    -10   debian/rules

https://invent.kde.org/neon/extras/kuserfeedback/commit/7a29d658e96ad253d2befb3e348cf48a2be11150

diff --git a/debian/kuserfeedback6-bin.install b/debian/kuserfeedback6-bin.install
index fd3e926..0bdd854 100644
--- a/debian/kuserfeedback6-bin.install
+++ b/debian/kuserfeedback6-bin.install
@@ -1,5 +1,5 @@
-usr/bin/UserFeedbackConsole
-usr/bin/userfeedbackctl
-usr/share/applications/org.kde.kuserfeedback-console.desktop
-#usr/share/locale/*/LC_MESSAGES/userfeedbackconsole6_qt.qm
-usr/share/metainfo/org.kde.kuserfeedback-console.appdata.xml
+usr/kf6/bin/UserFeedbackConsole
+usr/kf6/bin/userfeedbackctl
+usr/kf6/share/applications/org.kde.kuserfeedback-console.desktop
+#usr/kf6/share/locale/*/LC_MESSAGES/userfeedbackconsole6_qt.qm
+usr/kf6/share/metainfo/org.kde.kuserfeedback-console.appdata.xml
diff --git a/debian/kuserfeedback6-dev.install b/debian/kuserfeedback6-dev.install
index ae8bda8..34bf024 100644
--- a/debian/kuserfeedback6-dev.install
+++ b/debian/kuserfeedback6-dev.install
@@ -1,6 +1,6 @@
-usr/include/KUserFeedbackQt6/
-usr/lib/*/cmake/KUserFeedbackQt6/
-usr/lib/*/libKUserFeedbackCoreQt6.so
-usr/lib/*/libKUserFeedbackWidgetsQt6.so
-usr/lib/*/qt6/mkspecs/modules/qt_KUserFeedbackCoreQt6.pri
-usr/lib/*/qt6/mkspecs/modules/qt_KUserFeedbackWidgetsQt6.pri
+usr/kf6/include/KUserFeedbackQt6/
+usr/kf6/lib/*/cmake/KUserFeedbackQt6/
+usr/kf6/lib/*/libKUserFeedbackCoreQt6.so
+usr/kf6/lib/*/libKUserFeedbackWidgetsQt6.so
+usr/kf6/lib/*/qt6/mkspecs/modules/qt_KUserFeedbackCoreQt6.pri
+usr/kf6/lib/*/qt6/mkspecs/modules/qt_KUserFeedbackWidgetsQt6.pri
diff --git a/debian/kuserfeedback6-doc.install b/debian/kuserfeedback6-doc.install
index 5bb534f..07a2fe4 100644
--- a/debian/kuserfeedback6-doc.install
+++ b/debian/kuserfeedback6-doc.install
@@ -1 +1 @@
-usr/share/KDE/UserFeedbackConsoleQt6
+usr/kf6/share/KDE/UserFeedbackConsoleQt6
diff --git a/debian/libkuserfeedback6core1.install b/debian/libkuserfeedback6core1.install
index a6318ac..a22674d 100644
--- a/debian/libkuserfeedback6core1.install
+++ b/debian/libkuserfeedback6core1.install
@@ -1,3 +1,3 @@
-usr/lib/*/libKUserFeedbackCoreQt6.so.1*
-usr/share/locale/*/LC_MESSAGES/userfeedbackprovider5_qt.qm
-usr/share/qlogging-categories6/org_kde_UserFeedback.categories
+usr/kf6/lib/*/libKUserFeedbackCoreQt6.so.1*
+usr/kf6/share/locale/*/LC_MESSAGES/userfeedbackprovider5_qt.qm
+usr/kf6/share/qlogging-categories6/org_kde_UserFeedback.categories
diff --git a/debian/libkuserfeedback6widgets1.install b/debian/libkuserfeedback6widgets1.install
index e6f3121..ca4cd12 100644
--- a/debian/libkuserfeedback6widgets1.install
+++ b/debian/libkuserfeedback6widgets1.install
@@ -1 +1 @@
-usr/lib/*/libKUserFeedbackWidgetsQt6.so.1*
+usr/kf6/lib/*/libKUserFeedbackWidgetsQt6.so.1*
diff --git a/debian/qml-module-org-kde-userfeedback6.install b/debian/qml-module-org-kde-userfeedback6.install
index b8ac617..9772cc9 100644
--- a/debian/qml-module-org-kde-userfeedback6.install
+++ b/debian/qml-module-org-kde-userfeedback6.install
@@ -1,2 +1,2 @@
-usr/lib/*/qt6/qml/org/kde/userfeedback/libKUserFeedbackQmlQt6.so
-usr/lib/*/qt6/qml/org/kde/userfeedback/qmldir
+usr/kf6/lib/*/qt6/qml/org/kde/userfeedback/libKUserFeedbackQmlQt6.so
+usr/kf6/lib/*/qt6/qml/org/kde/userfeedback/qmldir
diff --git a/debian/rules b/debian/rules
index a6f323b..eeb06e7 100755
--- a/debian/rules
+++ b/debian/rules
@@ -5,17 +5,15 @@ export DEB_BUILD_MAINT_OPTIONS = hardening=+all
 
 %:
 	dh $@  --with pkgkde_symbolshelper --without build_stamp
+	dh $@ --with kf6 --buildsystem kf6
 
 execute_after_dh_auto_clean:
 	rm -rf build-Qt6
+	dh $@ --with kf6 --buildsystem kf6
 
-override_dh_auto_configure-arch:
-	dh_auto_configure -- -DENABLE_DOCS=OFF -DQT_MAJOR_VERSION=5
-	dh_auto_configure --builddirectory=build-Qt6 -- -DENABLE_DOCS=OFF -DBUILD_WITH_QT6=ON 
-
-override_dh_auto_configure-indep:
-	dh_auto_configure -- -DENABLE_DOCS=ON
-	dh_auto_configure --builddirectory=build-Qt6 -- -DENABLE_DOCS=ON -DBUILD_WITH_QT6=ON
+override_dh_auto_configure:
+	dh_auto_configure -- -DQT_MAJOR_VERSION=5
+	dh_auto_configure --builddirectory=build-Qt6 -- -DBUILD_WITH_QT6=ON 
 
 override_dh_auto_build:
 	dh_auto_build
@@ -25,6 +23,7 @@ override_dh_auto_install:
 	dh_auto_install
 	dh_auto_install --builddirectory=build-Qt6
 
-override_dh_auto_test:
-	xvfb-run dh_auto_test --no-parallel
-	xvfb-run dh_auto_test --no-parallel --builddirectory=build-Qt6
+override_dh_shlibdeps:
+	dh_shlibdeps
+	dh_shlibdeps -l$(CURDIR)/debian/$(shell dh_listpackages | head -n1)/usr/kf6/lib/$(DEB_HOST_MULTIARCH)/
+