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

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


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

port to kf6

M  +19   -20   debian/control
M  +5    -23   debian/rules

https://invent.kde.org/neon/kde/drkonqi/commit/94c492d4325f6159d9c515ec3ae812f8009ae6c8

diff --git a/debian/control b/debian/control
index 2f8d89c..011463b 100644
--- a/debian/control
+++ b/debian/control
@@ -8,29 +8,28 @@ Uploaders: Scarlett Moore <sgmoore at kde.org>,
 Build-Depends: cmake (>= 3.0~),
                dbus-x11,
                debhelper-compat (= 13),
-               extra-cmake-modules (>= 5.78~),
                gettext,
+               kf6-extra-cmake-modules,
+               kf6-kcompletion-dev,
+               kf6-kconfigwidgets-dev,
+               kf6-kcoreaddons-dev,
+               kf6-kcrash-dev,
+               kf6-kdeclarative-dev,
+               kf6-ki18n-dev,
+               kf6-kidletime-dev,
+               kf6-kio-dev,
+               kf6-kjobwidgets-dev,
+               kf6-knotifications-dev,
+               kf6-kservice-dev,
+               kf6-kwallet-dev,
+               kf6-kwidgetsaddons-dev,
+               kf6-kwindowsystem-dev,
+               kf6-syntax-highlighting-dev,
                kuserfeedback-dev,
-               libkf5completion-dev (>= 5.78~),
-               libkf5configwidgets-dev (>= 5.78~),
-               libkf5coreaddons-dev (>= 5.78~),
-               libkf5crash-dev (>= 5.78~),
-               libkf5declarative-dev,
-               libkf5i18n-dev (>= 5.78~),
-               libkf5idletime-dev (>= 5.78~),
-               libkf5jobwidgets-dev (>= 5.78~),
-               libkf5kio-dev (>= 5.78~),
-               libkf5notifications-dev (>= 5.78~),
-               libkf5service-dev (>= 5.78~),
-               libkf5syntaxhighlighting-dev (>= 5.78~),
-               libkf5wallet-dev (>= 5.78~),
-               libkf5widgetsaddons-dev (>= 5.78~),
-               libkf5windowsystem-dev (>= 5.78~),
-               libqt5x11extras5-dev (>= 5.15.0~),
                libsystemd-dev,
-               pkg-kde-tools (>= 0.15.18~),
-               qtbase5-dev (>= 5.15.0~),
-               qtdeclarative5-dev,
+               pkg-kde-tools-neon,
+               qt6-base-dev,
+               qt6-declarative-dev,
                zlib1g-dev
 Standards-Version: 4.5.0
 Homepage: https://invent.kde.org/plasma/drkonqi
diff --git a/debian/rules b/debian/rules
index 8cf3476..47c772a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,27 +1,9 @@
 #!/usr/bin/make -f
-# -*- makefile -*-
-
-export DEB_BUILD_MAINT_OPTIONS=hardening=+all
-
-SYSTEMD_DIR=/usr/lib/systemd
-SYSTEMD_COREDUMP_WANTS=debian/drkonqi/$(SYSTEMD_DIR)/system/systemd-coredump at .service.wants/
-
-CMAKE_ARGS = ""
-# Neon build type: unstable
-ifeq ($(TYPE),unstable)
-  CMAKE_ARGS += -DWITH_SENTRY=ON
-endif
+# 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_configure:
-	dh_auto_configure -Skf5 -- -DBUILD_TESTING=OFF ${CMAKE_ARGS}
-
-override_dh_auto_test:
+	dh $@ --with kf6 --buildsystem kf6
 
-override_dh_auto_install:
-	dh_auto_install
-	# systemctl fails to enable units that are wanted by templates (without instance) https://github.com/systemd/systemd/issues/19437
-	mkdir -p $(SYSTEMD_COREDUMP_WANTS)
-	ln -s $(SYSTEMD_DIR)/system/drkonqi-coredump-processor at .service $(SYSTEMD_COREDUMP_WANTS)
+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