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

[Scarlett Moore]

Git commit 85a2d5b31b22d74f0542820e8769eab90c5afb50 by Scarlett Moore.
Committed on 27/09/2023 at 19:38.
Pushed by scarlettmoore into branch 'Neon/unstable'.

kf6ify

D  +0    -1    debian/compat
M  +16   -18   debian/control
M  +5    -5    debian/rules

https://invent.kde.org/neon/kde/kdiamond/-/commit/85a2d5b31b22d74f0542820e8769eab90c5afb50

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 5bbe2d2..6173777 100644
--- a/debian/control
+++ b/debian/control
@@ -10,22 +10,22 @@ Uploaders: Daniel Schepler <schepler at debian.org>,
            Lisandro Damián Nicanor Pérez Meyer <lisandro at debian.org>,
            Maximiliano Curia <maxy at debian.org>,
 Build-Depends: cmake (>= 2.8.12~),
-               debhelper (>= 11),
-               extra-cmake-modules (>= 5.30.0~),
-               libkf5config-dev (>= 5.30.0~),
-               libkf5configwidgets-dev (>= 5.30.0~),
-               libkf5coreaddons-dev (>= 5.30.0~),
-               libkf5crash-dev (>= 5.30.0~),
-               libkf5dbusaddons-dev (>= 5.30.0~),
-               libkf5doctools-dev (>= 5.30.0~),
-               libkf5i18n-dev (>= 5.30.0~),
-               libkf5kdegames-dev (>= 4.9.0~),
-               libkf5notifications-dev (>= 5.30.0~),
-               libkf5notifyconfig-dev (>= 5.30.0~),
-               libkf5widgetsaddons-dev (>= 5.30.0~),
-               libkf5xmlgui-dev (>= 5.30.0~),
-               pkg-kde-tools (>> 0.15.15),
-               qtbase5-dev (>= 5.7.0~),
+               debhelper-compat (= 12),
+               kf6-extra-cmake-modules,
+               kf6-kconfig-dev,
+               kf6-kconfigwidgets-dev,
+               kf6-kcoreaddons-dev,
+               kf6-kcrash-dev,
+               kf6-kdbusaddons-dev,
+               kf6-kdoctools-dev,
+               kf6-ki18n-dev,
+               libkdegames6-dev,
+               kf6-knotifications-dev,
+               kf6-knotifyconfig-dev,
+               kf6-kwidgetsaddons-dev,
+               kf6-kxmlgui-dev,
+               pkg-kde-tools-neon,
+               qt6-base-dev,
 Standards-Version: 4.1.4
 Homepage: http://games.kde.org/
 Vcs-Browser: https://salsa.debian.org/qt-kde-team/kde/kdiamond
@@ -35,8 +35,6 @@ Package: kdiamond
 Architecture: any
 Depends: ${misc:Depends}, ${shlibs:Depends}
 Recommends: khelpcenter
-Breaks: ${kde-l10n:all}
-Replaces: ${kde-l10n:all}
 Description: three-in-a-row game
  KDiamond is a three-in-a-row game like Bejeweled. It features unlimited fun
  with randomly generated games and five difficulty levels with varying number
diff --git a/debian/rules b/debian/rules
index 79c1042..773c786 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,9 +1,9 @@
 #!/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-4~
-
-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
+%:
+	dh $@ --with kf6 --buildsystem kf6
 
 override_dh_auto_configure:
-	$(overridden_command) -- -DBIN_INSTALL_DIR=/usr/games
+	dh_auto_configure -- -DBIN_INSTALL_DIR=/usr/games