[neon/extras/kuserfeedback/Neon/unstable] debian: kf6ify

[Scarlett Moore]

Git commit c2c898101d79ecdca21868b5eb5343b9137778cf by Scarlett Moore.
Committed on 01/12/2023 at 15:37.
Pushed by scarlettmoore into branch 'Neon/unstable'.

kf6ify

M  +10   -12   debian/control
M  +2    -2    debian/kuserfeedback-dev.install
D  +0    -2    debian/qml-module-org-kde-userfeedback.install
A  +2    -0    debian/qml6-module-org-kde-userfeedback.install
M  +4    -3    debian/rules

https://invent.kde.org/neon/extras/kuserfeedback/-/commit/c2c898101d79ecdca21868b5eb5343b9137778cf

diff --git a/debian/control b/debian/control
index 5bd7f1a..2e01ae8 100644
--- a/debian/control
+++ b/debian/control
@@ -7,19 +7,17 @@ Uploaders: Aurélien COUDERC <coucouf at debian.org>,
 Build-Depends: bison,
                cmake (>= 3.0~),
                debhelper-compat (= 13),
-               extra-cmake-modules (>= 5.51.0~),
+               kf6-extra-cmake-modules,
                flex,
-               libqt5charts5-dev,
-               libqt5svg5-dev,
-               pkg-kde-tools,
-               qtbase5-dev (>= 5.8.0~),
-               qtdeclarative5-dev,
-               qtdeclarative5-dev-tools,
-               qttools5-dev,
-               qttools5-dev-tools (>= 5.4),
+               qt6-charts-dev,
+               qt6-svg-dev,
+               pkg-kde-tools-neon,
+               qt6-base-dev,
+               qt6-declarative-dev,
+               qt6-tools-dev,
                xauth <!nocheck>,
                xvfb <!nocheck>,
-Build-Depends-Indep: qdoc-qt5
+Build-Depends-Indep: qt6-doc
 Rules-Requires-Root: no
 Standards-Version: 4.6.0
 Homepage: https://invent.kde.org/libraries/kuserfeedback
@@ -48,7 +46,7 @@ Section: libdevel
 Architecture: any
 Depends: libkuserfeedbackcore1 (= ${binary:Version}),
          libkuserfeedbackwidgets1 (= ${binary:Version}),
-         qtbase5-dev,
+         qt6-base-dev,
          ${misc:Depends},
 Description: development files for KUserFeedback
  Framework for collecting user feedback for applications via telemetry
@@ -121,7 +119,7 @@ Description: user feedback for applications - widgets library
  .
  This package contains the widgets library used by kuserfeedback.
 
-Package: qml-module-org-kde-userfeedback
+Package: qml6-module-org-kde-userfeedback
 Architecture: any
 Multi-Arch: same
 Depends: ${misc:Depends}, ${shlibs:Depends}
diff --git a/debian/kuserfeedback-dev.install b/debian/kuserfeedback-dev.install
index af1ce8b..846e3ed 100644
--- a/debian/kuserfeedback-dev.install
+++ b/debian/kuserfeedback-dev.install
@@ -2,5 +2,5 @@ usr/include/KUserFeedback/
 usr/lib/*/cmake/KUserFeedback/
 usr/lib/*/libKUserFeedbackCore.so
 usr/lib/*/libKUserFeedbackWidgets.so
-usr/lib/*/qt5/mkspecs/modules/qt_KUserFeedbackCore.pri
-usr/lib/*/qt5/mkspecs/modules/qt_KUserFeedbackWidgets.pri
+usr/lib/*/qt6/mkspecs/modules/qt_KUserFeedbackCore.pri
+usr/lib/*/qt6/mkspecs/modules/qt_KUserFeedbackWidgets.pri
diff --git a/debian/qml-module-org-kde-userfeedback.install b/debian/qml-module-org-kde-userfeedback.install
deleted file mode 100644
index 2d4f373..0000000
--- a/debian/qml-module-org-kde-userfeedback.install
+++ /dev/null
@@ -1,2 +0,0 @@
-usr/lib/*/qt5/qml/org/kde/userfeedback/libKUserFeedbackQml.so
-usr/lib/*/qt5/qml/org/kde/userfeedback/qmldir
diff --git a/debian/qml6-module-org-kde-userfeedback.install b/debian/qml6-module-org-kde-userfeedback.install
new file mode 100644
index 0000000..fdd9d19
--- /dev/null
+++ b/debian/qml6-module-org-kde-userfeedback.install
@@ -0,0 +1,2 @@
+usr/lib/*/qt6/qml/org/kde/userfeedback/libKUserFeedbackQml.so
+usr/lib/*/qt6/qml/org/kde/userfeedback/qmldir
diff --git a/debian/rules b/debian/rules
index cde5e13..fa0af1d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,7 +1,8 @@
 #!/usr/bin/make -f
 # -*- makefile -*-
 
-export DEB_BUILD_MAINT_OPTIONS = hardening=+all
-
 %:
-	dh $@ --with pkgkde_symbolshelper,kf5  --without build_stamp
+	dh $@ --with kf6 --buildsystem kf6
+
+override_dh_shlibdeps:
+	dh_shlibdeps -l$(CURDIR)/debian/$(shell dh_listpackages | head -n1)/usr/kf6/lib/$(DEB_HOST_MULTIARCH)/