[neon/kde/krfb/Neon/unstable] debian: kf6ify
Carlos De Maine
null at kde.org
Sat Jan 13 07:13:19 GMT 2024
Git commit 07eac6ee6fc1ddc487a7d87d5da371fc1fa76a3b by Carlos De Maine.
Committed on 13/01/2024 at 08:13.
Pushed by carlosdem into branch 'Neon/unstable'.
kf6ify
D +0 -1 debian/compat
M +19 -25 debian/control
M +1 -1 debian/krfb.lintian-overrides
D +0 -22 debian/patches/add_libpthread_to_krfb.diff
D +0 -196 debian/patches/build_against_gcc-6.patch
D +0 -2 debian/patches/series
M +4 -4 debian/rules
https://invent.kde.org/neon/kde/krfb/-/commit/07eac6ee6fc1ddc487a7d87d5da371fc1fa76a3b
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 da24cef..40289ea 100644
--- a/debian/control
+++ b/debian/control
@@ -7,29 +7,26 @@ 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 (>= 3.0~),
- debhelper (>= 11),
- extra-cmake-modules (>= 5.31.0~),
- libepoxy-dev,
+Build-Depends: cmake,
+ debhelper-compat (= 13),
+ kf6-extra-cmake-modules,
+ kf6-kcompletion-dev,
+ kf6-kconfig-dev,
+ kf6-kcoreaddons-dev,
+ kf6-kcrash-dev,
+ kf6-kdbusaddons-dev,
+ kf6-kdnssd-dev,
+ kf6-kdoctools-dev,
+ kf6-ki18n-dev,
+ kf6-knotifications-dev,
+ kf6-kwallet-dev,
+ kf6-kwayland-dev,
+ kf6-kwidgetsaddons-dev,
+ kf6-kxmlgui-dev,libepoxy-dev,
libgbm-dev,
libjpeg-dev,
- libkf5completion-dev,
- libkf5config-dev,
- libkf5coreaddons-dev,
- libkf5crash-dev,
- libkf5dbusaddons-dev,
- libkf5dnssd-dev,
- libkf5doctools-dev,
- libkf5i18n-dev,
- libkf5notifications-dev,
libkpipewire-dev,
- libkf5wallet-dev,
- libkf5wayland-dev,
- libkf5widgetsaddons-dev,
- libkf5xmlgui-dev,
libpipewire-0.3-dev,
- libqt5waylandclient5-dev,
- libqt5x11extras5-dev,
libspa-0.2-dev,
libvncserver-dev,
libwayland-dev,
@@ -44,12 +41,11 @@ Build-Depends: cmake (>= 3.0~),
libxdamage-dev,
libxtst-dev,
pkg-config,
- pkg-kde-tools (>= 0.12),
+ pkg-kde-tools-neon,
plasma-wayland-protocols,
qtbase5-dev,
- qtbase5-private-dev,
- qtwayland5-dev-tools
-Standards-Version: 4.1.4
+ qt6-wayland-dev,
+Standards-Version: 4.6.2
Homepage: http://www.kde.org/
Vcs-Browser: https://salsa.debian.org/qt-kde-team/kde/krfb
Vcs-Git: https://salsa.debian.org/qt-kde-team/kde/krfb.git
@@ -59,8 +55,6 @@ Section: net
Architecture: any
Depends: ${misc:Depends}, ${shlibs:Depends}
Suggests: khelpcenter, krdc
-Breaks: ${kde-l10n:all}
-Replaces: ${kde-l10n:all}
Description: Desktop Sharing utility
KDE Desktop Sharing is a manager for easily sharing a desktop session with
another system. The desktop session can be viewed or controlled remotely by
diff --git a/debian/krfb.lintian-overrides b/debian/krfb.lintian-overrides
index 946b805..8fb900c 100644
--- a/debian/krfb.lintian-overrides
+++ b/debian/krfb.lintian-overrides
@@ -1,4 +1,4 @@
# private library
-krfb: package-name-doesnt-match-sonames libkrfbprivate5*
+krfb: package-name-doesnt-match-sonames libkrfbprivate6*
# private library
krfb: no-symbols-control-file
diff --git a/debian/patches/add_libpthread_to_krfb.diff b/debian/patches/add_libpthread_to_krfb.diff
deleted file mode 100644
index 9d09f1b..0000000
--- a/debian/patches/add_libpthread_to_krfb.diff
+++ /dev/null
@@ -1,22 +0,0 @@
-From: Debian/Kubuntu Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
-Date: Wed, 13 Apr 2016 11:47:46 +0200
-Subject: add_libpthread_to_krfb
-
-===================================================================
----
- krfb/CMakeLists.txt | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/krfb/CMakeLists.txt b/krfb/CMakeLists.txt
-index 821e9a1..859c965 100644
---- a/krfb/CMakeLists.txt
-+++ b/krfb/CMakeLists.txt
-@@ -102,6 +102,8 @@ if (X11_XTest_FOUND)
- )
- endif (X11_XTest_FOUND)
-
-+target_link_libraries (krfb pthread)
-+
- install (TARGETS krfb
- ${INSTALL_TARGETS_DEFAULT_ARGS}
- )
diff --git a/debian/patches/build_against_gcc-6.patch b/debian/patches/build_against_gcc-6.patch
deleted file mode 100644
index 36128d1..0000000
--- a/debian/patches/build_against_gcc-6.patch
+++ /dev/null
@@ -1,196 +0,0 @@
-From: Debian/Kubuntu Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
-Date: Thu, 18 Aug 2016 22:47:11 +0200
-Subject: build_against_gcc-6
-
----
- krfb/events.cpp | 4 ++--
- krfb/framebuffer.h | 8 ++++----
- krfb/invitationsrfbclient.cpp | 14 +++++++-------
- krfb/invitationsrfbserver.cpp | 10 ++++++----
- krfb/rfbclient.cpp | 9 +++++----
- krfb/rfbserver.cpp | 5 +++--
- krfb/rfbservermanager.cpp | 12 ++++++------
- 7 files changed, 33 insertions(+), 29 deletions(-)
-
-diff --git a/krfb/events.cpp b/krfb/events.cpp
-index 24be95d..d903cce 100644
---- a/krfb/events.cpp
-+++ b/krfb/events.cpp
-@@ -22,8 +22,6 @@
- Boston, MA 02110-1301, USA.
- */
-
--#include "events.h"
--
- #include <QApplication>
- #include <QX11Info>
- #include <QDesktopWidget>
-@@ -33,6 +31,8 @@
- #include <X11/keysym.h>
- #include <X11/extensions/XTest.h>
-
-+#include "events.h"
-+
- enum {
- LEFTSHIFT = 1,
- RIGHTSHIFT = 2,
-diff --git a/krfb/framebuffer.h b/krfb/framebuffer.h
-index f6430a3..18f9091 100644
---- a/krfb/framebuffer.h
-+++ b/krfb/framebuffer.h
-@@ -10,15 +10,15 @@
- #ifndef FRAMEBUFFER_H
- #define FRAMEBUFFER_H
-
--#include "rfb.h"
--
--#include "krfbprivate_export.h"
--
- #include <QtCore/QObject>
- #include <QtCore/QRect>
- #include <QtCore/QList>
- #include <QWidget>
-
-+#include "rfb.h"
-+
-+#include "krfbprivate_export.h"
-+
-
- class FrameBuffer;
- /**
-diff --git a/krfb/invitationsrfbclient.cpp b/krfb/invitationsrfbclient.cpp
-index 3a881cd..c392518 100644
---- a/krfb/invitationsrfbclient.cpp
-+++ b/krfb/invitationsrfbclient.cpp
-@@ -18,13 +18,6 @@
- You should have received a copy of the GNU Lesser General Public License
- along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
--#include "rfb.h"
--#include "invitationsrfbclient.h"
--#include "invitationsrfbserver.h"
--#include "krfbconfig.h"
--#include "sockethelpers.h"
--#include "connectiondialog.h"
--
- #include <KNotification>
- #include <KLocalizedString>
-
-@@ -33,6 +26,13 @@
- #include <poll.h>
- #include <KConfigGroup>
-
-+#include "rfb.h"
-+#include "invitationsrfbclient.h"
-+#include "invitationsrfbserver.h"
-+#include "krfbconfig.h"
-+#include "sockethelpers.h"
-+#include "connectiondialog.h"
-+
- struct PendingInvitationsRfbClient::Private
- {
- Private(rfbClientPtr client) :
-diff --git a/krfb/invitationsrfbserver.cpp b/krfb/invitationsrfbserver.cpp
-index 33dac04..71d8048 100644
---- a/krfb/invitationsrfbserver.cpp
-+++ b/krfb/invitationsrfbserver.cpp
-@@ -18,10 +18,6 @@
- You should have received a copy of the GNU Lesser General Public License
- along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
--#include "invitationsrfbserver.h"
--#include "invitationsrfbclient.h"
--#include "krfbconfig.h"
--#include "rfbservermanager.h"
- #include <QtCore/QTimer>
- #include <QApplication>
- #include <QtNetwork/QHostInfo>
-@@ -34,6 +30,12 @@
- #include <KWallet/KWallet>
-
- #include <dnssd/publicservice.h>
-+
-+#include "invitationsrfbserver.h"
-+#include "invitationsrfbclient.h"
-+#include "krfbconfig.h"
-+#include "rfbservermanager.h"
-+
- using KWallet::Wallet;
-
- //static
-diff --git a/krfb/rfbclient.cpp b/krfb/rfbclient.cpp
-index 8a44913..cd4c250 100644
---- a/krfb/rfbclient.cpp
-+++ b/krfb/rfbclient.cpp
-@@ -17,15 +17,16 @@
- You should have received a copy of the GNU Lesser General Public License
- along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-+#include <QtCore/QSocketNotifier>
-+#include <QDebug>
-+#include <poll.h>
-+#include <strings.h> //for bzero()
-+
- #include "rfbclient.h"
- #include "connectiondialog.h"
- #include "krfbconfig.h"
- #include "sockethelpers.h"
- #include "events.h"
--#include <QtCore/QSocketNotifier>
--#include <QDebug>
--#include <poll.h>
--#include <strings.h> //for bzero()
-
- struct RfbClient::Private
- {
-diff --git a/krfb/rfbserver.cpp b/krfb/rfbserver.cpp
-index d04bf1c..a331e44 100644
---- a/krfb/rfbserver.cpp
-+++ b/krfb/rfbserver.cpp
-@@ -17,13 +17,14 @@
- You should have received a copy of the GNU Lesser General Public License
- along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
--#include "rfbserver.h"
--#include "rfbservermanager.h"
- #include <QtCore/QSocketNotifier>
- #include <QApplication>
- #include <QClipboard>
- #include <QDebug>
-
-+#include "rfbserver.h"
-+#include "rfbservermanager.h"
-+
- struct RfbServer::Private
- {
- QByteArray listeningAddress;
-diff --git a/krfb/rfbservermanager.cpp b/krfb/rfbservermanager.cpp
-index 17c5eb3..c9e15be 100644
---- a/krfb/rfbservermanager.cpp
-+++ b/krfb/rfbservermanager.cpp
-@@ -18,12 +18,6 @@
- You should have received a copy of the GNU Lesser General Public License
- along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
--#include "rfbservermanager.h"
--#include "rfbserver.h"
--#include "framebuffer.h"
--#include "framebuffermanager.h"
--#include "sockethelpers.h"
--#include "krfbconfig.h"
- #include <QtCore/QTimer>
- #include <QApplication>
- #include <QDesktopWidget>
-@@ -34,6 +28,12 @@
- #include <KLocalizedString>
- #include <KUser>
- #include <KNotification>
-+#include "rfbservermanager.h"
-+#include "rfbserver.h"
-+#include "framebuffer.h"
-+#include "framebuffermanager.h"
-+#include "sockethelpers.h"
-+#include "krfbconfig.h"
-
- static const char *cur =
- " "
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 1b42e83..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1,2 +0,0 @@
-#add_libpthread_to_krfb.diff
-#build_against_gcc-6.patch
diff --git a/debian/rules b/debian/rules
index a690ca6..49552b2 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-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
+%:
+ dh $@ --with kf6 --buildsystem kf6
More information about the Neon-commits
mailing list