[neon/kde/krdc/Neon/unstable] debian: kf6ify

[Carlos De Maine]

Git commit b475d922229c4b5d720be51a8936da5c9cac8260 by Carlos De Maine.
Committed on 02/07/2024 at 01:59.
Pushed by carlosdem into branch 'Neon/unstable'.

kf6ify

D  +0    -1    debian/compat
M  +21   -24   debian/control
M  +2    -2    debian/krdc.lintian-overrides
D  +0    -29   debian/patches/fix_kfreebsd_ftbfs
D  +0    -1    debian/patches/series
M  +4    -10   debian/rules

https://invent.kde.org/neon/kde/krdc/-/commit/b475d922229c4b5d720be51a8936da5c9cac8260

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 ba43763..2119ae8 100644
--- a/debian/control
+++ b/debian/control
@@ -7,32 +7,32 @@ Uploaders: Sune Vuorela <sune at debian.org>,
            George Kiagiadakis <kiagiadakis.george at gmail.com>,
            Eshat Cakar <info at eshat.de>,
            Maximiliano Curia <maxy at debian.org>,
-Build-Depends: cmake (>= 2.8.12~),
-               debhelper (>= 11),
-               extra-cmake-modules,
+Build-Depends: cmake,
+               debhelper-compt (= 13),
                freerdp2-x11,
                freerdp2-wayland,
+               freerdp2-dev,
+               kf6-extra-cmake-modules,
+               kf6-kbookmarks-dev,
+               kf6-kcompletion-dev,
+               kf6-kconfig-dev,
+               kf6-kdnssd-dev,
+               kf6-kdoctools-dev,
+               kf6-ki18n-dev,
+               kf6-kiconthemes-dev,
+               kf6-kkcmutils-dev,
+               kf6-knotifications-dev,
+               kf6-knotifyconfig-dev,
+               kf6-kwallet-dev,
+               kf6-kwidgetsaddons-dev,
+               kf6-kxmlgui-dev,
                libfreerdp2-2,
                libfreerdp-client2-2,
-               freerdp2-dev,
-               libkf5activities-dev,
-               libkf5bookmarks-dev,
-               libkf5completion-dev,
-               libkf5config-dev,
-               libkf5dnssd-dev,
-               libkf5doctools-dev,
-               libkf5i18n-dev,
-               libkf5iconthemes-dev,
-               libkf5kcmutils-dev,
-               libkf5notifications-dev,
-               libkf5notifyconfig-dev,
-               libkf5wallet-dev,
-               libkf5widgetsaddons-dev,
-               libkf5xmlgui-dev,
                libssh-dev,
-               libvncserver-dev (>= 0.9.8.1),
-               pkg-kde-tools (>= 0.12),
-Standards-Version: 4.1.4
+               libvncserver-dev,
+               pkg-kde-tools-neon,
+               plasma-activities-dev,
+Standards-Version: 4.6.2
 Homepage: http://www.kde.org/
 Vcs-Browser: https://salsa.debian.org/qt-kde-team/kde/krdc
 Vcs-Git: https://salsa.debian.org/qt-kde-team/kde/krdc.git
@@ -41,10 +41,7 @@ Package: krdc
 Section: net
 Architecture: any
 Depends: ${misc:Depends}, ${shlibs:Depends}
-Recommends: freerdp2-x11
 Suggests: khelpcenter, krfb
-Breaks: ${kde-l10n:all}
-Replaces: ${kde-l10n:all}
 Description: Remote Desktop Connection client
  The KDE Remote Desktop Connection client can view and control a desktop
  session running on another system.  It can connect to Windows Terminal Servers
diff --git a/debian/krdc.lintian-overrides b/debian/krdc.lintian-overrides
index 5a67732..6183cab 100644
--- a/debian/krdc.lintian-overrides
+++ b/debian/krdc.lintian-overrides
@@ -1,3 +1,3 @@
-krdc: package-name-doesnt-match-sonames libkrdccore5
-krdc: link-to-shared-library-in-wrong-package usr/lib/*/libkrdccore.so.24.01.80 usr/lib/*/libkrdccore.so
+krdc: package-name-doesnt-match-sonames libkrdccore6
+krdc: link-to-shared-library-in-wrong-package usr/lib/*/libkrdccore.so.*.*.* usr/lib/*/libkrdccore.so
 krdc: no-manual-page usr/bin/krdc
diff --git a/debian/patches/fix_kfreebsd_ftbfs b/debian/patches/fix_kfreebsd_ftbfs
deleted file mode 100644
index dbd286f..0000000
--- a/debian/patches/fix_kfreebsd_ftbfs
+++ /dev/null
@@ -1,29 +0,0 @@
-From: Debian/Kubuntu Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
-Date: Thu, 21 Apr 2016 01:23:21 +0200
-Subject: fix_kfreebsd_ftbfs
-
-===================================================================
----
- vnc/vncclientthread.cpp | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/vnc/vncclientthread.cpp b/vnc/vncclientthread.cpp
-index e4e5032..4d7c5c0 100644
---- a/vnc/vncclientthread.cpp
-+++ b/vnc/vncclientthread.cpp
-@@ -607,6 +607,7 @@ void VncClientThread::clientSetKeepalive()
-         return;
-     }
- 
-+#if !defined(__FreeBSD_kernel__)
-     optval = m_keepalive.intervalSeconds;
-     if (setsockopt(cl->sock, IPPROTO_TCP, TCP_KEEPIDLE, &optval, optlen) < 0) {
-         qCritical(KRDC) << "setsockopt(TCP_KEEPIDLE)" << strerror(errno);
-@@ -624,6 +625,7 @@ void VncClientThread::clientSetKeepalive()
-         qCritical(KRDC) << "setsockopt(TCP_KEEPCNT)" << strerror(errno);
-         return;
-     }
-+#endif
-     m_keepalive.set = true;
-     qCDebug(KRDC) << "TCP keepalive set";
- }
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 0e18d41..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-fix_kfreebsd_ftbfs
diff --git a/debian/rules b/debian/rules
index bab2bc4..49552b2 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-6~
-
-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_configure:
-	$(overridden_command) -- -DHAVE_XFREERDP=true
-
-override_dh_strip:
-	dh_strip --dbgsym-migration='krdc-dbg (<= 4:15.12.0-1~~)'
+%:
+	dh $@ --with kf6 --buildsystem kf6