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

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


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

port to kf6

M  +23   -24   debian/control
M  +5    -15   debian/rules
M  +5    -5    debian/systemsettings.install

https://invent.kde.org/neon/kde/systemsettings/commit/daf26e82e425eb2a1569e489100da6962f81b1de

diff --git a/debian/control b/debian/control
index 624c8fe..ec34a72 100644
--- a/debian/control
+++ b/debian/control
@@ -5,32 +5,31 @@ Maintainer: Debian/Kubuntu Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
 Uploaders: Maximiliano Curia <maxy at debian.org>
 Build-Depends: cmake (>= 3.0~),
                debhelper (>= 11~),
-               extra-cmake-modules (>= 5.50.0~),
-               kirigami2-dev (>= 2.1~),
+               kf6-extra-cmake-modules,
+               kf6-kactivities-dev,
+               kf6-kactivities-stats-dev,
+               kf6-kcmutils-dev,
+               kf6-kconfig-dev,
+               kf6-kcrash-dev,
+               kf6-kdbusaddons-dev,
+               kf6-kdeclarative-dev,
+               kf6-kdoctools-dev,
+               kf6-ki18n-dev,
+               kf6-kiconthemes-dev,
+               kf6-kio-dev,
+               kf6-kirigami2-dev,
+               kf6-kitemviews-dev,
+               kf6-kpackage-dev,
+               kf6-krunner-dev,
+               kf6-kservice-dev,
+               kf6-kwidgetsaddons-dev,
+               kf6-kwindowsystem-dev,
+               kf6-kxmlgui-dev,
                kuserfeedback-dev,
-               libkf5activities-dev (>= 5.50.0~),
-               libkf5activitiesstats-dev (>= 5.50.0~),
-               libkf5config-dev (>= 5.50.0~),
-               libkf5crash-dev (>= 5.50.0~),
-               libkf5dbusaddons-dev (>= 5.50.0~),
-               libkf5declarative-dev (>= 5.50.0~),
-               libkf5doctools-dev (>= 5.50.0~),
-               libkf5i18n-dev (>= 5.50.0~),
-               libkf5iconthemes-dev (>= 5.50.0~),
-               libkf5itemviews-dev (>= 5.50.0~),
-               libkf5kcmutils-dev (>= 5.50.0~),
-               libkf5khtml-dev (>= 5.50.0~),
-               libkf5kio-dev (>= 5.50.0~),
-               libkf5package-dev (>= 5.50.0~),
-               libkf5runner-dev (>= 5.50.0~),
-               libkf5service-dev (>= 5.50.0~),
-               libkf5widgetsaddons-dev (>= 5.50.0~),
-               libkf5windowsystem-dev (>= 5.50.0~),
-               libkf5xmlgui-dev (>= 5.50.0~),
-               pkg-kde-tools (>= 0.15.18~),
+               pkg-kde-tools-neon,
                plasma-workspace-dev (>= 4:5.14.5~),
-               qtbase5-dev (>= 5.11.0~),
-               qtdeclarative5-dev (>= 5.11.0~)
+               qt6-base-dev,
+               qt6-declarative-dev
 Standards-Version: 4.1.4
 Homepage: https://projects.kde.org/projects/kde/workspace/systemsettings
 Vcs-Browser: https://salsa.debian.org/qt-kde-team/kde/systemsettings
diff --git a/debian/rules b/debian/rules
index 2a7498e..47c772a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,19 +1,9 @@
 #!/usr/bin/make -f
-# -*- makefile -*-
-
-export DEB_LDFLAGS_MAINT_APPEND := -Wl,--as-needed
-
-l10npkgs_firstversion_ok := 4:4.14.0-2
-include /usr/share/pkg-kde-tools/qt-kde-team/2/l10n-packages.mk
+# 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_auto_install:
-	dh_auto_install --destdir=debian/tmp
-
-override_dh_strip:
-	dh_strip --dbgsym-migration='systemsettings-dbg (<= 4:5.5.5-1~~)'
+	dh $@ --with kf6 --buildsystem kf6
 
-override_dh_gencontrol: l10npkgs_firstversion_ok
-	dh_gencontrol
+override_dh_shlibdeps:
+	dh_shlibdeps -l$(CURDIR)/debian/$(shell dh_listpackages | head -n1)/usr/kf6/lib/$(DEB_HOST_MULTIARCH)/
diff --git a/debian/systemsettings.install b/debian/systemsettings.install
index 2fa47be..6dc5bfd 100644
--- a/debian/systemsettings.install
+++ b/debian/systemsettings.install
@@ -1,5 +1,5 @@
-usr/bin
-usr/lib/*/libsystemsettingsview.so.*
-usr/lib/*/qt5
-usr/share/
-usr/share/qlogging-categories5/
+usr/kf6/bin
+usr/kf6/lib/*/libsystemsettingsview.so.*
+usr/kf6/lib/*/qt5
+usr/kf6/share/
+usr/kf6/share/qlogging-categories5/


More information about the Neon-commits mailing list