[neon/kde/kde-gtk-config/Neon/unstable] debian: port to kf6

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


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

port to kf6

M  +11   -11   debian/control
M  +1    -1    debian/kde-config-gtk-style-preview.install
M  +9    -9    debian/kde-config-gtk-style.install
M  +5    -13   debian/rules

https://invent.kde.org/neon/kde/kde-gtk-config/commit/fb17aec16cdfc31343f3567a438db18121865e50

diff --git a/debian/control b/debian/control
index 9af1b6d..ff89737 100644
--- a/debian/control
+++ b/debian/control
@@ -5,22 +5,22 @@ Maintainer: Debian/Kubuntu Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
 Uploaders: Boris Pek <tehnick at debian.org>, Maximiliano Curia <maxy at debian.org>
 Build-Depends: cmake (>= 2.8.12~),
                debhelper (>= 11~),
-               extra-cmake-modules (>= 0.0.9),
                gsettings-desktop-schemas-dev,
+               kf6-extra-cmake-modules,
+               kf6-karchive-dev,
+               kf6-kcmutils-dev,
+               kf6-kconfigwidgets-dev,
+               kf6-ki18n-dev,
+               kf6-kiconthemes-dev,
+               kf6-kio-dev,
+               kf6-knewstuff-dev,
                libgtk-3-dev,
                libgtk2.0-dev,
                libkdecorations2-dev,
-               libkf5archive-dev,
-               libkf5configwidgets-dev,
-               libkf5i18n-dev,
-               libkf5iconthemes-dev,
-               libkf5kcmutils-dev,
-               libkf5kio-dev,
-               libkf5newstuff-dev,
-               libqt5svg5-dev,
                libx11-dev,
-               pkg-kde-tools (>= 0.15.16),
-               qtbase5-dev,
+               pkg-kde-tools-neon,
+               qt6-base-dev,
+               qt6-svg-dev,
                sassc
 Homepage: https://projects.kde.org/projects/kde/workspace/kde-gtk-config
 Vcs-Git: https://salsa.debian.org/qt-kde-team/kde/kde-gtk-config.git
diff --git a/debian/kde-config-gtk-style-preview.install b/debian/kde-config-gtk-style-preview.install
index 95f12bd..5ad9b1a 100644
--- a/debian/kde-config-gtk-style-preview.install
+++ b/debian/kde-config-gtk-style-preview.install
@@ -1 +1 @@
-usr/lib/*/libexec/gtk3_preview
+usr/kf6/lib/*/libexec/gtk3_preview
diff --git a/debian/kde-config-gtk-style.install b/debian/kde-config-gtk-style.install
index a76f4ba..70dce9b 100644
--- a/debian/kde-config-gtk-style.install
+++ b/debian/kde-config-gtk-style.install
@@ -1,9 +1,9 @@
-usr/lib/*/gtk-3.0/modules/libcolorreload-gtk-module.so
-usr/lib/*/gtk-3.0/modules/libwindow-decorations-gtk-module.so
-usr/lib/*/kconf_update_bin/gtk_theme
-usr/lib/*/kconf_update_bin/remove_deprecated_gtk4_option
-usr/lib/*/qt5/plugins/kf5/kded/gtkconfig.so
-usr/share/kcm-gtk-module/preview.ui
-usr/share/kconf_update/gtkconfig.upd
-usr/share/kconf_update/remove_window_decorations_from_gtk_css.sh
-usr/share/themes/Breeze/window_decorations.css
+usr/kf6/lib/*/gtk-3.0/modules/libcolorreload-gtk-module.so
+usr/kf6/lib/*/gtk-3.0/modules/libwindow-decorations-gtk-module.so
+usr/kf6/lib/*/kconf_update_bin/gtk_theme
+usr/kf6/lib/*/kconf_update_bin/remove_deprecated_gtk4_option
+usr/kf6/lib/*/qt6/plugins/kf6/kded/gtkconfig.so
+usr/kf6/share/kcm-gtk-module/preview.ui
+usr/kf6/share/kconf_update/gtkconfig.upd
+usr/kf6/share/kconf_update/remove_window_decorations_from_gtk_css.sh
+usr/kf6/share/themes/Breeze/window_decorations.css
diff --git a/debian/rules b/debian/rules
index 9a9238a..47c772a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,17 +1,9 @@
 #!/usr/bin/make -f
-
-export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed
-export DEB_BUILD_MAINT_OPTIONS = hardening=+all
-
+# 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 -- -DDATA_INSTALL_DIR="/usr/share/"
+	dh $@ --with kf6 --buildsystem kf6
 
-override_dh_auto_test:
-	# Disable dh_auto_test at build time
-	:
+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