[neon/kde/messagelib/Neon/unstable] debian: port to kf6

Carlos De Maine null at kde.org
Sun Sep 24 10:20:45 BST 2023


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

port to kf6

M  +66   -70   debian/control
M  +3    -3    debian/kf5-messagelib-data.install
M  +5    -5    debian/libkf5messagecomposer-dev.install
M  +2    -2    debian/libkf5messagecore-dev.install
M  +2    -2    debian/libkf5messagelist-dev.install
M  +2    -2    debian/libkf5messageviewer-dev.install
M  +2    -2    debian/libkf5messageviewer5.install
M  +1    -1    debian/libkf5mimetreeparser-dev.install
M  +2    -2    debian/libkf5templateparser-dev.install
M  +2    -2    debian/libkf5webengineviewer-dev.install
M  +4    -8    debian/rules

https://invent.kde.org/neon/kde/messagelib/-/commit/506e2c7d54df0f03bb42561117bfa14ca1ce6ffa

diff --git a/debian/control b/debian/control
index 87d5eef..c36e403 100644
--- a/debian/control
+++ b/debian/control
@@ -5,51 +5,47 @@ 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~),
                git,
+               kf6-codecs-dev,
+               kf6-extra-cmake-modules,
+               kf6-karchive-dev,
+               kf6-kcompletion-dev,
+               kf6-kconfig-dev,
+               kf6-ki18n-dev,
+               kf6-kiconthemes-dev,
+               kf6-kitemviews-dev,
+               kf6-knewstuff-dev,
+               kf6-knotifications-dev,
+               kf6-ktextaddons-dev,
+               kf6-ktexttemplate-dev,
+               kf6-kwindowsystem-dev,
+               kf6-kxmlgui-dev,
+               kpim6-akonadi-dev,
+               kpim6-akonadi-mime-dev,
+               kpim6-akonadi-notes-dev,
+               kpim6-akonadi-search-dev,
+               kpim6-contacteditor-dev,
+               kpim6-contacts-dev,
+               kpim6-grantleetheme-dev,
+               kpim6-gravatar-dev,
+               kpim6-identitymanagement-dev,
+               kpim6-kdepim-dev,
+               kpim6-kleo-dev,
+               kpim6-ldap-dev,
+               kpim6-mailtransport-dev,
+               kpim6-mbox-dev,
+               kpim6-mime-dev,
+               kpim6-pimcommon-dev,
+               kpim6-pimtextedit-dev,
                libgpgme-dev,
                libgpgmepp-dev,
-               libgrantlee5-dev (>= 5.0~),
-               libkf5akonadi-dev (>= 4:5.2.0~),
-               libkf5akonadimime-dev (>= 5.2.0~),
-               libkf5akonadinotes-dev (>= 5.2.0~),
-               libkf5akonadisearch-dev (>= 5.0.42~),
-               libkf5archive-dev (>= 5.19.0~),
-               libkf5codecs-dev (>= 5.19.0~),
-               libkf5completion-dev (>= 5.19.0~),
-               libkf5config-dev (>= 5.19.0~),
-               libkf5contacteditor-dev (>= 17.04.0~),
-               libkf5contacts-dev (>= 5.2.0~),
-               libkf5grantleetheme-dev (>= 5.2.0~),
-               libkf5gravatar-dev (>= 5.2.0~),
-               libkf5i18n-dev (>= 5.19.0~),
-               libkf5iconthemes-dev (>= 5.19.0~),
-               libkf5identitymanagement-dev (>= 5.2.40~),
-               libkf5itemviews-dev (>= 5.19.0~),
-               libkf5notifications-dev,
-               libkf5ktextaddons-dev,
-               libkf5ldap-dev (>= 5.2.0~),
-               libkf5libkdepim-dev (>= 5.2.0~),
-               libkf5libkleo-dev (>= 5.2.0~),
-               libkf5mailtransport-dev (>= 5.2.40~),
-               libkf5mbox-dev (>= 5.2.0~),
-               libkf5mime-dev (>= 5.2.40~),
-               libkf5newstuff-dev (>= 5.19.0~),
-               libkf5pimcommon-dev (>= 5.2.0~),
-               libkf5pimtextedit-dev (>= 5.2.40~),
-               libkf5pimtextedittexttospeech-dev,
-               libkf5webkit-dev (>= 5.19.0~),
-               libkf5windowsystem-dev (>= 5.19.0~),
-               libkf5xmlgui-dev (>= 5.19.0~),
-               libqca-qt5-2-dev,
+               libqca-qt6-2-dev,
                libqgpgme-dev,
-               libqt5webchannel-dev | libqt5webchannel5-dev,
-               libqt5webengine5-dev | qtwebengine5-dev,
-               libqt5webkit5-dev (>= 5.4.0~),
-               pkg-kde-tools (>= 0.12),
-               qtbase5-dev (>= 5.4.0~),
-               qtbase5-private-dev (>= 5.4.0~),
-               qttools5-dev (>= 5.4.0~)
+               pkg-kde-tools-neon,
+               qt6-base-dev,
+               qt6-tools-dev,
+               qt6-webchannel-dev | qt6-webchannel-dev,
+               qt6-webengine-dev | qt6-webengine-dev
 Standards-Version: 3.9.8
 Homepage: http://pim.kde.org/
 Vcs-Browser: https://anonscm.debian.org/git/pkg-kde/applications/messagelib.git
@@ -76,7 +72,7 @@ Description: KDE PIM messaging library, data files
 Package: libkf5messagecomposer5
 Architecture: any
 Multi-Arch: same
-Depends: kf5-messagelib-data (= ${source:Version}),
+Depends: kpim6-messagelib (= ${source:Version}),
          ${misc:Depends},
          ${shlibs:Depends}
 Breaks: kdepim-addons (<< 16.08.1+p16.04+git20160922.0528-0)
@@ -91,14 +87,14 @@ Package: libkf5messagecomposer-dev
 Section: libdevel
 Architecture: any
 Multi-Arch: same
-Depends: libkf5akonadimime-dev,
-         libkf5identitymanagement-dev (>= 5.2.40~),
-         libkf5libkleo-dev (>= 5.2.0~),
-         libkf5messagecomposer5 (= ${binary:Version}),
-         libkf5messagecore-dev,
-         libkf5messageviewer-dev,
-         libkf5mime-dev,
-         libkf5pimcommon-dev,
+Depends: kpim6-akonadi-mime-dev,
+         kpim6-identitymanagement-dev,
+         kpim6-kleo-dev,
+         kpim6-messagecomposer (= ${binary:Version}),
+         kpim6-messagecore-dev,
+         kpim6-messageviewer-dev,
+         kpim6-mime-dev,
+         kpim6-pimcommon-dev,
          ${misc:Depends},
          ${shlibs:Depends}
 Description: KDE PIM messaging library, composer devel files
@@ -110,7 +106,7 @@ Description: KDE PIM messaging library, composer devel files
 Package: libkf5messagecore5
 Architecture: any
 Multi-Arch: same
-Depends: kf5-messagelib-data (= ${source:Version}),
+Depends: kpim6-messagelib (= ${source:Version}),
          ${misc:Depends},
          ${shlibs:Depends}
 Description: KDE PIM messaging library, core library
@@ -123,8 +119,8 @@ Package: libkf5messagecore-dev
 Section: libdevel
 Architecture: any
 Multi-Arch: same
-Depends: libkf5messagecore5 (= ${binary:Version}),
-         libkf5mime-dev,
+Depends: kpim6-messagecore (= ${binary:Version}),
+         kpim6-mime-dev,
          ${misc:Depends},
          ${shlibs:Depends}
 Description: KDE PIM messaging library, core devel files
@@ -136,7 +132,7 @@ Description: KDE PIM messaging library, core devel files
 Package: libkf5messagelist5
 Architecture: any
 Multi-Arch: same
-Depends: kf5-messagelib-data (= ${source:Version}),
+Depends: kpim6-messagelib (= ${source:Version}),
          ${misc:Depends},
          ${shlibs:Depends}
 Breaks: libmessagelist5
@@ -150,10 +146,10 @@ Description: KDE PIM messaging library, message list library
 Package: libkf5messagelist-dev
 Section: libdevel
 Architecture: any
-Depends: libkf5akonadi-dev,
-         libkf5akonadimime-dev,
-         libkf5messagelist5 (= ${binary:Version}),
-         libkf5mime-dev,
+Depends: kpim6-akonadi-dev,
+         kpim6-akonadi-mime-dev,
+         kpim6-messagelist (= ${binary:Version}),
+         kpim6-mime-dev,
          ${misc:Depends},
          ${shlibs:Depends}
 Description: KDE PIM messaging library, message list devel files
@@ -166,7 +162,7 @@ Description: KDE PIM messaging library, message list devel files
 Package: libkf5messageviewer5
 Architecture: any
 Multi-Arch: same
-Depends: kf5-messagelib-data (= ${source:Version}),
+Depends: kpim6-messagelib (= ${source:Version}),
          ${misc:Depends},
          ${shlibs:Depends}
 Breaks: kdepim-addons (<< 16.12.0), libmessageviewer5
@@ -180,11 +176,11 @@ Description: KDE PIM messaging library, message viewer library
 Package: libkf5messageviewer-dev
 Section: libdevel
 Architecture: any
-Depends: libkf5libkleo-dev,
-         libkf5messagecore-dev,
-         libkf5messageviewer5 (= ${binary:Version}),
-         libkf5mimetreeparser-dev,
-         libkf5pimcommon-dev,
+Depends: kpim6-kleo-dev,
+         kpim6-messagecore-dev,
+         kpim6-messageviewer (= ${binary:Version}),
+         kpim6-mimetreeparser-dev,
+         kpim6-pimcommon-dev,
          ${misc:Depends},
          ${shlibs:Depends}
 Description: KDE PIM messaging library, message viewer devel files
@@ -197,7 +193,7 @@ Description: KDE PIM messaging library, message viewer devel files
 Package: libkf5templateparser5
 Architecture: any
 Multi-Arch: same
-Depends: kf5-messagelib-data (= ${source:Version}),
+Depends: kpim6-messagelib (= ${source:Version}),
          ${misc:Depends},
          ${shlibs:Depends}
 Description: KMail template parser library
@@ -210,7 +206,7 @@ Description: KMail template parser library
 Package: libkf5templateparser-dev
 Section: libdevel
 Architecture: any
-Depends: libkf5templateparser5 (= ${binary:Version}),
+Depends: kpim6-templateparser (= ${binary:Version}),
          ${misc:Depends},
          ${shlibs:Depends}
 Description: KDE PIM messaging library, template parser devel files
@@ -233,8 +229,8 @@ Description: KDE PIM Mime Tree parser library
 Package: libkf5mimetreeparser-dev
 Section: libdevel
 Architecture: any
-Depends: libkf5mime-dev,
-         libkf5mimetreeparser5 (= ${binary:Version}),
+Depends: kpim6-mime-dev,
+         kpim6-mimetreeparser (= ${binary:Version}),
          ${misc:Depends},
          ${shlibs:Depends}
 Description: KDE PIM Mime Tree parser library devel files
@@ -254,8 +250,8 @@ Description: KDE's Qt Web Engine Viewer
 Package: libkf5webengineviewer-dev
 Section: libdevel
 Architecture: any
-Depends: libkf5webengineviewer5 (= ${binary:Version}),
-         qtwebengine5-dev,
+Depends: kpim6-messagelib (= ${binary:Version}),
+         qt6-webengine-dev,
          ${misc:Depends},
          ${shlibs:Depends}
 Description: KDE's Qt Web Engine Viewer devel files
diff --git a/debian/kf5-messagelib-data.install b/debian/kf5-messagelib-data.install
index 1b47904..f8a0b1d 100644
--- a/debian/kf5-messagelib-data.install
+++ b/debian/kf5-messagelib-data.install
@@ -1,11 +1,11 @@
 usr/share/config.kcfg/customtemplates_kfg.kcfg
 usr/share/config.kcfg/templatesconfiguration_kfg.kcfg
-usr/share/knotifications5/messageviewer.notifyrc
+usr/share/knotifications6/messageviewer.notifyrc
 usr/share/knsrcfiles/messageviewer_header_themes.knsrc
 usr/share/libmessageviewer/
 usr/share/locale/
 usr/share/messagelist/
 usr/share/messageviewer/
 usr/share/org.kde.syntax-highlighting/syntax/kmail-template.xml
-usr/share/qlogging-categories5/messagelib.categories
-usr/share/qlogging-categories5/messagelib.renamecategories
+usr/share/qlogging-categories6/messagelib.categories
+usr/share/qlogging-categories6/messagelib.renamecategories
diff --git a/debian/libkf5messagecomposer-dev.install b/debian/libkf5messagecomposer-dev.install
index e2046bf..049825c 100644
--- a/debian/libkf5messagecomposer-dev.install
+++ b/debian/libkf5messagecomposer-dev.install
@@ -1,8 +1,8 @@
-messagecomposer/src/job/abstractencryptjob.h usr/include/Pim5/messagecomposer/
-messagecomposer/src/job/contentjobbase.h usr/include/KPim5/messagecomposer/
-messagecomposer/src/part/infopart.h usr/include/KPim5/messagecomposer/part/
-usr/include/KPim5/MessageComposer/
 #usr/lib/*/cmake/KF5MessageComposer/
+messagecomposer/src/job/abstractencryptjob.h usr/include/Pim5/messagecomposer/
+messagecomposer/src/job/contentjobbase.h usr/include/KPim6/messagecomposer/
+messagecomposer/src/part/infopart.h usr/include/KPim6/messagecomposer/part/
+usr/include/KPim6/MessageComposer/
 usr/lib/*/cmake/KPim5MessageComposer/
 usr/lib/*/libKPim5MessageComposer.so
-usr/lib/*/qt5/mkspecs/modules/qt_MessageComposer.pri
+usr/lib/*/qt6/mkspecs/modules/qt_MessageComposer.pri
diff --git a/debian/libkf5messagecore-dev.install b/debian/libkf5messagecore-dev.install
index 4aba288..c93a902 100644
--- a/debian/libkf5messagecore-dev.install
+++ b/debian/libkf5messagecore-dev.install
@@ -1,5 +1,5 @@
-usr/include/KPim5/MessageCore/
 #usr/lib/*/cmake/KF5MessageCore/
+usr/include/KPim6/MessageCore/
 usr/lib/*/cmake/KPim5MessageCore/
 usr/lib/*/libKPim5MessageCore.so
-usr/lib/*/qt5/mkspecs/modules/qt_MessageCore.pri
+usr/lib/*/qt6/mkspecs/modules/qt_MessageCore.pri
diff --git a/debian/libkf5messagelist-dev.install b/debian/libkf5messagelist-dev.install
index 68fd67a..3056164 100644
--- a/debian/libkf5messagelist-dev.install
+++ b/debian/libkf5messagelist-dev.install
@@ -1,5 +1,5 @@
-usr/include/KPim5/MessageList/
 #usr/lib/*/cmake/KF5MessageList/
+usr/include/KPim6/MessageList/
 usr/lib/*/cmake/KPim5MessageList/
 usr/lib/*/libKPim5MessageList.so
-usr/lib/*/qt5/mkspecs/modules/qt_MessageList.pri
+usr/lib/*/qt6/mkspecs/modules/qt_MessageList.pri
diff --git a/debian/libkf5messageviewer-dev.install b/debian/libkf5messageviewer-dev.install
index 1e7daab..629d9a6 100644
--- a/debian/libkf5messageviewer-dev.install
+++ b/debian/libkf5messageviewer-dev.install
@@ -1,5 +1,5 @@
-usr/include/KPim5/MessageViewer/
 #usr/lib/*/cmake/KF5MessageViewer/
+usr/include/KPim6/MessageViewer/
 usr/lib/*/cmake/KPim5MessageViewer/
 usr/lib/*/libKPim5MessageViewer.so
-usr/lib/*/qt5/mkspecs/modules/qt_MessageViewer.pri
+usr/lib/*/qt6/mkspecs/modules/qt_MessageViewer.pri
diff --git a/debian/libkf5messageviewer5.install b/debian/libkf5messageviewer5.install
index 394c03d..14c9816 100644
--- a/debian/libkf5messageviewer5.install
+++ b/debian/libkf5messageviewer5.install
@@ -1,4 +1,4 @@
 usr/lib/*/libKPim5MessageViewer.so.5
 usr/lib/*/libKPim5MessageViewer.so.5.*
-usr/lib/*/qt5/plugins/pim5/messageviewer/grantlee/5.0/messageviewer_grantlee_extension.so
-usr/lib/*/qt5/plugins/pim5/messageviewer/headerstyle/messageviewer_defaultgrantleeheaderstyleplugin.so
+usr/lib/*/qt6/plugins/pim5/messageviewer/grantlee/5.0/messageviewer_grantlee_extension.so
+usr/lib/*/qt6/plugins/pim5/messageviewer/headerstyle/messageviewer_defaultgrantleeheaderstyleplugin.so
diff --git a/debian/libkf5mimetreeparser-dev.install b/debian/libkf5mimetreeparser-dev.install
index 7f0ea30..44f2a16 100644
--- a/debian/libkf5mimetreeparser-dev.install
+++ b/debian/libkf5mimetreeparser-dev.install
@@ -1,4 +1,4 @@
-usr/include/KPim5/MimeTreeParser/
 #usr/lib/*/cmake/KF5MimeTreeParser/
+usr/include/KPim6/MimeTreeParser/
 usr/lib/*/cmake/KPim5MimeTreeParser/
 usr/lib/*/libKPim5MimeTreeParser.so
diff --git a/debian/libkf5templateparser-dev.install b/debian/libkf5templateparser-dev.install
index bcd921e..e1691aa 100644
--- a/debian/libkf5templateparser-dev.install
+++ b/debian/libkf5templateparser-dev.install
@@ -1,5 +1,5 @@
-usr/include/KPim5/TemplateParser/
 #usr/lib/*/cmake/KF5TemplateParser/
+usr/include/KPim6/TemplateParser/
 usr/lib/*/cmake/KPim5TemplateParser/
 usr/lib/*/libKPim5TemplateParser.so
-usr/lib/*/qt5/mkspecs/modules/qt_TemplateParser.pri
+usr/lib/*/qt6/mkspecs/modules/qt_TemplateParser.pri
diff --git a/debian/libkf5webengineviewer-dev.install b/debian/libkf5webengineviewer-dev.install
index 2869f41..22d9b31 100644
--- a/debian/libkf5webengineviewer-dev.install
+++ b/debian/libkf5webengineviewer-dev.install
@@ -1,5 +1,5 @@
-usr/include/KPim5/WebEngineViewer/
 #usr/lib/*/cmake/KF5WebEngineViewer/
+usr/include/KPim6/WebEngineViewer/
 usr/lib/*/cmake/KPim5WebEngineViewer/
 usr/lib/*/libKPim5WebEngineViewer.so
-usr/lib/*/qt5/mkspecs/modules/qt_WebEngineViewer.pri
+usr/lib/*/qt6/mkspecs/modules/qt_WebEngineViewer.pri
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