[neon/kde/kleopatra/Neon/unstable] debian: port to kf6

[Carlos De Maine]

Git commit 9d57af2d9ff087c36e27745b0d3cc5b5a0f3932b by Carlos De Maine.
Committed on 24/09/2023 at 08:05.
Pushed by carlosdem into branch 'Neon/unstable'.

port to kf6

M  +26   -26   debian/control
M  +2    -2    debian/kleopatra.install
M  +4    -13   debian/rules
M  +1    -7    debian/tests/control

https://invent.kde.org/neon/kde/kleopatra/-/commit/9d57af2d9ff087c36e27745b0d3cc5b5a0f3932b

diff --git a/debian/control b/debian/control
index 13ac42d..2d8b82f 100644
--- a/debian/control
+++ b/debian/control
@@ -5,36 +5,36 @@ Maintainer: Debian/Kubuntu Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
 Uploaders: Maximiliano Curia <maxy at debian.org>
 Build-Depends: cmake (>= 2.8.12~),
                debhelper (>= 9),
-               extra-cmake-modules (>= 5.17.0~),
-               kf5-mimetreeparser-dev,
+               kf6-codecs-dev,
+               kf6-extra-cmake-modules,
+               kf6-kcmutils-dev,
+               kf6-kconfig-dev,
+               kf6-kcrash-dev,
+               kf6-kdbusaddons-dev,
+               kf6-kdoctools-dev,
+               kf6-ki18n-dev,
+               kf6-kiconthemes-dev,
+               kf6-kio-dev,
+               kf6-kitemmodels-dev,
+               kf6-knotifications-dev,
+               kf6-ktextaddons-dev,
+               kf6-ktextwidgets-dev,
+               kf6-kwindowsystem-dev,
+               kf6-kxmlgui-dev,
+               kpim6-akonadi-mime-dev,
+               kpim6-identitymanagement-dev,
+               kpim6-kleo-dev,
+               kpim6-mailtransport-dev,
+               kpim6-mbox-dev,
+               kpim6-mime-dev,
+               kpim6-mimetreeparser-dev,
+               kpim6-pimtextedit-dev,
                libboost-dev (>= 1.34.0~),
                libgpgme-dev | libgpgme11-dev,
                libgpgmepp-dev | libqgpgme7-dev,
-               libkf5akonadimime-dev,
-               libkf5codecs-dev (>= 5.17.0~),
-               libkf5config-dev (>= 5.17.0~),
-               libkf5crash-dev,
-               libkf5dbusaddons-dev (>= 5.17.0~),
-               libkf5doctools-dev,
-               libkf5i18n-dev (>= 5.17.0~),
-               libkf5iconthemes-dev (>= 5.17.0~),
-               libkf5identitymanagement-dev,
-               libkf5itemmodels-dev,
-               libkf5kcmutils-dev (>= 5.17.0~),
-               libkf5kio-dev,
-               libkf5libkleo-dev (>= 5.1.41~),
-               libkf5mailtransport-dev,
-               libkf5mbox-dev,
-               libkf5mime-dev (>= 5.1.40~),
-               libkf5notifications-dev (>= 5.17.0~),
-               libkf5pimtextedit-dev,
-               libkf5ktextaddons-dev,
-               libkf5textwidgets-dev (>= 5.17.0~),
-               libkf5windowsystem-dev (>= 5.17.0~),
-               libkf5xmlgui-dev (>= 5.17.0~),
                libqgpgme-dev,
-               pkg-kde-tools (>= 0.12),
-               qtbase5-dev (>= 5.4.0~)
+               pkg-kde-tools-neon,
+               qt6-base-dev
 Standards-Version: 3.9.8
 Homepage: https://www.kde.org/applications/utilities/kleopatra/
 Vcs-Browser: https://anonscm.debian.org/git/pkg-kde/applications/kleopatra.git
diff --git a/debian/kleopatra.install b/debian/kleopatra.install
index 688e313..8f1c06b 100644
--- a/debian/kleopatra.install
+++ b/debian/kleopatra.install
@@ -1,3 +1,3 @@
-usr/share/qlogging-categories5/kleopatra.categories
-usr/share/qlogging-categories5/kleopatra.renamecategories
 usr/
+usr/share/qlogging-categories6/kleopatra.categories
+usr/share/qlogging-categories6/kleopatra.renamecategories
diff --git a/debian/rules b/debian/rules
index db6a515..3d69b0d 100644
--- a/debian/rules
+++ b/debian/rules
@@ -1,15 +1,6 @@
 #!/usr/bin/make -f
+# SPDX-License-Identifier: LGPL-2.0-or-later
+# SPDX-FileCopyrightText: 2023 Jonathan Riddell <jr at jriddell.org>
 
-l10npkgs_firstversion_ok := 4:17.03.90-0~
-
-include /usr/share/pkg-kde-tools/qt-kde-team/3/debian-qt-kde.mk
-include /usr/share/pkg-kde-tools/qt-kde-team/2/l10n-packages.mk
-
-override_dh_auto_install:
-	rm -f debian/tmp/usr/lib/*/libkleopatraclientcore.so
-	rm -f debian/tmp/usr/lib/*/libkleopatraclientgui.so
-	$(overridden_command) --destdir=debian/tmp
-
-override_dh_auto_test:
-	# Disable dh_auto_test at build time
-	:
+%:
+	dh $@ --with kf6 --buildsystem kf6
diff --git a/debian/tests/control b/debian/tests/control
index 9b69f41..4af7d6c 100644
--- a/debian/tests/control
+++ b/debian/tests/control
@@ -1,9 +1,3 @@
 Tests: testsuite
-Depends: @, @builddeps@, build-essential,
-         xvfb, xauth, dbus-x11
+Depends: build-essential, dbus-x11, xauth, xvfb, @, @builddeps@
 Restrictions: build-needed
-
-# Tests: acc
-# Depends: @,
-#          dh-acc, exuberant-ctags
-# Restrictions: allow-stderr