[neon/kde/kde-cli-tools/Neon/unstable] debian: port to kf6
Carlos De Maine
null at kde.org
Tue Mar 14 02:18:44 GMT 2023
Git commit 8281b743f1b35b6214ed591eab45653f8abce7ef by Carlos De Maine.
Committed on 14/03/2023 at 00:59.
Pushed by carlosdem into branch 'Neon/unstable'.
port to kf6
M +16 -19 debian/control
M +3 -3 debian/kde-cli-tools-data.install
M +27 -27 debian/kde-cli-tools.install
M +5 -16 debian/rules
https://invent.kde.org/neon/kde/kde-cli-tools/commit/8281b743f1b35b6214ed591eab45653f8abce7ef
diff --git a/debian/control b/debian/control
index ec6c3fb..3c4835a 100644
--- a/debian/control
+++ b/debian/control
@@ -5,26 +5,23 @@ Maintainer: Debian/Kubuntu Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
Uploaders: Maximiliano Curia <maxy at debian.org>
Build-Depends: cmake (>= 3.0~),
debhelper (>= 11~),
- extra-cmake-modules (>= 5.42.0~),
- kinit-dev (>= 5.42.0~),
- libkf5activities-dev (>= 5.42.0~),
- libkf5config-dev (>= 5.42.0~),
- libkf5declarative-dev (>= 5.42.0~),
- libkf5doctools-dev (>= 5.42.0~),
- libkf5i18n-dev (>= 5.42.0~),
- libkf5iconthemes-dev (>= 5.42.0~),
- libkf5kcmutils-dev (>= 5.42.0~),
- libkf5kdelibs4support-dev (>= 5.16.0~),
- libkf5kio-dev (>= 5.42.0~),
- libkf5service-dev (>= 5.42.0~),
- libkf5su-dev (>= 5.42.0~),
- libkf5windowsystem-dev (>= 5.42.0~),
- libqt5svg5-dev (>= 5.11.0~),
- libqt5x11extras5-dev (>= 5.11.0~),
+ kf6-extra-cmake-modules,
+ kf6-kactivities-dev,
+ kf6-kcmutils-dev,
+ kf6-kconfig-dev,
+ kf6-kdeclarative-dev,
+ kf6-kdesu-dev,
+ kf6-kdoctools-dev,
+ kf6-ki18n-dev,
+ kf6-kiconthemes-dev,
+ kf6-kio-dev,
+ kf6-kservice-dev,
+ kf6-kwindowsystem-dev,
pkg-config,
- pkg-kde-tools (>= 0.15.18~),
+ pkg-kde-tools-neon,
plasma-workspace-dev (>= 4:5.14.3~),
- qtbase5-dev (>= 5.11.0~)
+ qt6-base-dev,
+ qt6-svg-dev
Standards-Version: 4.1.4
Homepage: https://projects.kde.org/projects/kde/workspace/kde-cli-tools
Vcs-Browser: https://salsa.debian.org/qt-kde-team/kde/kde-cli-tools
@@ -33,8 +30,8 @@ Vcs-Git: https://salsa.debian.org/qt-kde-team/kde/kde-cli-tools.git
Package: kde-cli-tools
Architecture: any
Depends: kde-cli-tools-data (= ${source:Version}),
+ kf6-kdesu,
kio,
- libkf5su-bin,
${misc:Depends},
${shlibs:Depends}
Description: tools to use KDE services from the command line
diff --git a/debian/kde-cli-tools-data.install b/debian/kde-cli-tools-data.install
index bbc2d02..0ac5a47 100644
--- a/debian/kde-cli-tools-data.install
+++ b/debian/kde-cli-tools-data.install
@@ -1,3 +1,3 @@
-usr/share/doc/*/*/kdesu/
-usr/share/doc/HTML/*/kcontrol5/
-usr/share/locale/
+usr/kf6/share/doc/*/*/kdesu/
+usr/kf6/share/doc/HTML/*/kcontrol5/
+usr/kf6/share/locale/
diff --git a/debian/kde-cli-tools.install b/debian/kde-cli-tools.install
index 4293341..281fb7e 100644
--- a/debian/kde-cli-tools.install
+++ b/debian/kde-cli-tools.install
@@ -1,27 +1,27 @@
-usr/bin/kbroadcastnotification
-usr/bin/kcmshell5
-usr/bin/kde-inhibit
-usr/bin/kde-open
-usr/bin/kde-open5
-usr/bin/kdecp
-usr/bin/kdecp5
-usr/bin/kdemv
-usr/bin/kdemv5
-usr/bin/keditfiletype
-usr/bin/keditfiletype5
-usr/bin/kioclient
-usr/bin/kioclient5
-usr/bin/kmimetypefinder
-usr/bin/kmimetypefinder5
-usr/bin/kstart
-usr/bin/kstart5
-usr/bin/ksvgtopng
-usr/bin/ksvgtopng5
-usr/bin/ktraderclient5
-usr/bin/plasma-open-settings
-usr/lib/*/libexec/kf5/kdeeject
-usr/lib/*/libexec/kf5/kdesu
-usr/lib/*/qt5/plugins/plasma/kcms/systemsettings_qwidgets/kcm_filetypes.so
-usr/share/applications/kcm_filetypes.desktop
-usr/share/applications/org.kde.keditfiletype.desktop
-usr/share/applications/org.kde.plasma.settings.open.desktop
+usr/kf6/bin/kbroadcastnotification
+usr/kf6/bin/kcmshell5
+usr/kf6/bin/kde-inhibit
+usr/kf6/bin/kde-open
+usr/kf6/bin/kde-open5
+usr/kf6/bin/kdecp
+usr/kf6/bin/kdecp5
+usr/kf6/bin/kdemv
+usr/kf6/bin/kdemv5
+usr/kf6/bin/keditfiletype
+usr/kf6/bin/keditfiletype5
+usr/kf6/bin/kioclient
+usr/kf6/bin/kioclient5
+usr/kf6/bin/kmimetypefinder
+usr/kf6/bin/kmimetypefinder5
+usr/kf6/bin/kstart
+usr/kf6/bin/kstart5
+usr/kf6/bin/ksvgtopng
+usr/kf6/bin/ksvgtopng5
+usr/kf6/bin/ktraderclient5
+usr/kf6/bin/plasma-open-settings
+usr/kf6/lib/*/libexec/kf5/kdeeject
+usr/kf6/lib/*/libexec/kf5/kdesu
+usr/kf6/lib/*/qt6/plugins/plasma/kcms/systemsettings_qwidgets/kcm_filetypes.so
+usr/kf6/share/applications/kcm_filetypes.desktop
+usr/kf6/share/applications/org.kde.keditfiletype.desktop
+usr/kf6/share/applications/org.kde.plasma.settings.open.desktop
diff --git a/debian/rules b/debian/rules
index cb79f6b..47c772a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,20 +1,9 @@
#!/usr/bin/make -f
-# -*- makefile -*-
-
-export DEB_LDFLAGS_MAINT_APPEND := -Wl,--as-needed
-
-l10npkgs_firstversion_ok := 4:4.14.0-2
-include /usr/share/pkg-kde-tools/qt-kde-team/2/l10n-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
-
-override_dh_strip:
- dh_strip --dbgsym-migration='kde-cli-tools-dbg (<= 4:5.5.5-1~~)'
-
-override_dh_auto_test:
- # Ignore unit tests at build time
- :
+ 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