[neon/kde/kmailtransport/Neon/unstable] debian: port to kf6
Carlos De Maine
null at kde.org
Sun Sep 24 11:57:58 BST 2023
Git commit 7e6696f31bfa8c5cdc58084826d6c407afb4baf2 by Carlos De Maine.
Committed on 24/09/2023 at 08:05.
Pushed by carlosdem into branch 'Neon/unstable'.
port to kf6
M +19 -21 debian/control
M +1 -0 debian/kde-config-mailtransport.install
M +2 -2 debian/libkf5mailtransport-dev.install
M +3 -3 debian/libkf5mailtransport5.install
M +1 -0 debian/libkf5mailtransportakonadi5.install
M +4 -11 debian/rules
https://invent.kde.org/neon/kde/kmailtransport/-/commit/7e6696f31bfa8c5cdc58084826d6c407afb4baf2
diff --git a/debian/control b/debian/control
index e6ec1c3..58a94e9 100644
--- a/debian/control
+++ b/debian/control
@@ -5,21 +5,20 @@ 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~),
- libkf5akonadi-dev (>= 4:15.12~),
- libkf5akonadimime-dev (>= 4:15.12~),
- libkf5configwidgets-dev (>= 5.19.0~),
- libkf5kcmutils-dev (>= 5.19.0~),
- libkf5kdelibs4support-dev (>= 5.12.0~),
- libkf5mime-dev (>= 15.12~),
- libkf5wallet-dev (>= 5.19.0~),
+ kf6-extra-cmake-modules,
+ kf6-kcmutils-dev,
+ kf6-kconfigwidgets-dev,
+ kf6-kwallet-dev,
+ kpim6-akonadi-dev,
+ kpim6-akonadi-mime-dev,
+ kpim6-mime-dev,
libkpimgapi-dev,
libkpimsmtp-dev,
libsasl2-dev,
pkg-config,
- pkg-kde-tools (>> 0.15.15),
- qt5keychain-dev,
- qtbase5-dev
+ pkg-kde-tools-neon,
+ qt6-base-dev,
+ qtkeychain-qt6-dev
Standards-Version: 3.9.8
Homepage: https://projects.kde.org/projects/kde/pim/kmailtransport
Vcs-Browser: https://anonscm.debian.org/git/pkg-kde/applications/kmailtransport.git
@@ -28,7 +27,7 @@ Vcs-Git: https://anonscm.debian.org/git/pkg-kde/applications/kmailtransport.git
Package: kmailtransport-akonadi
Architecture: any
Multi-Arch: no
-Depends: libkf5mailtransport5 (= ${binary:Version}),
+Depends: kpim6-mailtransport (= ${binary:Version}),
${misc:Depends},
${shlibs:Depends}
Replaces: ${kde-l10n:all}
@@ -45,11 +44,10 @@ Description: mail transport akonadi library
Package: libkf5mailtransport-dev
Section: libdevel
Architecture: any
-Depends: libkf5akonadimime-dev (>= 5.2.0~),
- libkf5mailtransport5 (= ${binary:Version}),
- libkf5mailtransportakonadi5 (= ${binary:Version}),
- libkf5mime-dev (>= 5.2.0~),
- libkf5wallet-dev (>= 5.19.0~),
+Depends: kf6-kwallet-dev,
+ kpim6-akonadi-mime-dev,
+ kpim6-mailtransport (= ${binary:Version}),
+ kpim6-mime-dev,
libsasl2-dev,
${misc:Depends}
Description: mail transport service library - development files
@@ -82,7 +80,7 @@ Description: mail transport service library - data files
Package: kde-config-mailtransport
Architecture: any
Multi-Arch: same
-Depends: libkf5mailtransport-data (= ${source:Version}),
+Depends: kpim6-mailtransport (= ${source:Version}),
${misc:Depends},
${shlibs:Depends}
Breaks: libkf5mailtransport5 (<< 15.07.90+git20150819.1000)
@@ -100,7 +98,7 @@ Description: mail transport service KCM
Package: libkf5mailtransport5
Architecture: any
Multi-Arch: same
-Depends: libkf5mailtransport-data (= ${source:Version}),
+Depends: kpim6-mailtransport (= ${source:Version}),
${misc:Depends},
${shlibs:Depends}
Recommends: kde-config-mailtransport
@@ -119,7 +117,7 @@ Description: mail transport service library
Package: libkf5mailtransportakonadi5
Architecture: any
Multi-Arch: same
-Depends: libkf5mailtransport-data (= ${source:Version}),
+Depends: kpim6-mailtransport (= ${source:Version}),
${misc:Depends},
${shlibs:Depends}
Recommends: kde-config-mailtransport
@@ -139,6 +137,6 @@ Package: kio-smtp
Section: oldlibs
Architecture: all
Priority: optional
-Depends: libkf5mailtransport5, ${misc:Depends}
+Depends: kpim6-mailtransport, ${misc:Depends}
Description: transitional package
This is a transitional package. It can safely be removed.
diff --git a/debian/kde-config-mailtransport.install b/debian/kde-config-mailtransport.install
index e69de29..8b13789 100644
--- a/debian/kde-config-mailtransport.install
+++ b/debian/kde-config-mailtransport.install
@@ -0,0 +1 @@
+
diff --git a/debian/libkf5mailtransport-dev.install b/debian/libkf5mailtransport-dev.install
index 99a767e..385fd5b 100644
--- a/debian/libkf5mailtransport-dev.install
+++ b/debian/libkf5mailtransport-dev.install
@@ -1,5 +1,5 @@
-usr/include/KPim5/
+usr/include/KPim6/
usr/lib/*/cmake/KF5MailTransport/
usr/lib/*/cmake/KPim5MailTransport/
usr/lib/*/libKPim5MailTransport.so
-usr/lib/*/qt5/mkspecs/modules/qt_KMailTransport.pri
+usr/lib/*/qt6/mkspecs/modules/qt_KMailTransport.pri
diff --git a/debian/libkf5mailtransport5.install b/debian/libkf5mailtransport5.install
index 43306c4..850d47f 100644
--- a/debian/libkf5mailtransport5.install
+++ b/debian/libkf5mailtransport5.install
@@ -1,6 +1,6 @@
usr/lib/*/libKPim5MailTransport.so.5
usr/lib/*/libKPim5MailTransport.so.5.*
-usr/lib/*/qt5/plugins/pim5/mailtransport/mailtransport_smtpplugin.so
+usr/lib/*/qt6/plugins/pim5/mailtransport/mailtransport_smtpplugin.so
usr/share/locale/*/LC_MESSAGES/libmailtransport5.mo
-usr/share/qlogging-categories5/kmailtransport.categories
-usr/share/qlogging-categories5/kmailtransport.renamecategories
+usr/share/qlogging-categories6/kmailtransport.categories
+usr/share/qlogging-categories6/kmailtransport.renamecategories
diff --git a/debian/libkf5mailtransportakonadi5.install b/debian/libkf5mailtransportakonadi5.install
index e69de29..8b13789 100644
--- a/debian/libkf5mailtransportakonadi5.install
+++ b/debian/libkf5mailtransportakonadi5.install
@@ -0,0 +1 @@
+
diff --git a/debian/rules b/debian/rules
index a1eb200..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_strip:
- $(overridden_command) --dbgsym-migration='libkf5mailtransport-dbg (<= 15.12.0-1~~)'
-
-override_dh_auto_test:
- # Disable auto test at build time, fakeroot breaks them
- :
+%:
+ dh $@ --with kf6 --buildsystem kf6
More information about the Neon-commits
mailing list