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

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


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

port to kf6

M  +38   -39   debian/control
M  +4    -11   debian/rules

https://invent.kde.org/neon/kde/kdepim-addons/-/commit/cbc81a2439514e81006cdbe3727bb704500004d2

diff --git a/debian/control b/debian/control
index e67a567..d517155 100644
--- a/debian/control
+++ b/debian/control
@@ -5,53 +5,52 @@ Maintainer: Debian/Kubuntu Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
 Uploaders: Maximiliano Curia <maxy at debian.org>
 Build-Depends: cmake (>= 2.8.12~),
                debhelper (>= 9),
-               extra-cmake-modules (>= 5.19.0~),
                kaddressbook,
+               kf6-extra-cmake-modules,
+               kf6-kconfig-dev,
+               kf6-kdbusaddons-dev,
+               kf6-kdeclarative-dev,
+               kf6-kholidays-dev,
+               kf6-ki18n-dev,
+               kf6-ktextaddons-dev,
+               kf6-kxmlgui-dev,
+               kf6-prison-dev,
+               kpim6-akonadi-dev,
+               kpim6-akonadi-notes-dev,
+               kpim6-calendarsupport-dev,
+               kpim6-contacteditor-dev,
+               kpim6-eventviews-dev,
+               kpim6-grantleetheme-dev,
+               kpim6-gravatar-dev,
+               kpim6-incidenceeditor-dev,
+               kpim6-kdepim-dev,
+               kpim6-kleo-dev,
+               kpim6-kontactinterface-dev,
+               kpim6-ksieve-dev,
+               kpim6-mailcommon-dev,
+               kpim6-mailimporter-dev,
+               kpim6-messagecomposer-dev,
+               kpim6-messagecore-dev,
+               kpim6-messagelib-dev,
+               kpim6-messagelist-dev,
+               kpim6-messageviewer-dev,
+               kpim6-mimetreeparser-dev,
+               kpim6-pimcommon-dev,
+               kpim6-pimtextedit-dev,
+               kpim6-templateparser-dev,
+               kpim6-tnef-dev,
                libgpgme-dev | libgpgme11-dev,
-               libkf5akonadi-dev (>= 4:5.2.0~),
-               libkf5akonadinotes-dev (>= 5.2.0~),
-               libkf5calendarsupport-dev (>= 5.2.0~),
-               libkf5config-dev (>= 5.19.0~),
-               libkf5contacteditor-dev (>= 17.04.0~),
-               libkf5dbusaddons-dev (>= 5.19.0~),
-               libkf5declarative-dev,
-               libkf5eventviews-dev (>= 5.2.0~),
-               libkf5grantleetheme-dev (>= 5.2.0~),
-               libkf5gravatar-dev (>= 5.2.0~),
-               libkf5holidays-dev,
-               libkf5i18n-dev (>= 5.19.0~),
-               libkf5incidenceeditor-dev (>= 5.2.0~),
-               libkf5khtml-dev (>= 5.19.0~),
-               libkf5kontactinterface-dev,
-               libkf5ksieve-dev,
-               libkf5ktextaddons-dev,
-               libkf5libkdepim-dev (>= 5.2.0~),
-               libkf5libkleo-dev (>= 5.2.0~),
-               libkf5mailcommon-dev (>= 4:5.2.0~),
-               libkf5mailimporter-dev,
-               libkf5messagecomposer-dev (>= 5.2.0~),
-               libkf5messagecore-dev (>= 5.2.0~),
-               libkf5messagelist-dev (>= 5.2.0~),
-               libkf5messageviewer-dev (>= 5.2.0~),
-               libkf5mimetreeparser-dev,
-               libkf5pimcommon-dev (>= 5.2.0~),
-               libkf5pimtextedittexttospeech-dev,
-               libkf5prison-dev,
-               libkf5templateparser-dev,
-               libkf5tnef-dev (>= 5.2.0~),
-               libkf5webengineviewer-dev,
-               libkf5xmlgui-dev (>= 5.19.0~),
                libkpimgapi-dev (>= 4.72.0~),
                libkpimimportwizard-dev,
                libkpimitinerary-dev,
                libkpimpkpass-dev,
                libmarkdown2-dev,
-               libpoppler-qt5-dev,
+               libpoppler-qt6-dev,
                libqgpgme-dev,
-               libqt5webchannel5-dev | libqt5webchannel-dev,
-               pkg-kde-tools (>= 0.12),
-               qtbase5-dev (>= 5.5.0~),
-               qtwebengine5-dev | libqt5webengine5-dev
+               pkg-kde-tools-neon,
+               qt6-base-dev,
+               qt6-webchannel-dev | qt6-webchannel-dev,
+               qt6-webengine-dev | qt6-webengine-dev
 Standards-Version: 3.9.8
 Homepage: https://pim.kde.org/
 Vcs-Browser: https://anonscm.debian.org/git/pkg-kde/applications/kdepim-addons.git
diff --git a/debian/rules b/debian/rules
index a2b980f..3d69b0d 100644
--- a/debian/rules
+++ b/debian/rules
@@ -1,13 +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
-	:
+%:
+	dh $@ --with kf6 --buildsystem kf6


More information about the Neon-commits mailing list