[neon/kde/libksieve/Neon/unstable] debian: port to kf6
Carlos De Maine
null at kde.org
Sun Sep 24 10:43:25 BST 2023
Git commit 830507bb329d2d549a5780a0acd1a4eab133c668 by Carlos De Maine.
Committed on 24/09/2023 at 08:06.
Pushed by carlosdem into branch 'Neon/unstable'.
port to kf6
M +27 -34 debian/control
M +2 -2 debian/libkf5ksieve-data.install
M +4 -4 debian/libkf5ksieve-dev.install
M +4 -10 debian/rules
https://invent.kde.org/neon/kde/libksieve/-/commit/830507bb329d2d549a5780a0acd1a4eab133c668
diff --git a/debian/control b/debian/control
index 3baea80..7fc7b85 100644
--- a/debian/control
+++ b/debian/control
@@ -5,27 +5,27 @@ Maintainer: Debian/Kubuntu Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
Uploaders: Maximiliano Curia <maxy at debian.org>
Build-Depends: cmake (>= 3.0~),
debhelper (>= 11),
- extra-cmake-modules (>= 5.47.0~),
- libkf5archive-dev (>= 5.47.0~),
- libkf5doctools-dev (>= 5.47.0~),
- libkf5i18n-dev (>= 5.47.0~),
- libkf5iconthemes-dev (>= 5.47.0~),
- libkf5identitymanagement-dev (>= 18.08.3~),
- libkf5imap-dev (>= 18.08.3~),
- libkf5kio-dev (>= 5.47.0~),
- libkf5ktextaddons-dev,
- libkf5libkdepim-dev (>= 4:18.08.3~),
- libkf5mailtransport-dev (>= 18.08.3~),
- libkf5mime-dev (>= 18.08.3~),
- libkf5newstuff-dev (>= 5.47.0~),
- libkf5pimcommon-dev (>= 4:18.08.3~),
- libkf5pimtextedit-dev (>= 18.08.3~),
- libkf5syntaxhighlighting-dev (>= 5.47.0~),
- libkf5windowsystem-dev (>= 5.47.0~),
+ kf6-extra-cmake-modules,
+ kf6-karchive-dev,
+ kf6-kdoctools-dev,
+ kf6-ki18n-dev,
+ kf6-kiconthemes-dev,
+ kf6-kio-dev,
+ kf6-knewstuff-dev,
+ kf6-ktextaddons-dev,
+ kf6-kwindowsystem-dev,
+ kf6-syntax-highlighting-dev,
+ kpim6-identitymanagement-dev,
+ kpim6-imap-dev,
+ kpim6-kdepim-dev,
+ kpim6-mailtransport-dev,
+ kpim6-mime-dev,
+ kpim6-pimcommon-dev,
+ kpim6-pimtextedit-dev,
libsasl2-dev,
- pkg-kde-tools (>= 0.12),
- qtbase5-dev (>= 5.9.0~),
- qtwebengine5-dev (>= 5.9.0~),
+ pkg-kde-tools-neon,
+ qt6-base-dev,
+ qt6-webengine-dev,
xauth,
xvfb
Standards-Version: 4.3.0
@@ -52,9 +52,7 @@ Description: Sieve mail filtering language support for kdepim, kio slave
Package: libkf5kmanagesieve5
Architecture: any
Multi-Arch: same
-Depends: libkf5ksieve-data (= ${source:Version}),
- ${misc:Depends},
- ${shlibs:Depends}
+Depends: kpim6-ksieve (= ${source:Version}), ${misc:Depends}, ${shlibs:Depends}
Description: Sieve remote script management support for kdepim, library
This library implements a subset of the protocol for remotely managing Sieve
scripts (RFC 5804). Among other basic operations, it provides an easy to use
@@ -82,11 +80,10 @@ Package: libkf5ksieve-dev
Section: libdevel
Architecture: any
Multi-Arch: same
-Depends: libkf5kmanagesieve5 (= ${binary:Version}),
- libkf5ksieve5 (= ${binary:Version}),
- libkf5ksieveui5 (= ${binary:Version}),
- libkf5pimcommon-dev (>= 4:18.08.3~),
- qtbase5-dev (>= 5.9.0~),
+Depends: kpim6-ksieve (= ${binary:Version}),
+ kpim6-pimcommon-dev,
+ kpim6-sieve (= ${binary:Version}),
+ qt6-base-dev,
${misc:Depends},
${shlibs:Depends}
Description: Sieve mail filtering language support for kdepim, development files
@@ -98,9 +95,7 @@ Description: Sieve mail filtering language support for kdepim, development files
Package: libkf5ksieve5
Architecture: any
Multi-Arch: same
-Depends: libkf5ksieve-data (= ${source:Version}),
- ${misc:Depends},
- ${shlibs:Depends}
+Depends: kpim6-ksieve (= ${source:Version}), ${misc:Depends}, ${shlibs:Depends}
Description: Sieve mail filtering language support for kdepim, library
This library implements a parser and lexer for Sieve, the mail filtering
language (RFC 3028).
@@ -110,9 +105,7 @@ Description: Sieve mail filtering language support for kdepim, library
Package: libkf5ksieveui5
Architecture: any
Multi-Arch: same
-Depends: libkf5ksieve-data (= ${source:Version}),
- ${misc:Depends},
- ${shlibs:Depends}
+Depends: kpim6-ksieve (= ${source:Version}), ${misc:Depends}, ${shlibs:Depends}
Description: Sieve mail filtering language support for kdepim, GUI library
This library implements GUI dialogs and elements which enable users to easily
create, edit and manage their mail filters on the mail servers which support
diff --git a/debian/libkf5ksieve-data.install b/debian/libkf5ksieve-data.install
index 6492056..b59f233 100644
--- a/debian/libkf5ksieve-data.install
+++ b/debian/libkf5ksieve-data.install
@@ -1,5 +1,5 @@
usr/share/knsrcfiles/ksieve_script.knsrc
usr/share/locale/*/LC_MESSAGES/libksieve.mo
-usr/share/qlogging-categories5/libksieve.categories
-usr/share/qlogging-categories5/libksieve.renamecategories
+usr/share/qlogging-categories6/libksieve.categories
+usr/share/qlogging-categories6/libksieve.renamecategories
usr/share/sieve/
diff --git a/debian/libkf5ksieve-dev.install b/debian/libkf5ksieve-dev.install
index 53c30fc..589d8fb 100644
--- a/debian/libkf5ksieve-dev.install
+++ b/debian/libkf5ksieve-dev.install
@@ -1,8 +1,8 @@
-usr/include/KPim5/
-usr/include/KF5/KSieve/libksieve_version.h
+usr/include/KF6/KSieve/libksieve_version.h
+usr/include/KPim6/
usr/lib/*/cmake/KPim5LibKSieve/
usr/lib/*/libKPim5KManageSieve.so
usr/lib/*/libKPim5KSieve.so
usr/lib/*/libKPim5KSieveUi.so
-usr/lib/*/qt5/mkspecs/modules/qt_KManageSieve.pri
-usr/lib/*/qt5/mkspecs/modules/qt_KSieveUi.pri
+usr/lib/*/qt6/mkspecs/modules/qt_KManageSieve.pri
+usr/lib/*/qt6/mkspecs/modules/qt_KSieveUi.pri
diff --git a/debian/rules b/debian/rules
index 0a29fe7..3d69b0d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,12 +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:16.04.3-9~
-
-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:
- - xvfb-run -a --server-args="-screen 0 1024x768x24 +extension GLX" --\
- dh_auto_test --no-parallel
+%:
+ dh $@ --with kf6 --buildsystem kf6
More information about the Neon-commits
mailing list