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

[Carlos De Maine]

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

port to kf6

M  +19   -21   debian/control
M  +0    -1    debian/copyright
M  +3    -3    debian/libkf5libkleo-data.install
M  +2    -2    debian/libkf5libkleo-dev.install
M  +4    -4    debian/rules

https://invent.kde.org/neon/kde/libkleo/-/commit/bf5dc2da6a0d0cf86c06b9547ade6446aaba15b0

diff --git a/debian/control b/debian/control
index 2d1f596..a1bf599 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>
 Build-Depends: cmake (>= 3.0~),
                debhelper (>= 11),
-               extra-cmake-modules (>= 5.47.0~),
+               kf6-codecs-dev,
+               kf6-extra-cmake-modules,
+               kf6-kcompletion-dev,
+               kf6-kconfig-dev,
+               kf6-kcoreaddons-dev,
+               kf6-ki18n-dev,
+               kf6-kitemmodels-dev,
+               kf6-kwidgetsaddons-dev,
+               kf6-kwindowsystem-dev,
+               kpim6-pimtextedit-dev,
                libboost-dev (>= 1.34.0~),
                libgpg-error-dev,
                libgpgme-dev,
                libgpgmepp-dev (>= 1.8.0~),
-               libkf5codecs-dev (>= 5.47.0~),
-               libkf5completion-dev (>= 5.47.0~),
-               libkf5config-dev (>= 5.47.0~),
-               libkf5coreaddons-dev (>= 5.47.0~),
-               libkf5i18n-dev (>= 5.47.0~),
-               libkf5itemmodels-dev (>= 5.47.0~),
-               libkf5pimtextedit-dev (>= 18.08.3~),
-               libkf5widgetsaddons-dev (>= 5.47.0~),
-               libkf5windowsystem-dev (>= 5.47.0~),
                libqgpgme-dev,
-               pkg-kde-tools (>= 0.12),
-               qtbase5-dev (>= 5.9.0~),
+               pkg-kde-tools-neon,
+               qt6-base-dev
 Standards-Version: 4.3.0
 Homepage: http://pim.kde.org/
 Vcs-Browser: https://salsa.debian.org/qt-kde-team/kde/libkleo
@@ -43,13 +43,13 @@ Package: libkf5libkleo-dev
 Section: libdevel
 Architecture: any
 Multi-Arch: same
-Depends: libboost-dev (>= 1.34.0~),
+Depends: kf6-kwidgetsaddons-dev,
+         kpim6-kleo (= ${binary:Version}),
+         libboost-dev (>= 1.34.0~),
          libgpgme-dev,
          libgpgmepp-dev (>= 1.8.0~),
-         libkf5libkleo5 (= ${binary:Version}),
-         libkf5widgetsaddons-dev (>= 5.47.0~),
-         qtbase5-dev (>= 5.9.0~),
-         ${misc:Depends},
+         qt6-base-dev,
+         ${misc:Depends}
 Description: KDE PIM cryptographic library, devel files
  This package contains the development files for libkleo, a library for
  Kleopatra and other parts of KDE using certificate-based crypto.
@@ -60,9 +60,7 @@ Breaks: libkf5messagecomposer-dev (<< 4:17.08)
 Package: libkf5libkleo5
 Architecture: any
 Multi-Arch: same
-Depends: libkf5libkleo-data (= ${source:Version}),
-         ${misc:Depends},
-         ${shlibs:Depends},
+Depends: kpim6-kleo (= ${source:Version}), ${misc:Depends}, ${shlibs:Depends}
 Description: KDE PIM cryptographic library
  This package contains libkleo, a library for Kleopatra and other parts of KDE
  using certificate-based crypto.
@@ -73,4 +71,4 @@ Breaks: kdepim-addons (<< 17.08),
         kmail (<< 4:17.08),
         libkf5kaddressbookgrantlee5 (<< 4:17.08),
         libkf5messagecomposer5 (<< 4:17.08),
-        libkf5messageviewer5 (<< 4:17.08),
+        libkf5messageviewer5 (<< 4:17.08)
diff --git a/debian/copyright b/debian/copyright
index f05d027..8b75a2c 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -106,4 +106,3 @@ License: LGPL-2.1+3+KDEeV
  .
  The complete text of the GNU Library General Public License version 3
  can be found in `/usr/share/common-licenses/LGPL-3'.
-
diff --git a/debian/libkf5libkleo-data.install b/debian/libkf5libkleo-data.install
index 2ccce22..f5392f7 100644
--- a/debian/libkf5libkleo-data.install
+++ b/debian/libkf5libkleo-data.install
@@ -1,6 +1,6 @@
-usr/share/qlogging-categories5/libkleo.categories
-usr/share/qlogging-categories5/libkleo.categories
-usr/share/qlogging-categories5/libkleo.renamecategories
 etc/xdg/libkleopatrarc
 usr/share/libkleopatra/
 usr/share/locale/
+usr/share/qlogging-categories6/libkleo.categories
+usr/share/qlogging-categories6/libkleo.categories
+usr/share/qlogging-categories6/libkleo.renamecategories
diff --git a/debian/libkf5libkleo-dev.install b/debian/libkf5libkleo-dev.install
index beff746..c3fb4b3 100644
--- a/debian/libkf5libkleo-dev.install
+++ b/debian/libkf5libkleo-dev.install
@@ -1,5 +1,5 @@
-usr/include/KPim5/
+usr/include/KPim6/
 usr/lib/*/cmake/KF5Libkleo/
 usr/lib/*/cmake/KPim5Libkleo/
 usr/lib/*/libKPim5Libkleo.so
-usr/lib/*/qt5/mkspecs/modules/qt_Libkleo.pri
+usr/lib/*/qt6/mkspecs/modules/qt_Libkleo.pri
diff --git a/debian/rules b/debian/rules
index c8b9fc3..3d69b0d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,6 +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
+%:
+	dh $@ --with kf6 --buildsystem kf6