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

Carlos De Maine null at kde.org
Tue Mar 14 02:16:14 GMT 2023


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

port to kf6

M  +17   -18   debian/control
M  +5    -10   debian/rules

https://invent.kde.org/neon/kde/kscreen/commit/bf4c488f7d73ee110eff4a8a74fe2d314090ad38

diff --git a/debian/control b/debian/control
index 5928c41..b41ff51 100644
--- a/debian/control
+++ b/debian/control
@@ -7,29 +7,28 @@ Uploaders: Felix Geyer <fgeyer at debian.org>,
            Rohan Garg <rohan at kde.org>
 Build-Depends: cmake (>= 3.0~),
                debhelper (>= 11~),
-               extra-cmake-modules (>= 5.50.0~),
-               libkf5config-dev (>= 5.50.0~),
-               libkf5configwidgets-dev (>= 5.50.0~),
-               libkf5dbusaddons-dev (>= 5.50.0~),
-               libkf5declarative-dev (>= 5.50.0~),
-               libkf5globalaccel-dev (>= 5.50.0~),
-               libkf5i18n-dev (>= 5.50.0~),
-               libkf5iconthemes-dev (>= 5.50.0~),
-               libkf5kcmutils-dev,
-               libkf5plasma-dev (>= 5.50.0~),
-               libkf5screen-dev (>= 4:5.10),
-               libkf5widgetsaddons-dev (>= 5.50.0~),
-               libkf5xmlgui-dev (>= 5.50.0~),
+               kf6-extra-cmake-modules,
+               kf6-kcmutils-dev,
+               kf6-kconfig-dev,
+               kf6-kconfigwidgets-dev,
+               kf6-kdbusaddons-dev,
+               kf6-kdeclarative-dev,
+               kf6-kglobalaccel-dev,
+               kf6-ki18n-dev,
+               kf6-kiconthemes-dev,
+               kf6-kscreen-dev,
+               kf6-kwidgetsaddons-dev,
+               kf6-kxmlgui-dev,
+               kf6-plasma-framework-dev,
                liblayershellqtinterface-dev,
-               libqt5sensors5-dev,
-               libqt5x11extras5-dev (>= 5.4),
                libx11-xcb-dev,
                libxcb-util-dev,
                libxi-dev,
                libxrandr-dev,
-               pkg-kde-tools (>= 0.15.16),
-               qtbase5-dev (>= 5.11.0~),
-               qtdeclarative5-dev (>= 5.11.0~)
+               pkg-kde-tools-neon,
+               qt6-base-dev,
+               qt6-declarative-dev,
+               qt6-sensors-dev
 Standards-Version: 4.1.3
 Homepage: https://projects.kde.org/projects/kde/workspace/kscreen
 Vcs-Browser: https://salsa.debian.org/qt-kde-team/kde/kscreen
diff --git a/debian/rules b/debian/rules
index 3ec7b0e..47c772a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,14 +1,9 @@
 #!/usr/bin/make -f
-# -*- makefile -*-
-
-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='kscreen-dbg (<= 4:5.5.5-1~~)'
+	dh $@ --with kf6 --buildsystem kf6
 
-override_dh_auto_test:
-	# Disable dh_auto_test 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