[neon/kde/kdepim-runtime/Neon/unstable] debian: port to kf6

Carlos De Maine null at kde.org
Sun Sep 24 11:54:07 BST 2023


Git commit 76a035d021b1183f2184c2fc872f0be24af0f993 by Carlos De Maine.
Committed on 24/09/2023 at 08:05.
Pushed by carlosdem into branch 'Neon/unstable'.

port to kf6

M  +45   -48   debian/control
M  +23   -23   debian/kdepim-runtime.install
M  +4    -14   debian/rules

https://invent.kde.org/neon/kde/kdepim-runtime/-/commit/76a035d021b1183f2184c2fc872f0be24af0f993

diff --git a/debian/control b/debian/control
index 094b590..93f90fe 100644
--- a/debian/control
+++ b/debian/control
@@ -9,62 +9,59 @@ Uploaders: Sune Vuorela <debian at pusling.com>,
            Maximiliano Curia <maxy at debian.org>
 Build-Depends: cmake (>= 2.8.12~),
                debhelper (>= 9),
-               extra-cmake-modules (>= 5.31.0~),
+               kf6-codecs-dev,
+               kf6-extra-cmake-modules,
+               kf6-kcmutils-dev,
+               kf6-kconfig-dev,
+               kf6-kconfigwidgets-dev,
+               kf6-kholidays-dev,
+               kf6-kio-dev,
+               kf6-kitemmodels-dev,
+               kf6-knotifyconfig-dev,
+               kf6-ktextaddons-dev,
+               kf6-ktextwidgets-dev,
+               kf6-kwindowsystem-dev,
+               kf6-prison-dev,
+               kf6-syndication-dev,
+               kpim6-akonadi-calendar-dev,
+               kpim6-akonadi-contact-dev,
+               kpim6-akonadi-dev,
+               kpim6-akonadi-mime-dev,
+               kpim6-akonadi-notes-dev,
+               kpim6-calendar-dev,
+               kpim6-calendarutils-dev,
+               kpim6-contacteditor-dev,
+               kpim6-contacts-dev,
+               kpim6-dav-dev,
+               kpim6-grantleetheme-dev,
+               kpim6-identitymanagement-dev,
+               kpim6-imap-dev,
+               kpim6-kdepim-dev,
+               kpim6-mailtransport-dev,
+               kpim6-mbox-dev,
+               kpim6-mime-dev,
+               kpim6-pimcommon-dev,
+               kpim6-pimtextedit-dev,
                kross-dev (>= 5.31.0~),
                libboost-atomic-dev,
                libboost-dev (>= 1.40.0-2),
                libboost-program-options-dev,
                libetebase-dev,
-               libkf5akonadi-dev (>= 4:17.04.3~),
-               libkf5akonadicalendar-dev (>= 4:17.04.3~),
-               libkf5akonadicontact-dev (>= 4:17.04.3~),
-               libkf5akonadimime-dev (>= 4:17.04.3~),
-               libkf5akonadinotes-dev (>= 4:17.04.3~),
-               libkf5akonadiserver-dev (>= 4:17.04.3~),
-               libkf5calendarcore-dev (>= 4:17.04.3~),
-               libkf5calendarutils-dev (>= 4:17.04.3~),
-               libkf5codecs-dev (>= 5.31.0~),
-               libkf5config-dev (>= 5.31.0~),
-               libkf5configwidgets-dev (>= 5.31.0~),
-               libkf5contacteditor-dev (>= 17.7.70~),
-               libkf5contacts-dev (>= 4:17.04.3~),
-               libkf5dav-dev (>= 17.04.3~),
-               libkf5grantleetheme-dev,
-               libkf5holidays-dev,
-               libkf5identitymanagement-dev (>= 17.04.3~),
-               libkf5imap-dev (>= 17.04.3~),
-               libkf5itemmodels-dev (>= 5.31.0~),
-               libkf5kcmutils-dev (>= 5.31.0~),
-               libkf5kdelibs4support-dev (>= 5.31.0~),
-               libkf5kio-dev (>= 5.31.0~),
-               libkf5ktextaddons-dev,
-               libkf5libkdepim-dev,
-               libkf5mailtransport-dev (>= 17.04.3~),
-               libkf5mbox-dev (>= 17.04.3~),
-               libkf5mime-dev (>= 17.04.3~),
-               libkf5notifyconfig-dev (>= 5.31.0~),
-               libkf5pimcommon-dev (>= 17.04.3~),
-               libkf5pimtextedit-dev (>= 17.04.3~),
-               libkf5prison-dev,
-               libkf5syndication-dev (>= 17.04.3~),
-               libkf5textwidgets-dev (>= 5.31.0~),
-               libkf5windowsystem-dev (>= 5.31.0~),
                libkolabxml-dev (>= 1.1),
                libkpimgapi-dev (>= 17.04.3~),
-               libqca-qt5-2-dev,
-               libqt5networkauth5-dev,
-               libqt5texttospeech5-dev,
-               libqt5webchannel5-dev (>= 5.6.1~),
-               libqt5webenginewidgets5 (>= 5.6.1~),
-               libqt5webkit5-dev (>= 5.4.0~),
-               libqt5xmlpatterns5-dev (>= 5.6.1~),
+               libqca-qt6-2-dev,
                pkg-config,
-               pkg-kde-tools (>= 0.12),
-               qt5keychain-dev,
-               qtbase5-dev (>= 5.6.1~),
-               qtdeclarative5-dev (>= 5.6.1~),
-               qtpositioning5-dev (>= 5.6.1~),
-               qtwebengine5-dev (>= 5.6.1~),
+               pkg-kde-tools-neon,
+               qt6-base-dev,
+               qt6-declarative-dev,
+               qt6-networkauth-dev,
+               qt6-positioning-dev,
+               qt6-speech-dev,
+               qt6-webchannel-dev,
+               qt6-webengine,
+               qt6-webengine-dev,
+               qt6-xmlpatterns-dev,
+               qtkeychain-qt6-dev,
                shared-mime-info (>= 0.30),
                xsltproc
 Standards-Version: 3.9.8
diff --git a/debian/kdepim-runtime.install b/debian/kdepim-runtime.install
index 2679c15..b80a974 100644
--- a/debian/kdepim-runtime.install
+++ b/debian/kdepim-runtime.install
@@ -28,26 +28,26 @@ usr/lib/*/libakonadi-singlefileresource.so.*
 usr/lib/*/libfolderarchivesettings.so.*
 usr/lib/*/libkmindexreader.so.*
 usr/lib/*/libmaildir.so.*
-usr/lib/*/qt5/plugins/kf5/kio/akonadi.so
-usr/lib/*/qt5/plugins/pim5/mailtransport/mailtransport_akonadiplugin.so
-usr/lib/*/qt5/plugins/pim5/akonadi/config/akonotesconfig.so
-usr/lib/*/qt5/plugins/pim5/akonadi/config/birthdaysconfig.so
-usr/lib/*/qt5/plugins/pim5/akonadi/config/contactsconfig.so
-usr/lib/*/qt5/plugins/pim5/akonadi/config/googleconfig.so
-usr/lib/*/qt5/plugins/pim5/akonadi/config/icalconfig.so
-usr/lib/*/qt5/plugins/pim5/akonadi/config/icaldirconfig.so
-usr/lib/*/qt5/plugins/pim5/akonadi/config/maildirconfig.so
-usr/lib/*/qt5/plugins/pim5/akonadi/config/maildispatcherconfig.so
-usr/lib/*/qt5/plugins/pim5/akonadi/config/mboxconfig.so
-usr/lib/*/qt5/plugins/pim5/akonadi/config/mixedmaildirconfig.so
-usr/lib/*/qt5/plugins/pim5/akonadi/config/newmailnotifierconfig.so
-usr/lib/*/qt5/plugins/pim5/akonadi/config/notesconfig.so
-usr/lib/*/qt5/plugins/pim5/akonadi/config/openxchangeconfig.so
-usr/lib/*/qt5/plugins/pim5/akonadi/config/pop3config.so
-usr/lib/*/qt5/plugins/pim5/akonadi/config/tomboynotesconfig.so
-usr/lib/*/qt5/plugins/pim5/akonadi/config/vcardconfig.so
-usr/lib/*/qt5/plugins/pim5/akonadi/config/vcarddirconfig.so
-usr/lib/*/qt5/plugins/pim5/kcms/kaddressbook/kcm_ldap.so
+usr/lib/*/qt6/plugins/kf6/kio/akonadi.so
+usr/lib/*/qt6/plugins/pim5/akonadi/config/akonotesconfig.so
+usr/lib/*/qt6/plugins/pim5/akonadi/config/birthdaysconfig.so
+usr/lib/*/qt6/plugins/pim5/akonadi/config/contactsconfig.so
+usr/lib/*/qt6/plugins/pim5/akonadi/config/googleconfig.so
+usr/lib/*/qt6/plugins/pim5/akonadi/config/icalconfig.so
+usr/lib/*/qt6/plugins/pim5/akonadi/config/icaldirconfig.so
+usr/lib/*/qt6/plugins/pim5/akonadi/config/maildirconfig.so
+usr/lib/*/qt6/plugins/pim5/akonadi/config/maildispatcherconfig.so
+usr/lib/*/qt6/plugins/pim5/akonadi/config/mboxconfig.so
+usr/lib/*/qt6/plugins/pim5/akonadi/config/mixedmaildirconfig.so
+usr/lib/*/qt6/plugins/pim5/akonadi/config/newmailnotifierconfig.so
+usr/lib/*/qt6/plugins/pim5/akonadi/config/notesconfig.so
+usr/lib/*/qt6/plugins/pim5/akonadi/config/openxchangeconfig.so
+usr/lib/*/qt6/plugins/pim5/akonadi/config/pop3config.so
+usr/lib/*/qt6/plugins/pim5/akonadi/config/tomboynotesconfig.so
+usr/lib/*/qt6/plugins/pim5/akonadi/config/vcardconfig.so
+usr/lib/*/qt6/plugins/pim5/akonadi/config/vcarddirconfig.so
+usr/lib/*/qt6/plugins/pim5/kcms/kaddressbook/kcm_ldap.so
+usr/lib/*/qt6/plugins/pim5/mailtransport/mailtransport_akonadiplugin.so
 usr/share/akonadi/accountwizard/contacts/contactswizard.desktop
 usr/share/akonadi/accountwizard/contacts/contactswizard.es
 usr/share/akonadi/accountwizard/contacts/contactswizard.ui
@@ -129,9 +129,9 @@ usr/share/icons/hicolor/64x64/apps/ox.png
 usr/share/icons/hicolor/72x72/apps/akonadi-etesync.png
 usr/share/icons/hicolor/72x72/apps/akonadi-ews.png
 usr/share/icons/hicolor/96x96/apps/akonadi-ews.png
-usr/share/knotifications5/
+usr/share/knotifications6/
 usr/share/kservices5/akonadi/davgroupware-providers/
 usr/share/locale/
 usr/share/mime/packages/kdepim-mime.xml
-usr/share/qlogging-categories5/kdepim-runtime.categories
-usr/share/qlogging-categories5/kdepim-runtime.renamecategories
+usr/share/qlogging-categories6/kdepim-runtime.categories
+usr/share/qlogging-categories6/kdepim-runtime.renamecategories
diff --git a/debian/rules b/debian/rules
index a5fd88b..3d69b0d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,16 +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~
-
-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_install:
-	$(overridden_command) --destdir=debian/tmp
-
-override_dh_auto_test:
-	# Disable dh_auto_test at build time
-	:
-
-override_dh_strip:
-	$(overridden_command) --dbgsym-migration='kdepim-runtime-dbg (<= 4:15.12.1-1~~)'
+%:
+	dh $@ --with kf6 --buildsystem kf6


More information about the Neon-commits mailing list