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

[Carlos De Maine]

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

port to kf6

M  +15   -15   debian/control
M  +2    -2    debian/libkf5gravatar-data.install
M  +2    -2    debian/libkf5gravatar-dev.install
M  +4    -7    debian/rules

https://invent.kde.org/neon/kde/libgravatar/-/commit/a65756c2b8395572510bf9ddbca77ab5b626b2f4

diff --git a/debian/control b/debian/control
index 82fa948..e1487ad 100644
--- a/debian/control
+++ b/debian/control
@@ -5,17 +5,17 @@ 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~),
-               libkf5config-dev (>= 5.47.0~),
-               libkf5i18n-dev (>= 5.47.0~),
-               libkf5imap-dev (>= 17.08.3~),
-               libkf5kio-dev (>= 5.47.0~),
-               libkf5ktextaddons-dev,
-               libkf5pimcommon-dev (>= 4:18.08.3~),
-               libkf5textwidgets-dev (>= 5.47.0~),
-               libkf5widgetsaddons-dev (>= 5.47.0~),
-               pkg-kde-tools (>= 0.12),
-               qtbase5-dev (>= 5.9.0~),
+               kf6-extra-cmake-modules,
+               kf6-kconfig-dev,
+               kf6-ki18n-dev,
+               kf6-kio-dev,
+               kf6-ktextaddons-dev,
+               kf6-ktextwidgets-dev,
+               kf6-kwidgetsaddons-dev,
+               kpim6-imap-dev,
+               kpim6-pimcommon-dev,
+               pkg-kde-tools-neon,
+               qt6-base-dev,
                xauth,
                xvfb
 Standards-Version: 4.3.0
@@ -41,9 +41,9 @@ Package: libkf5gravatar-dev
 Section: libdevel
 Architecture: any
 Multi-Arch: same
-Depends: libkf5config-dev (>= 5.39.0~),
-         libkf5gravatar5 (= ${binary:Version}),
-         qtbase5-dev (>= 5.8.0~),
+Depends: kf6-kconfig-dev,
+         kpim6-gravatar (= ${binary:Version}),
+         qt6-base-dev,
          ${misc:Depends},
          ${shlibs:Depends}
 Description: KDE PIM gravatar library, devel files
@@ -58,7 +58,7 @@ Description: KDE PIM gravatar library, devel files
 Package: libkf5gravatar5
 Architecture: any
 Multi-Arch: same
-Depends: libkf5gravatar-data (= ${binary:Version}),
+Depends: kpim6-gravatar-data (= ${binary:Version}),
          ${misc:Depends},
          ${shlibs:Depends}
 Breaks: kdepim-addons (<< 17.08),
diff --git a/debian/libkf5gravatar-data.install b/debian/libkf5gravatar-data.install
index 50df1bf..a6a1782 100644
--- a/debian/libkf5gravatar-data.install
+++ b/debian/libkf5gravatar-data.install
@@ -1,3 +1,3 @@
 usr/share/locale/
-usr/share/qlogging-categories5/libgravatar.categories
-usr/share/qlogging-categories5/libgravatar.renamecategories
+usr/share/qlogging-categories6/libgravatar.categories
+usr/share/qlogging-categories6/libgravatar.renamecategories
diff --git a/debian/libkf5gravatar-dev.install b/debian/libkf5gravatar-dev.install
index a1e5be9..3675afd 100644
--- a/debian/libkf5gravatar-dev.install
+++ b/debian/libkf5gravatar-dev.install
@@ -1,4 +1,4 @@
-usr/include/KPim5/
+usr/include/KPim6/
 usr/lib/*/cmake/KPim5Gravatar/
 usr/lib/*/libKPim5Gravatar.so
-usr/lib/*/qt5/mkspecs/modules/qt_Gravatar.pri
+usr/lib/*/qt6/mkspecs/modules/qt_Gravatar.pri
diff --git a/debian/rules b/debian/rules
index dc6a5c5..3d69b0d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,9 +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_auto_test:
-	- xvfb-run -- dh_auto_test --no-parallel
+%:
+	dh $@ --with kf6 --buildsystem kf6