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

[Carlos De Maine]

Git commit 5989057d6da1551fbdca1892371bde1ab0481970 by Carlos De Maine.
Committed on 24/09/2023 at 08:04.
Pushed by carlosdem into branch 'Neon/unstable'.

port to kf6

M  +23   -26   debian/control
M  +2    -2    debian/libkf5akonadisearch-data.install
M  +1    -1    debian/libkf5akonadisearch-dev.install
M  +3    -3    debian/libkf5akonadisearch-plugins.install
M  +4    -10   debian/rules

https://invent.kde.org/neon/kde/akonadi-search/-/commit/5989057d6da1551fbdca1892371bde1ab0481970

diff --git a/debian/control b/debian/control
index 6626bcc..d69579a 100644
--- a/debian/control
+++ b/debian/control
@@ -5,23 +5,23 @@ Maintainer: Debian/Kubuntu Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
 Uploaders: Maximiliano Curia <maxy at debian.org>, Sandro Knauß <hefee at debian.org>
 Build-Depends: cmake (>= 3.0~),
                debhelper (>= 11),
-               extra-cmake-modules (>= 5.47.0~),
+               kf6-extra-cmake-modules,
+               kf6-kcmutils-dev,
+               kf6-kconfig-dev,
+               kf6-kcrash-dev,
+               kf6-kdbusaddons-dev,
+               kf6-ki18n-dev,
+               kf6-kio-dev,
+               kf6-krunner-dev,
+               kpim6-akonadi-dev,
+               kpim6-akonadi-mime-dev,
+               kpim6-calendar-dev,
+               kpim6-contacts-dev,
+               kpim6-mime-dev,
                libkaccounts-dev,
-               libkf5akonadi-dev (>= 4:18.08.3~),
-               libkf5akonadimime-dev (>= 4:18.08.3~),
-               libkf5calendarcore-dev (>= 4:18.08.3~),
-               libkf5config-dev (>= 5.47.0~),
-               libkf5contacts-dev (>= 4:18.08.3~),
-               libkf5crash-dev (>= 5.47.0~),
-               libkf5dbusaddons-dev (>= 5.47.0~),
-               libkf5i18n-dev (>= 5.47.0~),
-               libkf5kcmutils-dev (>= 5.47.0~),
-               libkf5kio-dev (>= 5.47.0~),
-               libkf5mime-dev (>= 18.08.3~),
-               libkf5runner-dev (>= 5.47.0~),
                libxapian-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
@@ -52,16 +52,13 @@ Package: libkf5akonadisearch-dev
 Section: libdevel
 Architecture: any
 Multi-Arch: same
-Depends: libkf5akonadi-dev (>= 4:18.08.3~),
-         libkf5akonadimime-dev (>= 4:18.08.3~),
-         libkf5akonadisearchcore5 (= ${binary:Version}),
-         libkf5akonadisearchdebug5 (= ${binary:Version}),
-         libkf5akonadisearchpim5 (= ${binary:Version}),
-         libkf5akonadisearchxapian5 (= ${binary:Version}),
-         libkf5calendarcore-dev (>= 4:18.08.3~),
-         libkf5contacts-dev (>= 4:18.08.3~),
-         libkf5mime-dev (>= 18.08.3~),
-         qtbase5-dev (>= 5.9.0~),
+Depends: kpim6-akonadi-dev,
+         kpim6-akonadi-mime-dev,
+         kpim6-akonadi-search (= ${binary:Version}),
+         kpim6-calendar-dev,
+         kpim6-contacts-dev,
+         kpim6-mime-dev,
+         qt6-base-dev,
          ${misc:Depends}
 Description: Akonadi search library - development files
  Library used to search in the Akonadi PIM data server.
@@ -81,7 +78,7 @@ Breaks: kmail (<< 4:17.08)
 Package: libkf5akonadisearchcore5
 Architecture: any
 Multi-Arch: same
-Depends: libkf5akonadisearch-data (>= ${source:Version}),
+Depends: kpim6-akonadi-search (>= ${source:Version}),
          ${misc:Depends},
          ${shlibs:Depends}
 Recommends: libkf5akonadisearch-bin,
diff --git a/debian/libkf5akonadisearch-data.install b/debian/libkf5akonadisearch-data.install
index e9f6532..a5fe618 100644
--- a/debian/libkf5akonadisearch-data.install
+++ b/debian/libkf5akonadisearch-data.install
@@ -1,2 +1,2 @@
-usr/share/qlogging-categories5/akonadi-search.categories
-usr/share/qlogging-categories5/akonadi-search.renamecategories
+usr/share/qlogging-categories6/akonadi-search.categories
+usr/share/qlogging-categories6/akonadi-search.renamecategories
diff --git a/debian/libkf5akonadisearch-dev.install b/debian/libkf5akonadisearch-dev.install
index 33f9b09..bf8e57e 100644
--- a/debian/libkf5akonadisearch-dev.install
+++ b/debian/libkf5akonadisearch-dev.install
@@ -1,4 +1,4 @@
-usr/include/KPim5/
+usr/include/KPim6/
 usr/lib/*/cmake/KPim5AkonadiSearch/
 usr/lib/*/libKPim5AkonadiSearchCore.so
 usr/lib/*/libKPim5AkonadiSearchDebug.so
diff --git a/debian/libkf5akonadisearch-plugins.install b/debian/libkf5akonadisearch-plugins.install
index 0c9df72..4e0b454 100644
--- a/debian/libkf5akonadisearch-plugins.install
+++ b/debian/libkf5akonadisearch-plugins.install
@@ -1,3 +1,3 @@
-usr/lib/*/qt5/plugins/kf5/krunner/kcms/kcm_krunner_pimcontacts.so
-usr/lib/*/qt5/plugins/kf5/krunner/krunner_pimcontacts.so
-usr/lib/*/qt5/plugins/pim5/akonadi
+usr/lib/*/qt6/plugins/kf6/krunner/kcms/kcm_krunner_pimcontacts.so
+usr/lib/*/qt6/plugins/kf6/krunner/krunner_pimcontacts.so
+usr/lib/*/qt6/plugins/pim5/akonadi
diff --git a/debian/rules b/debian/rules
index 63eaa87..3d69b0d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,12 +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='libkf5akonadisearch-dbg (<= 15.12.1-1~~)'
-
-override_dh_auto_test:
-	- xvfb-run -- dh_auto_test --no-parallel
+%:
+	dh $@ --with kf6 --buildsystem kf6