[neon/kde/powerdevil/Neon/unstable] debian: port to kf6
Carlos De Maine
null at kde.org
Tue Mar 14 01:00:51 GMT 2023
Git commit 5b78822779abb15092d32f3ae5ecaa359ef0ee4b by Carlos De Maine.
Committed on 14/03/2023 at 00:59.
Pushed by carlosdem into branch 'Neon/unstable'.
port to kf6
M +22 -26 debian/control
M +2 -2 debian/libpowerdevilcore2.install
M +2 -2 debian/libpowerdevilui5.install
M +4 -4 debian/powerdevil-data.install
M +3 -3 debian/powerdevil-dev.install
M +8 -8 debian/powerdevil.install
M +5 -19 debian/rules
https://invent.kde.org/neon/kde/powerdevil/commit/5b78822779abb15092d32f3ae5ecaa359ef0ee4b
diff --git a/debian/control b/debian/control
index 7ac9dbd..adce5d4 100644
--- a/debian/control
+++ b/debian/control
@@ -5,31 +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 (>= 3.0~),
debhelper (>= 11~),
- extra-cmake-modules (>= 5.50.0~),
- kinit-dev,
- kirigami2-dev,
+ kf6-bluez-qt-dev,
+ kf6-extra-cmake-modules,
+ kf6-kactivities-dev,
+ kf6-kauth-dev,
+ kf6-kconfig-dev,
+ kf6-kcrash-dev,
+ kf6-kdbusaddons-dev,
+ kf6-kdoctools-dev,
+ kf6-kglobalaccel-dev,
+ kf6-ki18n-dev,
+ kf6-kidletime-dev,
+ kf6-kio-dev,
+ kf6-kirigami2-dev,
+ kf6-knotifications-dev,
+ kf6-knotifyconfig-dev,
+ kf6-kscreen-dev,
+ kf6-kwayland-dev,
+ kf6-networkmanager-qt-dev,
+ kf6-solid-dev,
kuserfeedback-dev,
libcap-dev,
libddcutil-dev,
- libkf5activities-dev (>= 5.50.0~),
- libkf5auth-dev (>= 5.50.0~),
- libkf5bluezqt-dev (>= 5.50.0~),
- libkf5config-dev (>= 5.50.0~),
- libkf5crash-dev (>= 5.50.0~),
- libkf5dbusaddons-dev (>= 5.50.0~),
- libkf5doctools-dev (>= 5.50.0~),
- libkf5globalaccel-dev (>= 5.50.0~),
- libkf5i18n-dev (>= 5.50.0~),
- libkf5idletime-dev (>= 5.50.0~),
- libkf5kdelibs4support-dev (>= 5.2.0),
- libkf5kio-dev (>= 5.50.0~),
- libkf5networkmanagerqt-dev (>= 5.50.0~),
- libkf5notifications-dev (>= 5.50.0~),
- libkf5notifyconfig-dev (>= 5.50.0~),
- libkf5screen-dev (>= 4:5.6),
- libkf5solid-dev (>= 5.50.0~),
- libkf5wayland-dev (>= 4:5.50.0~),
- libqt5x11extras5-dev (>= 5.11.0~),
libudev-dev,
libx11-dev,
libx11-xcb-dev,
@@ -43,9 +40,9 @@ Build-Depends: cmake (>= 3.0~),
libxcb1-dev,
libxrandr-dev,
pkg-config,
- pkg-kde-tools (>= 0.15.18~),
+ pkg-kde-tools-neon,
plasma-workspace-dev (>= 4:5.14.5~),
- qtbase5-dev (>= 5.11.0~)
+ qt6-base-dev
Standards-Version: 4.1.4
Homepage: https://projects.kde.org/projects/kde/workspace/powerdevil
Vcs-Browser: https://salsa.debian.org/qt-kde-team/kde/powerdevil
@@ -83,8 +80,7 @@ Description: Global power saver settings.
Package: powerdevil-data
Architecture: all
-Depends: ${misc:Depends}, ${shlibs:Depends},
- power-profiles-daemon
+Depends: power-profiles-daemon, ${misc:Depends}, ${shlibs:Depends}
Breaks: ${kde-l10n:all}
Replaces: ${kde-l10n:all}
Description: Global power saver settings data files.
diff --git a/debian/libpowerdevilcore2.install b/debian/libpowerdevilcore2.install
index a728dd8..a58f39c 100644
--- a/debian/libpowerdevilcore2.install
+++ b/debian/libpowerdevilcore2.install
@@ -1,2 +1,2 @@
-usr/lib/*/libpowerdevilcore.so.2
-usr/lib/*/libpowerdevilcore.so.5.*
+usr/kf6/lib/*/libpowerdevilcore.so.2
+usr/kf6/lib/*/libpowerdevilcore.so.5.*
diff --git a/debian/libpowerdevilui5.install b/debian/libpowerdevilui5.install
index 7e34469..b040139 100644
--- a/debian/libpowerdevilui5.install
+++ b/debian/libpowerdevilui5.install
@@ -1,2 +1,2 @@
-usr/lib/*/libpowerdevilui.so.5
-usr/lib/*/libpowerdevilui.so.5.*
+usr/kf6/lib/*/libpowerdevilui.so.5
+usr/kf6/lib/*/libpowerdevilui.so.5.*
diff --git a/debian/powerdevil-data.install b/debian/powerdevil-data.install
index 9cd71dc..779fbc1 100644
--- a/debian/powerdevil-data.install
+++ b/debian/powerdevil-data.install
@@ -1,4 +1,4 @@
-usr/share/doc/HTML/*/kcontrol/powerdevil/
-usr/share/knotifications5
-usr/share/locale/*
-usr/share/qlogging-categories5/powerdevil.categories
+usr/kf6/share/doc/HTML/*/kcontrol/powerdevil/
+usr/kf6/share/knotifications5
+usr/kf6/share/locale/*
+usr/kf6/share/qlogging-categories5/powerdevil.categories
diff --git a/debian/powerdevil-dev.install b/debian/powerdevil-dev.install
index 9df7df8..cfed812 100644
--- a/debian/powerdevil-dev.install
+++ b/debian/powerdevil-dev.install
@@ -1,3 +1,3 @@
-usr/lib/*/libpowerdevilconfigcommonprivate.so
-usr/lib/*/libpowerdevilcore.so
-usr/lib/*/libpowerdevilui.so
+usr/kf6/lib/*/libpowerdevilconfigcommonprivate.so
+usr/kf6/lib/*/libpowerdevilcore.so
+usr/kf6/lib/*/libpowerdevilui.so
diff --git a/debian/powerdevil.install b/debian/powerdevil.install
index 0681532..e989655 100644
--- a/debian/powerdevil.install
+++ b/debian/powerdevil.install
@@ -1,9 +1,9 @@
etc/xdg/autostart/powerdevil.desktop
-usr/lib/*/libexec
-usr/lib/*/libpowerdevilconfigcommonprivate.so.*
-usr/lib/*/qt5
-usr/lib/*/qt5/plugins/plasma/kcms/systemsettings_qwidgets/kcm*
-usr/lib/systemd/user/
-usr/share/applications/kcm_*
-usr/share/dbus-1
-usr/share/polkit-1/
+usr/kf6/lib/*/libexec
+usr/kf6/lib/*/libpowerdevilconfigcommonprivate.so.*
+usr/kf6/lib/*/qt5
+usr/kf6/lib/*/qt6/plugins/plasma/kcms/systemsettings_qwidgets/kcm*
+usr/kf6/lib/systemd/user/
+usr/kf6/share/applications/kcm_*
+usr/kf6/share/dbus-1
+usr/kf6/share/polkit-1/
diff --git a/debian/rules b/debian/rules
index 5aa45d0..47c772a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,23 +1,9 @@
#!/usr/bin/make -f
-
-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_auto_configure:
- dh_auto_configure -- -DHAVE_DDCUTIL=Off
-
-override_dh_strip:
- dh_strip --dbgsym-migration='powerdevil-dbg (<= 4:5.5.5-1~~)'
-
-override_dh_gencontrol: l10npkgs_firstversion_ok
- dh_gencontrol
+ dh $@ --with kf6 --buildsystem kf6
-override_dh_installdeb:
- sed 's/#DEB_HOST_MULTIARCH#/$(DEB_HOST_MULTIARCH)/' \
- debian/powerdevil.postinst.in > debian/powerdevil.postinst
- dh_installdeb
+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