[neon/kde/kwalletmanager/Neon/unstable] debian: Revert "Revert "Port to Qt 6""

[Carlos De Maine]

Git commit 9d3dcce91cb117ff934f461294af6e1b34ca0e74 by Carlos De Maine.
Committed on 28/07/2023 at 01:07.
Pushed by carlosdem into branch 'Neon/unstable'.

Revert "Revert "Port to Qt 6""

This reverts commit 6f0228dc0468e53cbd1f5181f6f218e9efbb6eb8.

D  +0    -1    debian/compat
M  +25   -27   debian/control
M  +5    -6    debian/rules
M  +4    -4    debian/upstream/metadata

https://invent.kde.org/neon/kde/kwalletmanager/-/commit/9d3dcce91cb117ff934f461294af6e1b34ca0e74

diff --git a/debian/compat b/debian/compat
deleted file mode 100644
index b4de394..0000000
--- a/debian/compat
+++ /dev/null
@@ -1 +0,0 @@
-11
diff --git a/debian/control b/debian/control
index 4de9d49..e112087 100644
--- a/debian/control
+++ b/debian/control
@@ -8,30 +8,30 @@ Uploaders: Sune Vuorela <sune at debian.org>,
            Eshat Cakar <info at eshat.de>,
            Maximiliano Curia <maxy at debian.org>,
 Build-Depends: cmake (>= 3.0~),
-               debhelper (>= 11),
-               extra-cmake-modules (>= 5.24.0~),
-               libkf5archive-dev (>= 5.24.0~),
-               libkf5auth-dev (>= 5.24.0~),
-               libkf5config-dev (>= 5.24.0~),
-               libkf5configwidgets-dev (>= 5.24.0~),
-               libkf5coreaddons-dev (>= 5.24.0~),
-               libkf5crash-dev (>= 5.24.0~),
-               libkf5dbusaddons-dev (>= 5.24.0~),
-               libkf5doctools-dev (>= 5.24.0~),
-               libkf5i18n-dev (>= 5.24.0~),
-               libkf5iconthemes-dev (>= 5.24.0~),
-               libkf5jobwidgets-dev (>= 5.24.0~),
-               libkf5kcmutils-dev (>= 5.24.0~),
-               libkf5kio-dev (>= 5.24.0~),
-               libkf5notifications-dev (>= 5.24.0~),
-               libkf5service-dev (>= 5.24.0~),
-               libkf5textwidgets-dev (>= 5.24.0~),
-               libkf5wallet-dev (>= 5.24.0~),
-               libkf5windowsystem-dev (>= 5.24.0~),
-               libkf5xmlgui-dev (>= 5.24.0~),
-               pkg-kde-tools (>= 0.12),
-               qtbase5-dev (>= 5.7.0~),
-Standards-Version: 4.1.4
+               debhelper-compat (= 13),
+               kf6-extra-cmake-modules,
+               kf6-karchive-dev,
+               kf6-kauth-dev,
+               kf6-kconfig-dev,
+               kf6-kconfigwidgets-dev,
+               kf6-kcoreaddons-dev,
+               kf6-kcrash-dev,
+               kf6-kdbusaddons-dev,
+               kf6-kdoctools-dev,
+               kf6-ki18n-dev,
+               kf6-kiconthemes-dev,
+               kf6-kjobwidgets-dev,
+               kf6-kcmutils-dev,
+               kf6-kio-dev,
+               kf6-knotifications-dev,
+               kf6-kservice-dev,
+               kf6-ktextwidgets-dev,
+               kf6-kwallet-dev,
+               kf6-kwindowsystem-dev,
+               kf6-kxmlgui-dev,
+               pkg-kde-tools-neon,
+               qt6-base-dev,
+Standards-Version: 4.6.1
 Homepage: http://www.kde.org
 Vcs-Browser: https://salsa.debian.org/qt-kde-team/kde/kwalletmanager
 Vcs-Git: https://salsa.debian.org/qt-kde-team/kde/kwalletmanager.git
@@ -40,9 +40,7 @@ Package: kwalletmanager
 Architecture: any
 Section: utils
 Depends: ${misc:Depends}, ${shlibs:Depends},
-         libkf5wallet-bin (>= 5.24.0~),
-Breaks: ${kde-l10n:all}
-Replaces: ${kde-l10n:all}
+         kf6-kwallet,
 Description: secure password wallet manager
  The KDE Wallet system provides a secure way to store passwords and other
  secret information, allowing the user to remember only a single KDE Wallet
diff --git a/debian/rules b/debian/rules
index 5eee405..c918243 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,9 +1,8 @@
 #!/usr/bin/make -f
 
-l10npkgs_firstversion_ok := 4:16.04.3-7~
+# SPDX-License-Identifier: LGPL-2.0-or-later
+# 
+# SPDX-FileCopyrightText: 2023 Jonathan Riddell jr at jriddell.org
 
-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='kwalletmanager-dbg (<= 4:15.12.1-1~~)'
+%:
+  dh $@ --with kf6 --buildsystem kf6
diff --git a/debian/upstream/metadata b/debian/upstream/metadata
index def8225..e6475b5 100644
--- a/debian/upstream/metadata
+++ b/debian/upstream/metadata
@@ -1,7 +1,7 @@
 Name: kwalletmanager
-Changelog: https://cgit.kde.org/kwalletmanager.git/log
+Changelog: https://invent.kde.org/utilities/kwalletmanager/-/commits/master
 Contact: kde-devel at kde.org
-Donation: https://www.kde.org/community/donations/index.php
-Repository: https://anongit.kde.org/kwalletmanager.git
-Repository-Browse: https://cgit.kde.org/kwalletmanager.git
+Donation: https://kde.org/community/donations/
+Repository: https://invent.kde.org/utilities/kwalletmanager.git
+Repository-Browse: https://invent.kde.org/utilities/kwalletmanager
 Security-Contact: security at kde.org