[neon/kde/plasma-desktop/Neon/unstable] debian: port to kf6
Carlos De Maine
null at kde.org
Tue Mar 14 03:05:21 GMT 2023
Git commit 9acd09eb5c3f6abac01f9c06cc12e40126a5bf09 by Carlos De Maine.
Committed on 14/03/2023 at 00:59.
Pushed by carlosdem into branch 'Neon/unstable'.
port to kf6
M +44 -49 debian/control
M +12 -12 debian/plasma-desktop-data.install
M +1 -1 debian/plasma-desktop-dev.install
M +5 -5 debian/plasma-desktop.install
M +5 -25 debian/rules
https://invent.kde.org/neon/kde/plasma-desktop/commit/9acd09eb5c3f6abac01f9c06cc12e40126a5bf09
diff --git a/debian/control b/debian/control
index 2dbe354..517981f 100644
--- a/debian/control
+++ b/debian/control
@@ -3,14 +3,39 @@ Section: kde
Priority: optional
Maintainer: Debian/Kubuntu Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
Uploaders: Maximiliano Curia <maxy at debian.org>
-Build-Depends: baloo-kf5-dev (>= 5.15~),
- breeze-dev (>= 4:5.14.3~),
+Build-Depends: breeze-dev (>= 4:5.14.3~),
cmake (>= 3.0~),
debhelper (>= 11~),
- extra-cmake-modules (>= 5.50.0~),
- kded5-dev (>= 5.50.0~),
- kinit-dev,
- kirigami2-dev,
+ kf6-attica-dev,
+ kf6-baloo-dev,
+ kf6-extra-cmake-modules,
+ kf6-kactivities-dev,
+ kf6-kactivities-stats-dev,
+ kf6-kauth-dev,
+ kf6-kcmutils-dev,
+ kf6-kconfig-dev,
+ kf6-kcoreaddons-dev,
+ kf6-kdbusaddons-dev,
+ kf6-kdeclarative-dev,
+ kf6-kded-dev,
+ kf6-kdoctools-dev,
+ kf6-kglobalaccel-dev,
+ kf6-kguiaddons-dev,
+ kf6-ki18n-dev,
+ kf6-kio-dev,
+ kf6-kirigami2-dev,
+ kf6-kitemmodels-dev,
+ kf6-knewstuff-dev,
+ kf6-knotifications-dev,
+ kf6-knotifyconfig-dev,
+ kf6-kpeople-dev,
+ kf6-krunner-dev,
+ kf6-kwallet-dev,
+ kf6-kwidgetsaddons-dev,
+ kf6-kwindowsystem-dev,
+ kf6-kxmlgui-dev,
+ kf6-plasma-framework-dev,
+ kf6-qqc2-desktop-style-dev,
kscreenlocker-dev,
kuserfeedback-dev,
kwin-dev (>= 4:5.4.0~),
@@ -22,42 +47,11 @@ Build-Depends: baloo-kf5-dev (>= 5.15~),
libglib2.0-dev,
libibus-1.0-dev,
libkaccounts-dev (>= 4:20.04.0~),
- libkf5activities-dev (>= 5.50.0~),
- libkf5activitiesstats-dev (>= 5.50.0~),
- libkf5attica-dev (>= 5.50.0~),
- libkf5auth-dev (>= 5.50.0~),
- libkf5config-dev (>= 5.50.0~),
- libkf5coreaddons-dev,
- libkf5dbusaddons-dev (>= 5.50.0~),
- libkf5declarative-dev (>= 5.50.0~),
- libkf5doctools-dev (>= 5.50.0~),
- libkf5emoticons-dev,
- libkf5globalaccel-dev (>= 5.50.0~),
- libkf5guiaddons-dev,
- libkf5i18n-dev (>= 5.50.0~),
- libkf5itemmodels-dev (>= 5.41.0~),
- libkf5kcmutils-dev (>= 5.50.0~),
- libkf5kdelibs4support-dev (>= 5.50.0~),
- libkf5kio-dev,
- libkf5newstuff-dev (>= 5.50.0~),
- libkf5notifications-dev (>= 5.50.0~),
- libkf5notifyconfig-dev (>= 5.50.0~),
- libkf5people-dev (>= 5.50.0~),
- libkf5plasma-dev (>= 5.50.0~),
- libkf5qqc2desktopstyle-dev,
- libkf5runner-dev (>= 5.50.0~),
- libkf5sysguard-dev,
- libkf5wallet-dev (>= 5.50.0~),
- libkf5widgetsaddons-dev,
- libkf5windowsystem-dev,
- libkf5xmlgui-dev,
- libpackagekitqt5-dev,
- libphonon4qt5-dev (>= 4.6.60),
- libphonon4qt5experimental-dev,
+ libkf6sysguard-dev,
+ libpackagekitqt6-dev,
+ libphonon4qt6-dev,
+ libphonon4qt6experimental-dev,
libpulse-dev (>= 0.9.16),
- libqt5svg5-dev (>= 5.11.0~),
- libqt5waylandclient5-dev,
- libqt5x11extras5-dev (>= 5.11.0~),
libscim-dev,
libudev-dev,
libx11-dev,
@@ -76,12 +70,13 @@ Build-Depends: baloo-kf5-dev (>= 5.15~),
libxkbfile-dev,
openbox,
pkg-config,
- pkg-kde-tools (>= 0.15.18~),
+ pkg-kde-tools-neon,
plasma-workspace-dev (>= 4:5.12~),
- qtbase5-dev (>= 5.11.0~),
- qtbase5-private-dev,
- qtdeclarative5-dev (>= 5.11.0~),
- qtwayland5-dev-tools,
+ qt6-base-dev,
+ qt6-declarative-dev,
+ qt6-svg-dev,
+ qt6-wayland-dev,
+ qt6-wayland-dev-tools,
xauth,
xserver-xorg-dev,
xserver-xorg-input-evdev-dev,
@@ -103,12 +98,12 @@ Description: transitional dummy package
Package: plasma-desktop
Architecture: any
-Depends: baloo-kf5,
- breeze (>= 4:5.14),
+Depends: breeze (>= 4:5.14),
ibus-data,
kactivitymanagerd (>= 5.14),
kde-cli-tools (>= 4:5.14),
- kded5,
+ kf6-baloo,
+ kf6-kded,
kio,
oxygen-sounds (>= 4:5.14),
plasma-desktop-data (= ${source:Version}),
diff --git a/debian/plasma-desktop-data.install b/debian/plasma-desktop-data.install
index 447a74b..e9aabc2 100644
--- a/debian/plasma-desktop-data.install
+++ b/debian/plasma-desktop-data.install
@@ -1,13 +1,13 @@
etc/xdg/autostart/kaccess.desktop
-usr/share/accounts/
-usr/share/config.kcfg/
-usr/share/dbus-1/system-services
-usr/share/doc
-usr/share/icons
-usr/share/k*
-usr/share/locale
-usr/share/metainfo/
-usr/share/plasma
-usr/share/polkit-1/actions/
-usr/share/qlogging-categories5/
-usr/share/solid
+usr/kf6/share/accounts/
+usr/kf6/share/config.kcfg/
+usr/kf6/share/dbus-1/system-services
+usr/kf6/share/doc
+usr/kf6/share/icons
+usr/kf6/share/k*
+usr/kf6/share/locale
+usr/kf6/share/metainfo/
+usr/kf6/share/plasma
+usr/kf6/share/polkit-1/actions/
+usr/kf6/share/qlogging-categories5/
+usr/kf6/share/solid
diff --git a/debian/plasma-desktop-dev.install b/debian/plasma-desktop-dev.install
index 1a3fce1..883b132 100644
--- a/debian/plasma-desktop-dev.install
+++ b/debian/plasma-desktop-dev.install
@@ -1 +1 @@
-usr/share/dbus-1/interfaces/org.kde.touchpad.xml
+usr/kf6/share/dbus-1/interfaces/org.kde.touchpad.xml
diff --git a/debian/plasma-desktop.install b/debian/plasma-desktop.install
index dbc9db6..85bba36 100644
--- a/debian/plasma-desktop.install
+++ b/debian/plasma-desktop.install
@@ -1,5 +1,5 @@
-usr/bin/
-usr/lib/*/libexec
-usr/lib/*/qt5
-usr/share/applications/
-usr/share/dbus-1/system.d/org.kde.kcontrol.kcmclock.conf
+usr/kf6/bin/
+usr/kf6/lib/*/libexec
+usr/kf6/lib/*/qt5
+usr/kf6/share/applications/
+usr/kf6/share/dbus-1/system.d/org.kde.kcontrol.kcmclock.conf
diff --git a/debian/rules b/debian/rules
index b5af8ef..47c772a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,29 +1,9 @@
#!/usr/bin/make -f
-# -*- makefile -*-
-
-export DEB_LDFLAGS_MAINT_APPEND := -Wl,--as-needed
-
-l10npkgs_firstversion_ok := 4:17.08.3-3~
-include /usr/share/pkg-kde-tools/qt-kde-team/2/l10n-packages.mk
-
-DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
-ifneq (,$(filter $(DEB_HOST_ARCH), armel armhf mips mipsel))
- export DEB_CFLAGS_MAINT_STRIP = -g
- export DEB_CXXFLAGS_MAINT_STRIP = -g
- export DEB_CFLAGS_MAINT_APPEND = -gstabs
- export DEB_CXXFLAGS_MAINT_APPEND = -gstabs
-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_strip:
- dh_strip --dbgsym-migration='plasma-desktop-dbg (<= 4:5.5.5-1~~)'
-
-override_dh_auto_test:
- # Disable dh_auto_test, fourth test never ends
- # xvfb-run -a dh_auto_test
- :
+ 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)/
More information about the Neon-commits
mailing list