[neon/kde/mailcommon/Neon/unstable] debian: port to kf6
Carlos De Maine
null at kde.org
Sun Sep 24 12:05:20 BST 2023
Git commit 57d9b3da17868c5ee7d70e48a77d46d0caaf105d by Carlos De Maine.
Committed on 24/09/2023 at 08:06.
Pushed by carlosdem into branch 'Neon/unstable'.
port to kf6
M +46 -47 debian/control
M +2 -2 debian/libkf5mailcommon-dev.install
M +3 -3 debian/libkf5mailcommon-plugins.install
M +4 -8 debian/rules
https://invent.kde.org/neon/kde/mailcommon/-/commit/57d9b3da17868c5ee7d70e48a77d46d0caaf105d
diff --git a/debian/control b/debian/control
index 1189175..5e3ffd0 100644
--- a/debian/control
+++ b/debian/control
@@ -6,44 +6,43 @@ Uploaders: Maximiliano Curia <maxy at debian.org>
Build-Depends: cmake (>= 3.0~),
dbus,
debhelper (>= 11),
- extra-cmake-modules (>= 5.47.0~),
+ kf6-codecs-dev,
+ kf6-extra-cmake-modules,
+ kf6-karchive-dev,
+ kf6-kcompletion-dev,
+ kf6-kconfig-dev,
+ kf6-kconfigwidgets-dev,
+ kf6-kdbusaddons-dev,
+ kf6-ki18n-dev,
+ kf6-kiconthemes-dev,
+ kf6-kio-dev,
+ kf6-kitemmodels-dev,
+ kf6-kitemviews-dev,
+ kf6-ktextaddons-dev,
+ kf6-ktextwidgets-dev,
+ kf6-kwidgetsaddons-dev,
+ kf6-kwindowsystem-dev,
+ kf6-kxmlgui-dev,
+ kf6-syntax-highlighting-dev,
kgendesignerplugin (>= 5.47.0~),
- libkf5akonadi-dev (>= 4:18.08.3~),
- libkf5akonadimime-dev (>= 4:18.08.3~),
- libkf5archive-dev (>= 5.47.0~),
- libkf5codecs-dev (>= 5.47.0~),
- libkf5completion-dev (>= 5.47.0~),
- libkf5config-dev (>= 5.47.0~),
- libkf5configwidgets-dev (>= 5.47.0~),
- libkf5dbusaddons-dev (>= 5.47.0~),
- libkf5i18n-dev (>= 5.47.0~),
- libkf5iconthemes-dev (>= 5.47.0~),
- libkf5itemmodels-dev (>= 5.47.0~),
- libkf5itemviews-dev (>= 5.47.0~),
- libkf5kio-dev (>= 5.47.0~),
- libkf5libkdepim-dev (>= 4:18.08.3~),
- libkf5ktextaddons-dev,
- libkf5mailimporter-dev (>= 4:18.08.3~),
- libkf5mailtransport-dev (>= 18.08.3~),
- libkf5messagecomposer-dev (>= 4:18.08.3~),
- libkf5messagecore-dev (>= 4:18.08.3~),
- libkf5messagelist-dev,
- libkf5messageviewer-dev (>= 4:18.08.3~),
- libkf5mime-dev (>= 18.08.3~),
- libkf5pimcommon-dev (>= 4:18.08.3~),
- libkf5syntaxhighlighting-dev (>= 5.47.0~),
- libkf5templateparser-dev (>= 4:18.08.3~),
- libkf5textwidgets-dev (>= 5.47.0~),
- libkf5webengineviewer-dev,
- libkf5widgetsaddons-dev (>= 5.47.0~),
- libkf5windowsystem-dev (>= 5.47.0~),
- libkf5xmlgui-dev (>= 5.47.0~),
- libphonon4qt5-dev,
- libphonon4qt5experimental-dev,
+ kpim6-akonadi-dev,
+ kpim6-akonadi-mime-dev,
+ kpim6-kdepim-dev,
+ kpim6-mailimporter-dev,
+ kpim6-mailtransport-dev,
+ kpim6-messagecomposer-dev,
+ kpim6-messagecore-dev,
+ kpim6-messagelib-dev,
+ kpim6-messagelist-dev,
+ kpim6-messageviewer-dev,
+ kpim6-mime-dev,
+ kpim6-pimcommon-dev,
+ kpim6-templateparser-dev,
libqgpgme-dev,
- pkg-kde-tools (>= 0.12),
- qtbase5-dev (>= 5.9.0~),
- qttools5-dev (>= 5.4.0~),
+ pkg-kde-tools-neon,
+ qt6-base-dev,
+ qt6-phonon-dev,
+ qt6-tools-dev,
xauth,
xsltproc,
xvfb
@@ -68,16 +67,16 @@ Description: KDE PIM email utility library, shared data
Package: libkf5mailcommon-dev
Section: libdevel
Architecture: any
-Depends: libkf5akonadi-dev (>= 4:17.12.2~),
- libkf5akonadimime-dev (>= 4:17.12.2~),
- libkf5config-dev (>= 5.39.0~),
- libkf5libkdepim-dev (>= 4:17.12.2~),
- libkf5mailcommon5 (= ${binary:Version}),
- libkf5messagecomposer-dev (>= 4:17.12.2~),
- libkf5messagecore-dev (>= 4:17.12.2~),
- libkf5messageviewer-dev (>= 4:17.12.2~),
- libkf5pimcommon-dev (>= 4:17.12.2~),
- qtbase5-dev (>= 5.8.0~),
+Depends: kf6-kconfig-dev,
+ kpim6-akonadi-dev,
+ kpim6-akonadi-mime-dev,
+ kpim6-kdepim-dev,
+ kpim6-mailcommon (= ${binary:Version}),
+ kpim6-messagecomposer-dev,
+ kpim6-messagecore-dev,
+ kpim6-messageviewer-dev,
+ kpim6-pimcommon-dev,
+ qt6-base-dev,
${misc:Depends},
${shlibs:Depends}
Description: KDE PIM email utility library, devel files
@@ -104,7 +103,7 @@ Description: KDE PIM email utility library, plugins
Package: libkf5mailcommon5
Architecture: any
Multi-Arch: same
-Depends: libkf5mailcommon-data (= ${source:Version}),
+Depends: kpim6-mailcommon (= ${source:Version}),
${misc:Depends},
${shlibs:Depends}
Breaks: ${kde-l10n:all}
diff --git a/debian/libkf5mailcommon-dev.install b/debian/libkf5mailcommon-dev.install
index 8cc1add..236be1c 100644
--- a/debian/libkf5mailcommon-dev.install
+++ b/debian/libkf5mailcommon-dev.install
@@ -1,5 +1,5 @@
-usr/include/KPim5/MailCommon/
+usr/include/KPim6/MailCommon/
usr/lib/*/cmake/KF5MailCommon/
usr/lib/*/cmake/KPim5MailCommon/
usr/lib/*/libKPim5MailCommon.so
-usr/lib/*/qt5/mkspecs/modules/qt_MailCommon.pri
+usr/lib/*/qt6/mkspecs/modules/qt_MailCommon.pri
diff --git a/debian/libkf5mailcommon-plugins.install b/debian/libkf5mailcommon-plugins.install
index 296c424..ccbfaad 100644
--- a/debian/libkf5mailcommon-plugins.install
+++ b/debian/libkf5mailcommon-plugins.install
@@ -1,3 +1,3 @@
-usr/lib/*/qt5/plugins/designer/mailcommon5widgets.so
-usr/share/qlogging-categories5/mailcommon.categories
-usr/share/qlogging-categories5/mailcommon.renamecategories
+usr/lib/*/qt6/plugins/designer/mailcommon5widgets.so
+usr/share/qlogging-categories6/mailcommon.categories
+usr/share/qlogging-categories6/mailcommon.renamecategories
diff --git a/debian/rules b/debian/rules
index 88916ad..3d69b0d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,10 +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_auto_test:
- - xvfb-run -a --server-args="-screen 0 1024x768x24 +extension GLX" --\
- dbus-run-session -- dh_auto_test --no-parallel
+%:
+ dh $@ --with kf6 --buildsystem kf6
More information about the Neon-commits
mailing list