[neon/kde/kgpg/Neon/unstable] debian: kf6ify

[Scarlett Moore]

Git commit 8ae3968830730d4f46590617ce4c9db327da8a26 by Scarlett Moore.
Committed on 26/09/2023 at 17:21.
Pushed by scarlettmoore into branch 'Neon/unstable'.

kf6ify

D  +0    -1    debian/compat
M  +23   -25   debian/control
M  +4    -11   debian/rules

https://invent.kde.org/neon/kde/kgpg/-/commit/8ae3968830730d4f46590617ce4c9db327da8a26

diff --git a/debian/compat b/debian/compat
deleted file mode 100644
index b4de394..0000000
--- a/debian/compat
+++ /dev/null
@@ -1 +0,0 @@
-11
diff --git a/debian/control b/debian/control
index 090aee9..7c7e1eb 100644
--- a/debian/control
+++ b/debian/control
@@ -8,32 +8,32 @@ Uploaders: Sune Vuorela <sune at debian.org>,
            Eshat Cakar <info at eshat.de>,
            Maximiliano Curia <maxy at debian.org>,
 Build-Depends: cmake (>= 3.0~),
-               debhelper (>= 11),
-               extra-cmake-modules (>= 5.21.0~),
+               debhelper-compat (= 12),
+               kf6-extra-cmake-modules,
                gnupg2,
                gpg-agent,
                libgpgme-dev,
-               libkf5akonadicontact-dev,
-               libkf5archive-dev (>= 5.28~),
-               libkf5codecs-dev (>= 5.28~),
-               libkf5contacts-dev,
-               libkf5coreaddons-dev (>= 5.28~),
-               libkf5crash-dev (>= 5.28~),
-               libkf5dbusaddons-dev (>= 5.28~),
-               libkf5doctools-dev (>= 5.28~),
-               libkf5i18n-dev (>= 5.28~),
-               libkf5iconthemes-dev (>= 5.28~),
-               libkf5jobwidgets-dev (>= 5.28~),
-               libkf5kio-dev (>= 5.28~),
-               libkf5notifications-dev (>= 5.28~),
-               libkf5service-dev (>= 5.28~),
-               libkf5textwidgets-dev (>= 5.28~),
-               libkf5widgetsaddons-dev (>= 5.28~),
-               libkf5windowsystem-dev (>= 5.28~),
-               libkf5xmlgui-dev (>= 5.28~),
-               libqgpgme-dev,
-               pkg-kde-tools (>= 0.12),
-               qtbase5-dev (>= 5.9.0~),
+               kpim6-akonadi-contacts-dev,
+               kf6-archive-dev,
+               kf6-kcodecs-dev,
+               kf6-kcontacts-dev,
+               kf6-kcoreaddons-dev,
+               kf6-kcrash-dev,
+               kf6-kdbusaddons-dev,
+               kf6-kdoctools-dev,
+               kf6-ki18n-dev,
+               kf6-kiconthemes-dev,
+               kf6-kjobwidgets-dev,
+               kf6-kkio-dev,
+               kf6-knotifications-dev,
+               kf6-kservice-dev,
+               kf6-ktextwidgets-dev,
+               kf6-kwidgetsaddons-dev,
+               kf6-kwindowsystem-dev,
+               kf6-kxmlgui-dev,
+               libqgpgme15-qt6-dev,
+               pkg-kde-tools-neon,
+               qt6-base-dev (>= 5.9.0~),
                xauth,
                xvfb,
 Standards-Version: 4.3.0
@@ -45,8 +45,6 @@ Package: kgpg
 Section: utils
 Architecture: any
 Depends: gnupg, ${misc:Depends}, ${shlibs:Depends}
-Breaks: ${kde-l10n:all}
-Replaces: ${kde-l10n:all}
 Description: graphical front end for GNU Privacy Guard
  Kgpg manages cryptographic keys for the GNU Privacy Guard, and can encrypt,
  decrypt, sign, and verify files.  It features a simple editor for applying
diff --git a/debian/rules b/debian/rules
index 2c3b6c3..3d69b0d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,13 +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:16.04.3-10~
-
-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_strip:
-	$(overridden_command) --dbgsym-migration='kgpg-dbg (<= 4:15.12.1-1~~)'
-
-override_dh_auto_test:
-	- xvfb-run -a --server-args="-screen 0 1024x768x24 +extension GLX" --\
-	           dh_auto_test --no-parallel
+%:
+	dh $@ --with kf6 --buildsystem kf6