[neon/kde/kwayland-integration/Neon/unstable] debian: port to kf6

Carlos De Maine null at kde.org
Tue Mar 14 01:09:33 GMT 2023


Git commit 8078dfa1657660b7e9ed639f33e0f42cb73a13cc by Carlos De Maine.
Committed on 14/03/2023 at 00:59.
Pushed by carlosdem into branch 'Neon/unstable'.

port to kf6

M  +11   -13   debian/control
M  +5    -9    debian/rules

https://invent.kde.org/neon/kde/kwayland-integration/commit/8078dfa1657660b7e9ed639f33e0f42cb73a13cc

diff --git a/debian/control b/debian/control
index 03a25f4..b73c077 100644
--- a/debian/control
+++ b/debian/control
@@ -5,19 +5,17 @@ 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 (>= 11~),
-               extra-cmake-modules (>= 5.50.0~),
-               libkf5guiaddons-dev,
-               libkf5idletime-dev (>= 5.50.0~),
-               libkf5wayland-dev (>= 4:5.4.0~),
-               libkf5windowsystem-dev (>= 5.50.0~),
-               libqt5waylandclient5-dev,
+               kf6-extra-cmake-modules,
+               kf6-kguiaddons-dev,
+               kf6-kidletime-dev,
+               kf6-kwayland-dev,
+               kf6-kwindowsystem-dev,
                libwayland-dev,
-               pkg-kde-tools,
-               qtbase5-dev (>= 5.11.0~),
-               qtbase5-private-dev,
-               qtwayland5,
-               qtwayland5-dev-tools,
-               qtwayland5-private-dev,
+               pkg-kde-tools-neon,
+               qt6-base-dev,
+               qt6-wayland,
+               qt6-wayland-dev,
+               qt6-wayland-dev-tools,
                wayland-protocols
 Standards-Version: 4.1.3
 Homepage: https://projects.kde.org/projects/kde/workspace/kwayland-integration
@@ -27,7 +25,7 @@ Vcs-Git: https://salsa.debian.org/qt-kde-team/kde/kwayland-integration.git
 Package: kwayland-integration
 Architecture: any
 Multi-Arch: same
-Depends: qtwayland5, ${misc:Depends}, ${shlibs:Depends}
+Depends: qt6-wayland, ${misc:Depends}, ${shlibs:Depends}
 Description: kwayland runtime integration plugins
  Wayland runtime integration plugins for kidletime and kwindowsystem.
  .
diff --git a/debian/rules b/debian/rules
index 65971a5..47c772a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,13 +1,9 @@
 #!/usr/bin/make -f
-
-export DEB_LDFLAGS_MAINT_APPEND := -Wl,--as-needed
+# SPDX-License-Identifier: LGPL-2.0-or-later
+# SPDX-FileCopyrightText: 2023 Jonathan Riddell <jr at jriddell.org>
 
 %:
-	dh $@ --with kf5,pkgkde_symbolshelper --buildsystem kf5 --without build_stamp
-
-override_dh_strip:
-	dh_strip --dbgsym-migration='kwayland-integration-dbg (<= 5.5.5-1~~)'
+	dh $@ --with kf6 --buildsystem kf6
 
-override_dh_auto_test:
-	# Disable auto tests at build time
-	:
+override_dh_shlibdeps:
+	dh_shlibdeps -l$(CURDIR)/debian/$(shell dh_listpackages | head -n1)/usr/kf6/lib/$(DEB_HOST_MULTIARCH)/


More information about the Neon-commits mailing list