[neon/kde/akonadi-calendar/Neon/unstable] debian: port to kf6

[Carlos De Maine]

Git commit 36955eaf05fc60a29807dcabda1fc972bff89dd1 by Carlos De Maine.
Committed on 24/09/2023 at 04:25.
Pushed by carlosdem into branch 'Neon/unstable'.

port to kf6

M  +26   -26   debian/control
M  +4    -11   debian/rules

https://invent.kde.org/neon/kde/akonadi-calendar/-/commit/36955eaf05fc60a29807dcabda1fc972bff89dd1

diff --git a/debian/control b/debian/control
index d65c7c0..87ce403 100644
--- a/debian/control
+++ b/debian/control
@@ -5,28 +5,28 @@ Maintainer: Debian/Kubuntu Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
 Uploaders: Maximiliano Curia <maxy at debian.org>
 Build-Depends: cmake (>= 3.0~),
                debhelper (>= 11),
-               extra-cmake-modules (>= 5.47.0~),
-               libkf5akonadi-dev (>= 4:18.08.3~),
-               libkf5akonadicontact-dev (>= 4:18.08.3~),
-               libkf5calendarcore-dev (>= 4:18.08.3~),
-               libkf5calendarutils-dev (>= 4:18.08.3~),
-               libkf5codecs-dev (>= 5.47.0~),
-               libkf5contacts-dev (>= 4:18.08.3~),
-               libkf5dbusaddons-dev (>= 5.47.0~),
-               libkf5iconthemes-dev (>= 5.47.0~),
-               libkf5identitymanagement-dev (>= 18.08.3~),
-               libkf5kio-dev (>= 5.47.0~),
-               libkf5ktextaddons-dev,
-               libkf5libkdepim-dev,
-               libkf5mailtransport-dev (>= 18.08.3~),
-               libkf5messagecore-dev,
-               libkf5messagecomposer-dev,
-               libkf5templateparser-dev,
-               libkf5mimetreeparser-dev,
-               libkf5wallet-dev (>= 5.47.0~),
+               kf6-codecs-dev,
+               kf6-extra-cmake-modules,
+               kf6-kdbusaddons-dev,
+               kf6-kiconthemes-dev,
+               kf6-kio-dev,
+               kf6-ktextaddons-dev,
+               kf6-kwallet-dev,
+               kpim6-akonadi-contact-dev,
+               kpim6-akonadi-dev,
+               kpim6-calendar-dev,
+               kpim6-calendarutils-dev,
+               kpim6-contacts-dev,
+               kpim6-identitymanagement-dev,
+               kpim6-kdepim-dev,
+               kpim6-mailtransport-dev,
+               kpim6-messagecomposer-dev,
+               kpim6-messagecore-dev,
+               kpim6-mimetreeparser-dev,
+               kpim6-templateparser-dev,
                libqgpgme-dev,
-               pkg-kde-tools (>> 0.15.15),
-               qtbase5-dev (>= 5.9.0~),
+               pkg-kde-tools-neon,
+               qt6-base-dev,
                xauth,
                xvfb
 Standards-Version: 4.3.0
@@ -65,10 +65,10 @@ Package: libkf5akonadicalendar-dev
 Section: libdevel
 Architecture: any
 Multi-Arch: same
-Depends: libkf5akonadi-dev (>= 4:18.08.3~),
-         libkf5akonadicalendar5 (= ${binary:Version}),
-         libkf5akonadicontact-dev (>= 4:18.08.3~),
-         libkf5calendarcore-dev (>= 4:18.08.3~),
+Depends: kpim6-akonadi-calendar-dev (= ${binary:Version}),
+         kpim6-akonadi-contact-dev,
+         kpim6-akonadi-dev,
+         kpim6-calendar-dev,
          ${misc:Depends}
 Description: akonadi-calendar - development files
  This library offers helper functions to integrate the use of Akonadi calendar
@@ -82,7 +82,7 @@ Breaks: libkf5calendarsupport-dev (<< 4:17.08),
 Package: libkf5akonadicalendar5
 Architecture: any
 Multi-Arch: same
-Depends: libkf5akonadicalendar-data (= ${source:Version}),
+Depends: kpim6-akonadi-calendar (= ${source:Version}),
          ${misc:Depends},
          ${shlibs:Depends}
 Recommends: libkf5akonadisearch-bin
diff --git a/debian/rules b/debian/rules
index a728b83..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-9~
-
-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='libkf5akonadicalendar-dbg (<= 15.12.0-1~~)'
-
-override_dh_auto_test:
-	- xvfb-run --\
-	           dh_auto_test
+%:
+	dh $@ --with kf6 --buildsystem kf6