[neon/kde/pimcommon/Neon/unstable] debian: port to kf6
Carlos De Maine
null at kde.org
Sun Sep 24 12:07:04 BST 2023
Git commit 1a2b922b08242dd757b37a8b08fc6554e8a092ff by Carlos De Maine.
Committed on 24/09/2023 at 08:07.
Pushed by carlosdem into branch 'Neon/unstable'.
port to kf6
M +41 -45 debian/control
M +2 -2 debian/libkf5pimcommon-data.install
M +4 -4 debian/libkf5pimcommon-dev.install
M +1 -1 debian/libkf5pimcommon-plugins.install
M +4 -8 debian/rules
https://invent.kde.org/neon/kde/pimcommon/-/commit/1a2b922b08242dd757b37a8b08fc6554e8a092ff
diff --git a/debian/control b/debian/control
index 405564d..903b0c1 100644
--- a/debian/control
+++ b/debian/control
@@ -5,39 +5,36 @@ 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-compat (= 13),
- extra-cmake-modules (>= 5.19.0~),
- libgrantlee5-dev (>= 5.0~),
- libkf5akonadi-dev (>= 4:5.2.0~),
- libkf5akonadicontact-dev (>= 5.2.0~),
- libkf5akonadimime-dev (>= 5.2.0~),
- libkf5akonadisearch-dev,
- libkf5archive-dev (>= 5.19.0~),
- libkf5codecs-dev (>= 5.19.0~),
- libkf5config-dev (>= 5.19.0~),
- libkf5contacteditor-dev (>= 17.04.0~),
- libkf5contacts-dev (>= 5.2.0~),
- libkf5dbusaddons-dev (>= 5.19.0~),
- libkf5grantleetheme-dev,
- libkf5i18n-dev (>= 5.19.0~),
- libkf5kdelibs4support-dev (>= 5.19.0~),
- libkf5ktextaddons-dev,
- libkf5libkdepim-dev (>= 5.2.0~),
- libkf5mime-dev (>= 5.2.0~),
- libkf5newstuff-dev (>= 5.19.0~),
- libkf5imap-dev,
- libkf5pimtextedit-dev (>= 5.2.0~),
- libkf5purpose-dev,
- libkf5sonnet-dev (>= 5.19.0~),
- libkf5textwidgets-dev (>= 5.19.0~),
- libkf5wallet-dev (>= 5.19.0~),
- libkf5xmlgui-dev (>= 5.19.0~),
- libqt5webchannel-dev | libqt5webchannel5-dev,
- libqt5webengine5-dev | qtwebengine5-dev,
- libqt5webkit5-dev (>= 5.4.0~),
- pkg-kde-tools (>= 0.12),
- qtbase5-dev (>= 5.4.0~),
- qtscript5-dev (>= 5.4.0~),
- qttools5-dev (>= 5.4.0~),
+ kf6-codecs-dev,
+ kf6-extra-cmake-modules,
+ kf6-karchive-dev,
+ kf6-kconfig-dev,
+ kf6-kdbusaddons-dev,
+ kf6-ki18n-dev,
+ kf6-knewstuff-dev,
+ kf6-ktextaddons-dev,
+ kf6-ktexttemplate-dev,
+ kf6-ktextwidgets-dev,
+ kf6-kwallet-dev,
+ kf6-kxmlgui-dev,
+ kf6-purpose-dev,
+ kf6-sonnet-dev,
+ kpim6-akonadi-contact-dev,
+ kpim6-akonadi-dev,
+ kpim6-akonadi-mime-dev,
+ kpim6-akonadi-search-dev,
+ kpim6-contacteditor-dev,
+ kpim6-contacts-dev,
+ kpim6-grantleetheme-dev,
+ kpim6-imap-dev,
+ kpim6-kdepim-dev,
+ kpim6-mime-dev,
+ kpim6-pimtextedit-dev,
+ pkg-kde-tools-neon,
+ qt6-base-dev,
+ qt6-tools-dev,
+ qt6-webchannel-dev | qt6-webchannel-dev,
+ qt6-webengine-dev | qt6-webengine-dev,
xsltproc
Standards-Version: 3.9.8
Homepage: http://pim.kde.org/
@@ -91,18 +88,17 @@ Description: Common library for KDE PIM - plugins
Package: libkf5pimcommon-dev
Section: libdevel
Architecture: any
-Depends: libkf5akonadi-dev (>= 4:5.2.0~),
- libkf5akonadicontact-dev (>= 5.2.0~),
- libkf5config-dev (>= 5.19.0~),
- libkf5contacts-dev (>= 5.2.0~),
- libkf5grantleetheme-dev,
- libkf5imap-dev (>= 5.2.0~),
- libkf5pimcommon5 (= ${binary:Version}),
- libkf5pimcommonakonadi5 (= ${binary:Version}),
- libkf5pimtextedit-dev (>= 5.2.0~),
- libkf5textwidgets-dev (>= 5.19.0~),
- libkf5ktextaddons-dev,
- libkf5libkdepim-dev,
+Depends: kf6-kconfig-dev,
+ kf6-ktextaddons-dev,
+ kf6-ktextwidgets-dev,
+ kpim6-akonadi-contact-dev,
+ kpim6-akonadi-dev,
+ kpim6-contacts-dev,
+ kpim6-grantleetheme-dev,
+ kpim6-imap-dev,
+ kpim6-kdepim-dev,
+ kpim6-pimcommon (= ${binary:Version}),
+ kpim6-pimtextedit-dev,
${misc:Depends},
${shlibs:Depends}
Description: Common library for KDE PIM - devel files
diff --git a/debian/libkf5pimcommon-data.install b/debian/libkf5pimcommon-data.install
index cc65b67..07d89ef 100644
--- a/debian/libkf5pimcommon-data.install
+++ b/debian/libkf5pimcommon-data.install
@@ -1,3 +1,3 @@
usr/share/locale/
-usr/share/qlogging-categories5/pimcommon.categories
-usr/share/qlogging-categories5/pimcommon.renamecategories
+usr/share/qlogging-categories6/pimcommon.categories
+usr/share/qlogging-categories6/pimcommon.renamecategories
diff --git a/debian/libkf5pimcommon-dev.install b/debian/libkf5pimcommon-dev.install
index 18c7c54..5d8369d 100644
--- a/debian/libkf5pimcommon-dev.install
+++ b/debian/libkf5pimcommon-dev.install
@@ -1,8 +1,8 @@
-usr/include/KPim5/PimCommon/
-usr/include/KPim5/PimCommonAkonadi/
+usr/include/KPim6/PimCommon/
+usr/include/KPim6/PimCommonAkonadi/
usr/lib/*/cmake/KPim5PimCommon/
usr/lib/*/cmake/KPim5PimCommonAkonadi/
usr/lib/*/libKPim5PimCommon.so
usr/lib/*/libKPim5PimCommonAkonadi.so
-usr/lib/*/qt5/mkspecs/modules/qt_PimCommon.pri
-usr/lib/*/qt5/mkspecs/modules/qt_PimCommonAkonadi.pri
+usr/lib/*/qt6/mkspecs/modules/qt_PimCommon.pri
+usr/lib/*/qt6/mkspecs/modules/qt_PimCommonAkonadi.pri
diff --git a/debian/libkf5pimcommon-plugins.install b/debian/libkf5pimcommon-plugins.install
index 21152d1..bc669e2 100644
--- a/debian/libkf5pimcommon-plugins.install
+++ b/debian/libkf5pimcommon-plugins.install
@@ -1 +1 @@
-usr/lib/*/qt5/plugins/
+usr/lib/*/qt6/plugins/
diff --git a/debian/rules b/debian/rules
index 30b95d6..3d69b0d 100644
--- 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: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_test:
- # Disable dh_auto_test at build time
- :
+%:
+ dh $@ --with kf6 --buildsystem kf6
More information about the Neon-commits
mailing list