[neon/kde/kontact/Neon/unstable] debian: port to kf6
Carlos De Maine
null at kde.org
Sun Sep 24 12:00:02 BST 2023
Git commit ea1e16eca1ee897d295b9770a01f0b971066a41a by Carlos De Maine.
Committed on 24/09/2023 at 08:06.
Pushed by carlosdem into branch 'Neon/unstable'.
port to kf6
M +48 -56 debian/control
M +4 -30 debian/rules
M +10 -3 debian/tests/control
https://invent.kde.org/neon/kde/kontact/-/commit/ea1e16eca1ee897d295b9770a01f0b971066a41a
diff --git a/debian/control b/debian/control
index 527073e..227c47e 100644
--- a/debian/control
+++ b/debian/control
@@ -11,68 +11,60 @@ 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-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-sonnet-dev,
+ kpim6-akonadi-dev,
+ kpim6-eventviews-dev,
+ kpim6-grantleetheme-dev,
+ kpim6-kdepim-dev,
+ kpim6-kontactinterface-dev,
+ kpim6-mailcommon-dev,
+ kpim6-messagecomposer-dev,
+ kpim6-messagelib-dev,
+ kpim6-mimetreeparser-dev,
+ kpim6-pimtextedit-dev,
+ kpim6-templateparser-dev,
kross-dev (>= 5.19.0~),
libassuan-dev,
libboost-dev (>= 1.40.0-2),
libboost-graph-dev (>= 1.40.0-2),
libgpgme11-dev,
- libgrantlee5-dev (>= 5.0.0~),
- libkf5akonadi-dev (>= 4:15.12~),
- libkf5akonadiserver-dev (>= 15.12~),
- libkf5archive-dev (>= 5.19.0~),
- libkf5auth-dev (>= 5.19.0~),
- libkf5codecs-dev (>= 5.19.0~),
- libkf5completion-dev (>= 5.16.0~),
- libkf5config-dev (>= 5.19.0~),
- 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~),
- libkf5i18n-dev (>= 5.16.0~),
- libkf5iconthemes-dev (>= 5.16.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~),
- libkf5ktextaddons-dev,
- libkf5libkdepim-dev (>= 5.2.0~),
- libkf5mailcommon-dev (>= 4:16.04.2~),
- libkf5messagecomposer-dev,
- libkf5mimetreeparser-dev,
- libkf5newstuff-dev (>= 5.19.0~),
- libkf5notifyconfig-dev (>= 5.19.0~),
- libkf5pimtextedit-dev (>= 15.12~),
- libkf5service-dev (>= 5.19.0~),
- libkf5sonnet-dev (>= 5.19.0~),
- libkf5templateparser-dev,
- libkf5texteditor-dev (>= 5.19.0~),
- libkf5textwidgets-dev (>= 5.16.0~),
- libkf5wallet-dev (>= 5.19.0~),
- libkf5webengineviewer-dev,
- 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~),
- libphonon4qt5-dev,
- libphonon4qt5experimental-dev,
- libqt5opengl5-dev (>= 5.5.0~),
- libqt5webchannel5-dev | libqt5webchannel-dev,
- libqt5webkit5-dev (>= 5.5.0~),
- libqt5x11extras5-dev (>= 5.4.0~),
libx11-dev,
pkg-config,
- pkg-kde-tools (>= 0.12),
- qtbase5-dev (>= 5.5.0~),
- qtdeclarative5-dev (>= 5.4.0~),
- qttools5-dev (>= 5.5.0~),
- qtwebengine5-dev | libqt5webengine5-dev,
+ pkg-kde-tools-neon,
+ qt6-5compat-dev,
+ qt6-base-dev,
+ qt6-declarative-dev,
+ qt6-phonon-dev,
+ qt6-tools-dev,
+ qt6-webchannel-dev | qt6-webchannel-dev,
+ qt6-webengine-dev | qt6-webengine-dev,
shared-mime-info,
xsltproc,
zlib1g-dev
@@ -83,7 +75,7 @@ Vcs-Git: https://anonscm.debian.org/git/pkg-kde/applications/kontact.git
Package: kontact
Architecture: any
-Depends: kdepim-runtime, libqt5webengine5, ${misc:Depends}, ${shlibs:Depends}
+Depends: kdepim-runtime, qt6-webengine, ${misc:Depends}, ${shlibs:Depends}
Recommends: accountwizard, akregator, kaddressbook, kmail, knotes, korganizer
Suggests: gnokii
Breaks: kdepim-doc (<= 4:16.12.0),
diff --git a/debian/rules b/debian/rules
index 0353058..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='kontact-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
diff --git a/debian/tests/control b/debian/tests/control
index 9c85191..06d5397 100644
--- a/debian/tests/control
+++ b/debian/tests/control
@@ -1,5 +1,12 @@
Tests: testsuite
-Depends: @, @builddeps@, build-essential,
- xvfb, xauth, dbus-x11,
- akonadi-backend-sqlite, kinit, libkf5akonadi-dev-bin, libgl1-mesa-dri
+Depends: akonadi-backend-sqlite,
+ build-essential,
+ dbus-x11,
+ kinit,
+ libgl1-mesa-dri,
+ libkf5akonadi-dev-bin,
+ xauth,
+ xvfb,
+ @,
+ @builddeps@
Restrictions: build-needed
More information about the Neon-commits
mailing list