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

[Carlos De Maine]

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

port to kf6

M  +13   -13   debian/control
M  +3    -3    debian/kio-ldap.install
M  +2    -2    debian/libkf5ldap-dev.install
M  +4    -11   debian/rules

https://invent.kde.org/neon/kde/kldap/-/commit/5c74508245c0013aaa84bbfa09da53b443e5644f

diff --git a/debian/control b/debian/control
index 7907d7c..41b6af7 100644
--- a/debian/control
+++ b/debian/control
@@ -5,19 +5,19 @@ Maintainer: Debian/Kubuntu Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
 Uploaders: Maximiliano Curia <maxy at debian.org>
 Build-Depends: cmake (>= 2.8.12~),
                debhelper (>= 9),
-               extra-cmake-modules (>= 5.19.0~),
-               libkf5completion-dev (>= 5.19.0~),
-               libkf5i18n-dev (>= 5.19.0~),
-               libkf5doctools-dev,
-               libkf5kio-dev,
-               libkf5mbox-dev,
-               libkf5wallet-dev,
-               libkf5widgetsaddons-dev (>= 5.19.0~),
+               kf6-extra-cmake-modules,
+               kf6-kcompletion-dev,
+               kf6-kdoctools-dev,
+               kf6-ki18n-dev,
+               kf6-kio-dev,
+               kf6-kwallet-dev,
+               kf6-kwidgetsaddons-dev,
+               kpim6-mbox-dev,
                libldap2-dev,
                libsasl2-dev,
-               pkg-kde-tools (>> 0.15.15),
-               qt5keychain-dev,
-               qtbase5-dev
+               pkg-kde-tools-neon,
+               qt6-base-dev,
+               qtkeychain-qt6-dev
 Standards-Version: 3.9.8
 Homepage: https://projects.kde.org/projects/kde/pim/kldap
 Vcs-Browser: https://anonscm.debian.org/git/pkg-kde/applications/kldap.git
@@ -40,10 +40,10 @@ Package: libkf5ldap-dev
 Section: libdevel
 Architecture: any
 Multi-Arch: same
-Depends: libkf5ldap5 (= ${binary:Version}),
+Depends: kpim6-ldap (= ${binary:Version}),
          libldap2-dev,
          libsasl2-dev,
-         qtbase5-dev,
+         qt6-base-dev,
          ${misc:Depends}
 Description: library for accessing LDAP - development files
  This is a library for accessing LDAP with a convenient Qt style C++ API.
diff --git a/debian/kio-ldap.install b/debian/kio-ldap.install
index 7c6ee07..ce65df7 100644
--- a/debian/kio-ldap.install
+++ b/debian/kio-ldap.install
@@ -1,4 +1,4 @@
-usr/lib/*/qt5/plugins/kf5/kio/ldap.so
+usr/lib/*/qt6/plugins/kf6/kio/ldap.so
 usr/share/locale/*/LC_MESSAGES/kio_ldap.mo
-usr/share/qlogging-categories5/kldap.categories
-usr/share/qlogging-categories5/kldap.renamecategories
+usr/share/qlogging-categories6/kldap.categories
+usr/share/qlogging-categories6/kldap.renamecategories
diff --git a/debian/libkf5ldap-dev.install b/debian/libkf5ldap-dev.install
index 958f8db..4015de7 100644
--- a/debian/libkf5ldap-dev.install
+++ b/debian/libkf5ldap-dev.install
@@ -1,4 +1,4 @@
-usr/include/KPim5/KLDAP/
+usr/include/KPim6/KLDAP/
 usr/lib/*/cmake/KPim5Ldap/
 usr/lib/*/libKPim5Ldap.so
-usr/lib/*/qt5/mkspecs/modules/qt_Ldap.pri
+usr/lib/*/qt6/mkspecs/modules/qt_Ldap.pri
diff --git a/debian/rules b/debian/rules
index 24e8be6..3d69b0d 100644
--- 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:17.03.90-0~
-
-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='libkf5ldap-dbg (<= 15.12.0-1~~)'
-
-override_dh_auto_test:
-	# Disable auto test at build time, fakeroot breaks them
-	:
+%:
+	dh $@ --with kf6 --buildsystem kf6