[neon/kde/oxygen/Neon/unstable] debian: port to kf6
Carlos De Maine
null at kde.org
Tue Mar 14 01:19:40 GMT 2023
Git commit 121416ddc0a8385e254d396ce6a9209ccbd3de90 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 +9 -9 debian/kde-style-oxygen-qt5.install
M +3 -3 debian/kwin-decoration-oxygen.install
M +2 -2 debian/liboxygenstyle5-5.install
M +4 -4 debian/liboxygenstyleconfig5-5.install
M +1 -1 debian/plasma-theme-oxygen.install
M +5 -9 debian/rules
https://invent.kde.org/neon/kde/oxygen/commit/121416ddc0a8385e254d396ce6a9209ccbd3de90
diff --git a/debian/control b/debian/control
index d472e20..33fedba 100644
--- a/debian/control
+++ b/debian/control
@@ -5,27 +5,26 @@ 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-compat (= 12),
- extra-cmake-modules (>= 1.3.0~),
gettext,
+ kf6-extra-cmake-modules,
+ kf6-frameworkintegration-dev,
+ kf6-kcmutils-dev,
+ kf6-kcompletion-dev,
+ kf6-kconfig-dev,
+ kf6-kconfigwidgets-dev,
+ kf6-kguiaddons-dev,
+ kf6-ki18n-dev,
+ kf6-kservice-dev,
+ kf6-kwayland-dev,
+ kf6-kwidgetsaddons-dev,
+ kf6-kwindowsystem-dev,
libkdecorations2-dev (>= 4:5.17~),
- libkf5completion-dev (>= 5.2.0),
- libkf5config-dev (>= 5.2.0),
- libkf5configwidgets-dev,
- libkf5guiaddons-dev (>= 5.2.0),
- libkf5i18n-dev (>= 5.2.0),
- libkf5kcmutils-dev,
- libkf5service-dev (>= 5.2.0),
- libkf5style-dev (>= 5.2.0),
- libkf5wayland-dev,
- libkf5widgetsaddons-dev (>= 5.2.0),
- libkf5windowsystem-dev (>= 5.2.0),
- libqt5x11extras5-dev (>= 5.4),
libx11-dev,
libxcb1-dev,
pkg-config,
- pkg-kde-tools (>= 0.15.18~),
- qtbase5-dev (>= 5.4),
- qtdeclarative5-dev,
+ pkg-kde-tools-neon,
+ qt6-base-dev,
+ qt6-declarative-dev
Standards-Version: 4.5.0
Homepage: https://projects.kde.org/projects/kde/workspace/oxygen
Vcs-Browser: https://salsa.debian.org/qt-kde-team/kde/oxygen
@@ -71,12 +70,12 @@ Description: style library configuration for the Oxygen desktop theme
Package: plasma-theme-oxygen
Architecture: any
-Depends: kde-style-oxygen-qt5 (= ${binary:Version}),
+Depends: kde-style-oxygen-qt6 (= ${binary:Version}),
kwin-decoration-oxygen (= ${binary:Version}),
oxygen-sounds,
qml-module-qtquick2,
${misc:Depends},
- ${shlibs:Depends},
+ ${shlibs:Depends}
Description: Look-and-feel for the Oxygen desktop theme
The Oxygen desktop theme is used by Plasma and other KDE Software.
.
diff --git a/debian/kde-style-oxygen-qt5.install b/debian/kde-style-oxygen-qt5.install
index e66e133..51fc2e7 100644
--- a/debian/kde-style-oxygen-qt5.install
+++ b/debian/kde-style-oxygen-qt5.install
@@ -1,9 +1,9 @@
-usr/bin/oxygen-settings5
-usr/lib/*/qt5/plugins/kstyle_oxygen_config.so
-usr/lib/*/qt5/plugins/styles/oxygen.so
-usr/share/color-schemes/Oxygen.colors
-usr/share/color-schemes/OxygenCold.colors
-usr/share/icons/hicolor/256x256/apps/oxygen-settings.png
-usr/share/kstyle/themes/oxygen.themerc
-usr/share/locale/*/*/oxygen_style_config.mo
-usr/share/locale/*/*/oxygen_style_demo.mo
+usr/kf6/bin/oxygen-settings5
+usr/kf6/lib/*/qt6/plugins/kstyle_oxygen_config.so
+usr/kf6/lib/*/qt6/plugins/styles/oxygen.so
+usr/kf6/share/color-schemes/Oxygen.colors
+usr/kf6/share/color-schemes/OxygenCold.colors
+usr/kf6/share/icons/hicolor/256x256/apps/oxygen-settings.png
+usr/kf6/share/kstyle/themes/oxygen.themerc
+usr/kf6/share/locale/*/*/oxygen_style_config.mo
+usr/kf6/share/locale/*/*/oxygen_style_demo.mo
diff --git a/debian/kwin-decoration-oxygen.install b/debian/kwin-decoration-oxygen.install
index 6749b5e..2aa2f74 100644
--- a/debian/kwin-decoration-oxygen.install
+++ b/debian/kwin-decoration-oxygen.install
@@ -1,3 +1,3 @@
-usr/lib/*/qt5/plugins/org.kde.kdecoration2/org.kde.oxygen.so
-usr/share/kservices5/oxygendecorationconfig.desktop
-usr/share/locale/*/*/oxygen_kdecoration.mo
+usr/kf6/lib/*/qt6/plugins/org.kde.kdecoration2/org.kde.oxygen.so
+usr/kf6/share/kservices5/oxygendecorationconfig.desktop
+usr/kf6/share/locale/*/*/oxygen_kdecoration.mo
diff --git a/debian/liboxygenstyle5-5.install b/debian/liboxygenstyle5-5.install
index 7d92fc1..3e1c941 100644
--- a/debian/liboxygenstyle5-5.install
+++ b/debian/liboxygenstyle5-5.install
@@ -1,2 +1,2 @@
-usr/lib/*/liboxygenstyle5.so.5
-usr/lib/*/liboxygenstyle5.so.5.*
+usr/kf6/lib/*/liboxygenstyle5.so.5
+usr/kf6/lib/*/liboxygenstyle5.so.5.*
diff --git a/debian/liboxygenstyleconfig5-5.install b/debian/liboxygenstyleconfig5-5.install
index 58fdb0d..3bf4ce2 100644
--- a/debian/liboxygenstyleconfig5-5.install
+++ b/debian/liboxygenstyleconfig5-5.install
@@ -1,4 +1,4 @@
-usr/lib/*/liboxygenstyleconfig5.so.5
-usr/lib/*/liboxygenstyleconfig5.so.5.*
-usr/share/kservices5/oxygenstyleconfig.desktop
-usr/share/locale/*/*/liboxygenstyleconfig.mo
+usr/kf6/lib/*/liboxygenstyleconfig5.so.5
+usr/kf6/lib/*/liboxygenstyleconfig5.so.5.*
+usr/kf6/share/kservices5/oxygenstyleconfig.desktop
+usr/kf6/share/locale/*/*/liboxygenstyleconfig.mo
diff --git a/debian/plasma-theme-oxygen.install b/debian/plasma-theme-oxygen.install
index 0cb81c8..6fcfe9a 100644
--- a/debian/plasma-theme-oxygen.install
+++ b/debian/plasma-theme-oxygen.install
@@ -1 +1 @@
-usr/share/plasma/look-and-feel/org.kde.oxygen/
+usr/kf6/share/plasma/look-and-feel/org.kde.oxygen/
diff --git a/debian/rules b/debian/rules
index ec079ab..47c772a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,13 +1,9 @@
#!/usr/bin/make -f
-# -*- makefile -*-
-
-export DEB_LDFLAGS_MAINT_APPEND := -Wl,--as-needed
-
-libpkgs_gen_strict_local_shlibs = $(libpkgs_all_packages)
-include /usr/share/pkg-kde-tools/qt-kde-team/2/library-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
+ dh $@ --with kf6 --buildsystem kf6
-override_dh_gencontrol-arch: libpkgs_gen_strict_local_shlibs
- dh_gencontrol -a
+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