[neon/kde/libkdepim/Neon/unstable] debian: port to kf6
Carlos De Maine
null at kde.org
Sun Sep 24 12:04:08 BST 2023
Git commit f4d0cdd7e73afa11b18af0a01065b9b7448f4d3c by Carlos De Maine.
Committed on 24/09/2023 at 08:06.
Pushed by carlosdem into branch 'Neon/unstable'.
port to kf6
M +32 -32 debian/control
M +2 -2 debian/libkf5libkdepim-data.install
M +2 -2 debian/libkf5libkdepim-dev.install
M +1 -1 debian/libkf5libkdepim-plugins.install
M +4 -10 debian/rules
https://invent.kde.org/neon/kde/libkdepim/-/commit/f4d0cdd7e73afa11b18af0a01065b9b7448f4d3c
diff --git a/debian/control b/debian/control
index 9e008c8..452d953 100644
--- a/debian/control
+++ b/debian/control
@@ -5,29 +5,29 @@ 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.47.0~),
+ kf6-codecs-dev,
+ kf6-extra-cmake-modules,
+ kf6-kcmutils-dev,
+ kf6-kcompletion-dev,
+ kf6-kconfig-dev,
+ kf6-kconfigwidgets-dev,
+ kf6-kcoreaddons-dev,
+ kf6-ki18n-dev,
+ kf6-kiconthemes-dev,
+ kf6-kio-dev,
+ kf6-kitemviews-dev,
+ kf6-kjobwidgets-dev,
+ kf6-kwallet-dev,
+ kf6-kwidgetsaddons-dev,
kgendesignerplugin (>= 5.47.0~),
- libkf5akonadi-dev (>= 4:18.08.3~),
- libkf5akonadicontact-dev (>= 4:18.08.3~),
- libkf5akonadisearch-dev (>= 4:18.08.3~),
- libkf5codecs-dev (>= 5.47.0~),
- libkf5completion-dev (>= 5.47.0~),
- libkf5config-dev (>= 5.47.0~),
- libkf5configwidgets-dev (>= 5.47.0~),
- libkf5contacts-dev (>= 4:18.08.3~),
- libkf5coreaddons-dev (>= 5.47.0~),
- libkf5i18n-dev (>= 5.47.0~),
- libkf5iconthemes-dev (>= 5.47.0~),
- libkf5itemviews-dev (>= 5.47.0~),
- libkf5jobwidgets-dev (>= 5.47.0~),
- libkf5kcmutils-dev (>= 5.47.0~),
- libkf5kio-dev (>= 5.47.0~),
- libkf5ldap-dev (>= 18.08.3~),
- libkf5wallet-dev (>= 5.47.0~),
- libkf5widgetsaddons-dev (>= 5.47.0~),
- pkg-kde-tools (>= 0.12),
- qtbase5-dev (>= 5.9.0~),
- qttools5-dev,
+ kpim6-akonadi-contact-dev,
+ kpim6-akonadi-dev,
+ kpim6-akonadi-search-dev,
+ kpim6-contacts-dev,
+ kpim6-ldap-dev,
+ pkg-kde-tools-neon,
+ qt6-base-dev,
+ qt6-tools-dev,
xauth,
xvfb
Standards-Version: 4.3.0
@@ -63,14 +63,14 @@ Package: libkf5libkdepim-dev
Section: libdevel
Architecture: any
Multi-Arch: same
-Depends: libkf5akonadi-dev (>= 4:18.08.3~),
- libkf5akonadicontact-dev (>= 4:18.08.3~),
- libkf5completion-dev (>= 5.47.0~),
- libkf5contacts-dev (>= 4:18.08.3~),
- libkf5coreaddons-dev (>= 5.47.0~),
- libkf5ldap-dev (>= 18.08.3~),
- libkf5libkdepim5 (= ${binary:Version}),
- qtbase5-dev (>= 5.9.0~),
+Depends: kf6-kcompletion-dev,
+ kf6-kcoreaddons-dev,
+ kpim6-akonadi-contact-dev,
+ kpim6-akonadi-dev,
+ kpim6-contacts-dev,
+ kpim6-kdepim (= ${binary:Version}),
+ kpim6-ldap-dev,
+ qt6-base-dev,
${misc:Depends},
${shlibs:Depends}
Description: KDE PIM library - development files
@@ -83,7 +83,7 @@ Description: KDE PIM library - development files
Package: libkf5libkdepim-plugins
Architecture: any
Multi-Arch: same
-Depends: libkf5libkdepim-data (>= ${source:Version}),
+Depends: kpim6-kdepim-data (>= ${source:Version}),
${misc:Depends},
${shlibs:Depends}
Breaks: accountwizard (<< 4:17.08),
@@ -115,7 +115,7 @@ Description: KDE PIM library - plugins
Package: libkf5libkdepim5
Architecture: any
Multi-Arch: same
-Depends: libkf5libkdepim-data (>= ${source:Version}),
+Depends: kpim6-kdepim-data (>= ${source:Version}),
${misc:Depends},
${shlibs:Depends}
Recommends: libkf5libkdepim-plugins
diff --git a/debian/libkf5libkdepim-data.install b/debian/libkf5libkdepim-data.install
index 14e871f..12f56f4 100644
--- a/debian/libkf5libkdepim-data.install
+++ b/debian/libkf5libkdepim-data.install
@@ -1,3 +1,3 @@
usr/share/locale/
-usr/share/qlogging-categories5/libkdepim.categories
-usr/share/qlogging-categories5/libkdepim.renamecategories
+usr/share/qlogging-categories6/libkdepim.categories
+usr/share/qlogging-categories6/libkdepim.renamecategories
diff --git a/debian/libkf5libkdepim-dev.install b/debian/libkf5libkdepim-dev.install
index abcb704..3d9b35c 100644
--- a/debian/libkf5libkdepim-dev.install
+++ b/debian/libkf5libkdepim-dev.install
@@ -1,9 +1,9 @@
-usr/include/KPim5/
+usr/include/KPim6/
usr/lib/*/cmake/KF5Libkdepim/
usr/lib/*/cmake/KPim5Libkdepim/
usr/lib/*/cmake/KPim5MailTransportDBusService/KPim5MailTransportDBusServiceConfig.cmake
usr/lib/*/cmake/MailTransportDBusService/
usr/lib/*/libKPim5Libkdepim.so
-usr/lib/*/qt5/mkspecs/modules/qt_Libkdepim.pri
+usr/lib/*/qt6/mkspecs/modules/qt_Libkdepim.pri
usr/share/dbus-1/interfaces/org.kde.addressbook.service.xml
usr/share/dbus-1/interfaces/org.kde.mailtransport.service.xml
diff --git a/debian/libkf5libkdepim-plugins.install b/debian/libkf5libkdepim-plugins.install
index de22870..99ea58b 100644
--- a/debian/libkf5libkdepim-plugins.install
+++ b/debian/libkf5libkdepim-plugins.install
@@ -1 +1 @@
-usr/lib/*/qt5/plugins/designer/kdepim5widgets.so
+usr/lib/*/qt6/plugins/designer/kdepim5widgets.so
diff --git a/debian/rules b/debian/rules
index d6917d6..3d69b0d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,12 +1,6 @@
#!/usr/bin/make -f
+# SPDX-License-Identifier: LGPL-2.0-or-later
+# SPDX-FileCopyrightText: 2023 Jonathan Riddell <jr at jriddell.org>
-l10npkgs_firstversion_ok := 4:16.04.3-9~
-
-include /usr/share/pkg-kde-tools/qt-kde-team/3/debian-qt-kde.mk
-include /usr/share/pkg-kde-tools/qt-kde-team/2/l10n-packages.mk
-
-override_dh_shlibdeps:
- $(overridden_command) -- -xlibkf5libkdepim-plugins
-
-override_dh_auto_test:
- - xvfb-run -- dh_auto_test --no-parallel
+%:
+ dh $@ --with kf6 --buildsystem kf6
More information about the Neon-commits
mailing list