[neon/kde/kmail/Neon/unstable] debian: port to kf6
Carlos De Maine
null at kde.org
Sun Sep 24 11:57:02 BST 2023
Git commit d1fcb1c29581015f9f9c134ca0a3d5254ac4aa41 by Carlos De Maine.
Committed on 24/09/2023 at 08:05.
Pushed by carlosdem into branch 'Neon/unstable'.
port to kf6
M +80 -90 debian/control
M +16 -16 debian/kmail.install
M +4 -30 debian/rules
https://invent.kde.org/neon/kde/kmail/-/commit/d1fcb1c29581015f9f9c134ca0a3d5254ac4aa41
diff --git a/debian/control b/debian/control
index 33c78f6..11d3651 100644
--- a/debian/control
+++ b/debian/control
@@ -11,7 +11,74 @@ Uploaders: Sune Vuorela <sune at debian.org>,
Maximiliano Curia <maxy at debian.org>
Build-Depends: cmake (>= 2.8.12~),
debhelper (>= 9),
- extra-cmake-modules (>= 5.19.0~),
+ kf6-codecs-dev,
+ kf6-extra-cmake-modules,
+ kf6-karchive-dev,
+ kf6-kauth-dev,
+ kf6-kcmutils-dev,
+ kf6-kcompletion-dev,
+ kf6-kconfig-dev,
+ kf6-kcoreaddons-dev,
+ kf6-kcrash-dev,
+ kf6-kdbusaddons-dev,
+ kf6-kdnssd-dev,
+ kf6-kdoctools-dev,
+ kf6-kglobalaccel-dev,
+ kf6-kholidays-dev,
+ kf6-ki18n-dev,
+ kf6-kiconthemes-dev,
+ kf6-kitemviews-dev,
+ kf6-knewstuff-dev,
+ kf6-knotifyconfig-dev,
+ kf6-kservice-dev,
+ kf6-ktextaddons-dev,
+ kf6-ktexteditor-dev,
+ kf6-ktexttemplate-dev,
+ kf6-ktextwidgets-dev,
+ kf6-kwallet-dev,
+ kf6-kwidgetsaddons-dev,
+ kf6-kwindowsystem-dev,
+ kf6-kxmlgui-dev,
+ kf6-prison-dev,
+ kf6-sonnet-dev,
+ kf6-syndication-dev,
+ kpim6-akonadi-calendar-dev,
+ kpim6-akonadi-contact-dev,
+ kpim6-akonadi-dev,
+ kpim6-akonadi-mime-dev,
+ kpim6-akonadi-notes-dev,
+ kpim6-akonadi-search-dev,
+ kpim6-calendar-dev,
+ kpim6-calendarsupport-dev,
+ kpim6-calendarutils-dev,
+ kpim6-contacteditor-dev,
+ kpim6-contacts-dev,
+ kpim6-eventviews-dev,
+ kpim6-grantleetheme-dev,
+ kpim6-gravatar-dev,
+ kpim6-identitymanagement-dev,
+ kpim6-imap-dev,
+ kpim6-incidenceeditor-dev,
+ kpim6-kdepim-dev,
+ kpim6-kleo-dev,
+ kpim6-kontactinterface-dev,
+ kpim6-ksieve-dev,
+ kpim6-ldap-dev,
+ kpim6-mailcommon-dev,
+ kpim6-mailimporter-dev,
+ kpim6-mailtransport-dev,
+ kpim6-mbox-dev,
+ kpim6-messagecomposer-dev,
+ kpim6-messagecore-dev,
+ kpim6-messagelib-dev,
+ kpim6-messagelist-dev,
+ kpim6-messageviewer-dev,
+ kpim6-mime-dev,
+ kpim6-mimetreeparser-dev,
+ kpim6-pimcommon-dev,
+ kpim6-pimtextedit-dev,
+ kpim6-templateparser-dev,
+ kpim6-tnef-dev,
kross-dev (>= 5.19.0~),
kuserfeedback-dev,
libassuan-dev,
@@ -19,96 +86,20 @@ Build-Depends: cmake (>= 2.8.12~),
libboost-graph-dev (>= 1.40.0-2),
libgpgme11-dev,
libgpgmepp-dev | libqgpgme7-dev,
- libgrantlee5-dev (>= 5.0.0~),
- libkf5akonadi-dev (>= 4:15.12~),
- libkf5akonadicalendar-dev (>= 15.12~),
- libkf5akonadicontact-dev (>= 4:15.12~),
- libkf5akonadimime-dev (>= 4:15.12~),
- libkf5akonadinotes-dev (>= 4:15.12~),
- libkf5akonadisearch-dev (>= 15.12~),
- libkf5akonadiserver-dev (>= 15.12~),
- libkf5archive-dev (>= 5.19.0~),
- libkf5auth-dev (>= 5.19.0~),
- libkf5calendarcore-dev (>= 4:15.12~),
- libkf5calendarsupport-dev (>= 5.2.0~),
- libkf5calendarutils-dev (>= 15.12~),
- libkf5codecs-dev (>= 5.19.0~),
- libkf5completion-dev (>= 5.16.0~),
- libkf5config-dev (>= 5.19.0~),
- libkf5contacteditor-dev (>= 17.04.0~),
- libkf5contacts-dev (>= 15.12~),
- libkf5coreaddons-dev (>= 5.16.0~),
- libkf5crash-dev (>= 5.19.0~),
- libkf5dbusaddons-dev (>= 5.19.0~),
- libkf5dnssd-dev (>= 5.19.0~),
- libkf5doctools-dev (>= 5.19.0~),
- libkf5eventviews-dev (>= 5.2.0~),
- libkf5globalaccel-dev (>= 5.19.0~),
- libkf5grantleetheme-dev (>= 5.2.0~),
- libkf5gravatar-dev (>= 5.2.0~),
- libkf5holidays-dev (>= 15.12~),
- libkf5i18n-dev (>= 5.16.0~),
- libkf5iconthemes-dev (>= 5.16.0~),
- libkf5identitymanagement-dev (>= 15.12~),
- libkf5imap-dev (>= 15.12~),
- libkf5incidenceeditor-dev (>= 5.2.0~),
- libkf5itemviews-dev (>= 5.16.0~),
- libkf5kcmutils-dev (>= 5.19.0~),
- libkf5kdelibs4support-dev (>= 5.19.0~),
- libkf5khtml-dev (>= 5.16.0~),
- libkf5kontactinterface-dev (>= 15.12~),
- libkf5ksieve-dev (>= 5.2.1~),
- libkf5ktextaddons-dev,
- libkf5ldap-dev (>= 15.12~),
- libkf5libkdepim-dev (>= 5.2.0~),
- libkf5libkleo-dev (>= 5.2.0~),
- libkf5mailcommon-dev (>= 4:16.04.2~),
- libkf5mailimporter-dev (>= 5.2.0~),
- libkf5mailtransport-dev (>= 15.12~),
- libkf5mbox-dev (>= 15.12~),
- libkf5messagecomposer-dev,
- libkf5messagecore-dev (>= 5.16.42~),
- libkf5messagelist-dev,
- libkf5messageviewer-dev (>= 5.2.0~),
- libkf5mime-dev (>= 15.12~),
- libkf5mimetreeparser-dev (>= 5.16.42~),
- libkf5newstuff-dev (>= 5.19.0~),
- libkf5notifyconfig-dev (>= 5.19.0~),
- libkf5pimcommon-dev (>= 5.2.0~),
- libkf5pimtextedit-dev (>= 15.12~),
- libkf5prison-dev,
- libkf5service-dev (>= 5.19.0~),
- libkf5sonnet-dev (>= 5.19.0~),
- libkf5syndication-dev (>= 15.12~),
- libkf5templateparser-dev,
- libkf5texteditor-dev (>= 5.19.0~),
- libkf5textwidgets-dev (>= 5.16.0~),
- libkf5tnef-dev (>= 15.12~),
- libkf5wallet-dev (>= 5.19.0~),
- libkf5webengineviewer-dev,
- libkf5webengineviewer-dev (>= 5.16.42~),
- libkf5webkit-dev (>= 5.19.0~),
- libkf5widgetsaddons-dev (>= 5.16.0~),
- libkf5windowsystem-dev (>= 5.16.0~),
- libkf5xmlgui-dev (>= 5.16.0~),
- libkf5xmlrpcclient-dev (>= 5.2.0~),
libkgantt-dev,
libkpimgapi-dev (>= 5.1~),
- libphonon4qt5-dev,
- libphonon4qt5experimental-dev,
libqgpgme-dev,
- libqt5opengl5-dev (>= 5.5.0~),
- libqt5webchannel5-dev,
- libqt5webkit5-dev (>= 5.5.0~),
- libqt5x11extras5-dev (>= 5.4.0~),
libx11-dev,
pkg-config,
- pkg-kde-tools (>= 0.12),
- qt5keychain-dev,
- qtbase5-dev (>= 5.5.0~),
- qtdeclarative5-dev (>= 5.4.0~),
- qttools5-dev (>= 5.5.0~),
- qtwebengine5-dev,
+ pkg-kde-tools-neon,
+ qt6-5compat-dev,
+ qt6-base-dev,
+ qt6-declarative-dev,
+ qt6-phonon-dev,
+ qt6-tools-dev,
+ qt6-webchannel-dev,
+ qt6-webengine-dev,
+ qtkeychain-qt6-dev,
shared-mime-info,
xsltproc,
zlib1g-dev
@@ -130,10 +121,9 @@ Section: mail
Architecture: any
Depends: akonadi-server (>= 4:16.04),
kdepim-runtime,
- libkf5akonadisearch-bin,
- libkf5akonadisearch-plugins,
- libkf5grantleetheme-plugins,
- libqt5webengine5,
+ kpim6-akonadi-search,
+ kpim6-grantleetheme,
+ qt6-webengine,
${misc:Depends},
${perl:Depends},
${shlibs:Depends}
diff --git a/debian/kmail.install b/debian/kmail.install
index eeba5ca..fa81035 100644
--- a/debian/kmail.install
+++ b/debian/kmail.install
@@ -8,19 +8,19 @@ usr/bin/kmail
usr/bin/kmail-refresh-settings
usr/bin/ktnef
usr/lib/*/libkmailprivate.so.5*
-usr/lib/*/qt5/plugins/pim5/akonadi/config/archivemailagentconfig.so
-usr/lib/*/qt5/plugins/pim5/akonadi/config/followupreminderagentconfig.so
-usr/lib/*/qt5/plugins/kmailpart.so
-usr/lib/*/qt5/plugins/pim5/kontact/kontact_kmailplugin.so
-usr/lib/*/qt5/plugins/pim5/kontact/kontact_summaryplugin.so
-usr/lib/*/qt5/plugins/pim5/kcms/kmail/kcm_kmail_accounts.so
-usr/lib/*/qt5/plugins/pim5/kcms/kmail/kcm_kmail_appearance.so
-usr/lib/*/qt5/plugins/pim5/kcms/kmail/kcm_kmail_composer.so
-usr/lib/*/qt5/plugins/pim5/kcms/kmail/kcm_kmail_misc.so
-usr/lib/*/qt5/plugins/pim5/kcms/kmail/kcm_kmail_plugins.so
-usr/lib/*/qt5/plugins/pim5/kcms/kmail/kcm_kmail_security.so
-usr/lib/*/qt5/plugins/pim5/kcms/summary/kcmkmailsummary.so
-usr/lib/*/qt5/plugins/pim5/kcms/summary/kcmkontactsummary.so
+usr/lib/*/qt6/plugins/kmailpart.so
+usr/lib/*/qt6/plugins/pim5/akonadi/config/archivemailagentconfig.so
+usr/lib/*/qt6/plugins/pim5/akonadi/config/followupreminderagentconfig.so
+usr/lib/*/qt6/plugins/pim5/kcms/kmail/kcm_kmail_accounts.so
+usr/lib/*/qt6/plugins/pim5/kcms/kmail/kcm_kmail_appearance.so
+usr/lib/*/qt6/plugins/pim5/kcms/kmail/kcm_kmail_composer.so
+usr/lib/*/qt6/plugins/pim5/kcms/kmail/kcm_kmail_misc.so
+usr/lib/*/qt6/plugins/pim5/kcms/kmail/kcm_kmail_plugins.so
+usr/lib/*/qt6/plugins/pim5/kcms/kmail/kcm_kmail_security.so
+usr/lib/*/qt6/plugins/pim5/kcms/summary/kcmkmailsummary.so
+usr/lib/*/qt6/plugins/pim5/kcms/summary/kcmkontactsummary.so
+usr/lib/*/qt6/plugins/pim5/kontact/kontact_kmailplugin.so
+usr/lib/*/qt6/plugins/pim5/kontact/kontact_summaryplugin.so
usr/share/akonadi/agents/
usr/share/applications/kmail_view.desktop
usr/share/applications/org.kde.kmail-refresh-settings.desktop
@@ -47,9 +47,9 @@ usr/share/icons/hicolor/48x48/apps/ktnef.png
usr/share/icons/hicolor/8x8/emblems/
usr/share/icons/hicolor/scalable/apps/
usr/share/kmail2/pics/pgp-keys.png
-usr/share/knotifications5/akonadi_*.notifyrc
-usr/share/knotifications5/kmail2.notifyrc
+usr/share/knotifications6/akonadi_*.notifyrc
+usr/share/knotifications6/kmail2.notifyrc
usr/share/kxmlgui5/kontactsummary/kontactsummary_part.rc
usr/share/locale/
usr/share/metainfo/org.kde.kmail2.appdata.xml
-usr/share/qlogging-categories5/
+usr/share/qlogging-categories6/
diff --git a/debian/rules b/debian/rules
index 8106ca5..3d69b0d 100644
--- a/debian/rules
+++ b/debian/rules
@@ -1,32 +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:17.03.90-0~
-
-KDEPIM_RUNTIME_VERSION = 4:15.07.90
-
-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
-libpkgs_gen_strict_local_shlibs = $(libpkgs_all_packages)
-include /usr/share/pkg-kde-tools/qt-kde-team/3/library-packages.mk
-
-override_dh_auto_test:
- # Disable dh_auto_test at build time
- :
-
-# Strict local dependencies (there are no external ones anyway)
-override_dh_makeshlibs:
- $(overridden_command) -V
-
-override_dh_strip:
- $(overridden_command) --dbgsym-migration='kmail-dbg (<= 4:15.12.1-1~~)'
-
-override_dh_shlibdeps:
- $(overridden_command)
- set -e; \
- if [ -n "`ls debian/*.substvars 2>/dev/null`" ]; then \
- echo "Tightening dependency on kdepim-runtime to (>= $(KDEPIM_RUNTIME_VERSION)"; \
- sed -i '/^shlibs:[^=]\+=/{ s/\(^shlibs:[^=]\+=[[:space:]]*\|,[[:space:]]*\)\(kdepim-runtime\)\([[:space:]]*([[:space:]]*[><=]\+[^)]\+)\)\?/\1\2 (>= $(KDEPIM_RUNTIME_VERSION))/g }' debian/*.substvars; \
- fi
-
-debian/PIM.png: debian/PIM.dot
- dot -Tpng debian/PIM.dot > debian/PIM.png
+%:
+ dh $@ --with kf6 --buildsystem kf6
More information about the Neon-commits
mailing list