[neon/kde/breeze/Neon/unstable] debian: port to kf6
Harald Sitter
null at kde.org
Thu Mar 9 16:18:38 GMT 2023
Git commit ba08924456a4cf492af5650ef5ed42a0f864b737 by Harald Sitter.
Committed on 09/03/2023 at 16:18.
Pushed by sitter into branch 'Neon/unstable'.
port to kf6
M +2 -2 debian/breeze-cursor-theme.install
M +2 -2 debian/breeze-dev.install
M +7 -7 debian/breeze.install
M +18 -19 debian/control
M +9 -9 debian/kde-style-breeze.install
M +5 -5 debian/kwin-style-breeze.install
M +5 -14 debian/rules
https://invent.kde.org/neon/kde/breeze/commit/ba08924456a4cf492af5650ef5ed42a0f864b737
diff --git a/debian/breeze-cursor-theme.install b/debian/breeze-cursor-theme.install
index 07f5629..364e269 100644
--- a/debian/breeze-cursor-theme.install
+++ b/debian/breeze-cursor-theme.install
@@ -3,5 +3,5 @@
# fix that instead if this breaks.
etc/X11/cursors/Breeze_Snow.theme
etc/X11/cursors/breeze_cursors.theme
-usr/share/icons/Breeze_Snow/
-usr/share/icons/breeze_cursors/
+usr/kf6/share/icons/Breeze_Snow/
+usr/kf6/share/icons/breeze_cursors/
diff --git a/debian/breeze-dev.install b/debian/breeze-dev.install
index ecc51c6..48d3894 100644
--- a/debian/breeze-dev.install
+++ b/debian/breeze-dev.install
@@ -1,2 +1,2 @@
-usr/lib/*/cmake/Breeze/BreezeConfig.cmake
-usr/lib/*/cmake/Breeze/BreezeConfigVersion.cmake
+usr/kf6/lib/*/cmake/Breeze/BreezeConfig.cmake
+usr/kf6/lib/*/cmake/Breeze/BreezeConfigVersion.cmake
diff --git a/debian/breeze.install b/debian/breeze.install
index 57f5236..f215105 100644
--- a/debian/breeze.install
+++ b/debian/breeze.install
@@ -1,7 +1,7 @@
-printing/default-testpage.pdf /usr/share/cups/data/
-usr/bin/breeze-settings5
-usr/lib/*/kconf_update_bin
-usr/share/icons/hicolor/*/apps/breeze-settings.*
-usr/share/icons/hicolor/scalable/apps/breeze-settings.svgz
-usr/share/kconf_update
-usr/share/wallpapers/Next
+printing/default-testpage.pdf /usr/kf6/share/cups/data/
+usr/kf6/bin/breeze-settings5
+usr/kf6/lib/*/kconf_update_bin
+usr/kf6/share/icons/hicolor/*/apps/breeze-settings.*
+usr/kf6/share/icons/hicolor/scalable/apps/breeze-settings.svgz
+usr/kf6/share/kconf_update
+usr/kf6/share/wallpapers/Next
diff --git a/debian/control b/debian/control
index 4b7866d..0f4f1ba 100644
--- a/debian/control
+++ b/debian/control
@@ -5,29 +5,28 @@ 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 (>= 11~),
- extra-cmake-modules (>= 5.30.0~),
- kirigami2-dev,
+ kf6-extra-cmake-modules,
+ kf6-kcmutils-dev,
+ kf6-kconfig-dev,
+ kf6-kconfigwidgets-dev,
+ kf6-kcoreaddons-dev,
+ kf6-kguiaddons-dev,
+ kf6-ki18n-dev,
+ kf6-kiconthemes-dev,
+ kf6-kirigami-dev,
+ kf6-kpackage-dev,
+ kf6-kservice-dev,
+ kf6-kstyle-dev,
+ kf6-kwayland-dev,
+ kf6-kwindowsystem-dev,
+ kf6-plasma-framework-dev,
libfftw3-dev,
libkdecorations2-dev,
- libkf5config-dev (>= 5.2.0),
- libkf5configwidgets-dev (>= 5.2.0),
- libkf5coreaddons-dev (>= 5.2.0),
- libkf5guiaddons-dev,
- libkf5i18n-dev (>= 5.2.0),
- libkf5iconthemes-dev (>= 5.2.2),
- libkf5kcmutils-dev (>= 5.2.0),
- libkf5package-dev,
- libkf5plasma-dev,
- libkf5service-dev (>= 5.2.0),
- libkf5style-dev (>= 5.2.0),
- libkf5wayland-dev,
- libkf5windowsystem-dev (>= 5.2.0),
- libqt5x11extras5-dev (>= 5.4),
libx11-dev,
pkg-config,
- pkg-kde-tools (>= 0.15.15ubuntu1~),
- qtbase5-dev (>= 5.4),
- qtdeclarative5-dev
+ pkg-kde-tools-neon,
+ qt6-base-dev,
+ qt6-declarative-dev
Standards-Version: 4.1.4
Homepage: https://projects.kde.org/projects/kde/workspace/breeze
Vcs-Browser: https://salsa.debian.org/qt-kde-team/kde/breeze
diff --git a/debian/kde-style-breeze.install b/debian/kde-style-breeze.install
index 59f756d..4fdb0bf 100644
--- a/debian/kde-style-breeze.install
+++ b/debian/kde-style-breeze.install
@@ -1,9 +1,9 @@
-usr/lib/*/libbreezecommon5.so.5
-usr/lib/*/libbreezecommon5.so.5.*
-usr/lib/*/qt5/plugins/plasma/kcms/systemsettings_qwidgets/breezestyleconfig.so
-usr/lib/*/qt5/plugins/styles/breeze.so
-usr/share/QtCurve
-usr/share/applications/breezestyleconfig.desktop
-usr/share/color-schemes
-usr/share/kstyle
-usr/share/locale/*/*/breeze_style_config.mo
+usr/kf6/lib/*/libbreezecommon5.so.5
+usr/kf6/lib/*/libbreezecommon5.so.5.*
+usr/kf6/lib/*/qt6/plugins/plasma/kcms/systemsettings_qwidgets/breezestyleconfig.so
+usr/kf6/lib/*/qt6/plugins/styles/breeze.so
+usr/kf6/share/QtCurve
+usr/kf6/share/applications/breezestyleconfig.desktop
+usr/kf6/share/color-schemes
+usr/kf6/share/kstyle
+usr/kf6/share/locale/*/*/breeze_style_config.mo
diff --git a/debian/kwin-style-breeze.install b/debian/kwin-style-breeze.install
index df7e195..6c88ba3 100644
--- a/debian/kwin-style-breeze.install
+++ b/debian/kwin-style-breeze.install
@@ -1,5 +1,5 @@
-usr/lib/*/qt5/plugins/org.kde.kdecoration2/org.kde.breeze.so
-usr/lib/*/qt5/plugins/plasma/kcms/breeze/kcm_breezedecoration.so
-usr/share/applications/kcm_breezedecoration.desktop
-usr/share/locale/*/*/breeze_kwin_deco.mo
-usr/share/locale/*/LC_MESSAGES/breeze_kwin_deco.mo
+usr/kf6/lib/*/qt6/plugins/org.kde.kdecoration2/org.kde.breeze.so
+usr/kf6/lib/*/qt6/plugins/plasma/kcms/breeze/kcm_breezedecoration.so
+usr/kf6/share/applications/kcm_breezedecoration.desktop
+usr/kf6/share/locale/*/*/breeze_kwin_deco.mo
+usr/kf6/share/locale/*/LC_MESSAGES/breeze_kwin_deco.mo
diff --git a/debian/rules b/debian/rules
index 52e2d18..47c772a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,18 +1,9 @@
#!/usr/bin/make -f
-
-export DEB_LDFLAGS_MAINT_APPEND := -Wl,--as-needed
-
-DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
+# 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_install:
- # This is required to make sure Plasma does not
- # fall back to a cursor theme from the 90's
- CURDIR=$(CURDIR) $(CURDIR)/debian/wrapperthemes.sh breeze_cursors \
- Breeze_Snow
- dh_install
+ dh $@ --with kf6 --buildsystem kf6
-override_dh_strip:
- dh_strip --dbgsym-migration='breeze-dbg (<= 4:5.5.5-1~~)'
+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