[neon/kde/akonadi/Neon/unstable] debian: port to kf6
Carlos De Maine
null at kde.org
Sun Sep 24 03:36:26 BST 2023
Git commit e04ae5d1a9e6b5ebf8a28661554a606de5a15b11 by Carlos De Maine.
Committed on 24/09/2023 at 04:25.
Pushed by carlosdem into branch 'Neon/unstable'.
port to kf6
M +1 -0 debian/akonadi-backend-sqlite.install
M +14 -16 debian/control
M +0 -1 debian/copyright
M +6 -6 debian/kpim6-akonadi-dev.install
M +1 -1 debian/kpim6-akonadi.install
M +2 -26 debian/rules
https://invent.kde.org/neon/kde/akonadi/-/commit/e04ae5d1a9e6b5ebf8a28661554a606de5a15b11
diff --git a/debian/akonadi-backend-sqlite.install b/debian/akonadi-backend-sqlite.install
index e69de29..8b13789 100644
--- a/debian/akonadi-backend-sqlite.install
+++ b/debian/akonadi-backend-sqlite.install
@@ -0,0 +1 @@
+
diff --git a/debian/control b/debian/control
index 465ec3a..d38ac79 100644
--- a/debian/control
+++ b/debian/control
@@ -8,28 +8,28 @@ Uploaders: Sune Vuorela <debian at pusling.com>,
Build-Depends: cmake,
debhelper-compat (= 13),
dh-apparmor,
- extra-cmake-modules,
kdesignerplugin,
- kgendesignerplugin,
- libaccounts-glib-dev,
- libaccounts-qt6-dev,
- libboost-dev (>= 1.34.0~),
- libkaccounts6-dev,
+ kf6-extra-cmake-modules,
+ kf6-kcolorscheme-dev,
kf6-kcompletion-dev,
kf6-kconfig-dev,
kf6-kconfigwidgets-dev,
- kf6-kcolorscheme-dev,
kf6-kcoreaddons-dev,
kf6-kcrash-dev,
kf6-kdbusaddons-dev,
kf6-ki18n-dev,
kf6-kiconthemes-dev,
+ kf6-kio-dev,
kf6-kitemmodels-dev,
kf6-kitemviews-dev,
- kf6-kio-dev,
kf6-kwidgetsaddons-dev,
kf6-kwindowsystem-dev,
kf6-kxmlgui-dev,
+ kgendesignerplugin,
+ libaccounts-glib-dev,
+ libaccounts-qt6-dev,
+ libboost-dev (>= 1.34.0~),
+ libkaccounts6-dev,
liblzma-dev,
libmariadb-dev-compat,
libsqlite3-dev (>= 3.6.23),
@@ -61,9 +61,9 @@ Description: development files for the KDE Development Platform PIM libraries
Package: akonadi-backend-mysql
Section: misc
Architecture: all
-Depends: qt6-base,
- mariadb-client-core-10.6,
+Depends: mariadb-client-core-10.6,
mariadb-server-core-10.6,
+ qt6-base,
${misc:Depends}
Recommends: akonadi-server
Description: MySQL storage backend for Akonadi
@@ -108,11 +108,11 @@ Package: kpim6-akonadi-dev
Section: libdevel
X-Neon-MergedPackage: true
Architecture: any
-Depends: libboost-dev (>= 1.34.0~),
- kpim6-akonadi (= ${binary:Version}),
- kf6-kcompletion-dev,
+Depends: kf6-kcompletion-dev,
kf6-kitemmodels-dev,
kf6-kxmlgui-dev,
+ kpim6-akonadi (= ${binary:Version}),
+ libboost-dev (>= 1.34.0~),
qt6-base-dev,
${misc:Depends},
${shlibs:Depends}
@@ -122,13 +122,11 @@ Description: development files for the KDE Development Platform PIM libraries
.
This package is part of the KDE Development Platform PIM libraries module.
-
Package: kpim6-akonadi
Architecture: any
X-Neon-MergedPackage: true
Multi-Arch: same
-Depends: ${misc:Depends},
- ${shlibs:Depends}
+Depends: ${misc:Depends}, ${shlibs:Depends}
Description: Akonadi core library
This library contains Akonadi PIM data server core classes.
.
diff --git a/debian/copyright b/debian/copyright
index 6966204..5e0d098 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -342,4 +342,3 @@ License: LGPL-2.1+3+KDEeV
.
The complete text of the GNU Lesser General Public License version 3
can be found in `/usr/share/common-licenses/LGPL-3'.
-
diff --git a/debian/kpim6-akonadi-dev.install b/debian/kpim6-akonadi-dev.install
index 2d538a0..da37660 100644
--- a/debian/kpim6-akonadi-dev.install
+++ b/debian/kpim6-akonadi-dev.install
@@ -1,5 +1,7 @@
usr/bin/akonadi2xml
+usr/bin/akonadi_knut_resource
usr/bin/akonaditest
+usr/include/KPim6/Akonadi/akonadi/
usr/include/KPim6/AkonadiAgentBase/
usr/include/KPim6/AkonadiCore/
usr/include/KPim6/AkonadiWidgets/
@@ -7,6 +9,7 @@ usr/include/KPim6/AkonadiXml/
usr/lib/*/cmake/KPim6Akonadi/
usr/lib/*/libKPim6AkonadiAgentBase.so
usr/lib/*/libKPim6AkonadiCore.so
+usr/lib/*/libKPim6AkonadiPrivate.so
usr/lib/*/libKPim6AkonadiWidgets.so
usr/lib/*/libKPim6AkonadiXml.so
usr/lib/*/qt6/mkspecs/modules/qt_AkonadiAgentBase.pri
@@ -14,12 +17,9 @@ usr/lib/*/qt6/mkspecs/modules/qt_AkonadiCore.pri
usr/lib/*/qt6/mkspecs/modules/qt_AkonadiWidgets.pri
usr/lib/*/qt6/mkspecs/modules/qt_AkonadiXml.pri
usr/lib/*/qt6/plugins/designer/akonadi6widgets.so
-usr/share/kdevappwizard/
-usr/share/kf6/akonadi/kcfg2dbus.xsl
-usr/bin/akonadi_knut_resource
usr/lib/*/qt6/plugins/pim6/akonadi/akonadi_test_searchplugin.so
usr/share/akonadi/agents/knutresource.desktop
-usr/share/kf6/akonadi_knut_resource/knut-template.xml
-usr/include/KPim6/Akonadi/akonadi/
-usr/lib/*/libKPim6AkonadiPrivate.so
usr/share/dbus-1/interfaces/
+usr/share/kdevappwizard/
+usr/share/kf6/akonadi/kcfg2dbus.xsl
+usr/share/kf6/akonadi_knut_resource/knut-template.xml
diff --git a/debian/kpim6-akonadi.install b/debian/kpim6-akonadi.install
index e22f431..fd3d1e3 100644
--- a/debian/kpim6-akonadi.install
+++ b/debian/kpim6-akonadi.install
@@ -1,3 +1,3 @@
-usr/lib/*/libKPim6*.so.6
usr/lib/*/libKPim6*.so.*.*
+usr/lib/*/libKPim6*.so.6
usr/share/locale
diff --git a/debian/rules b/debian/rules
index 3178b82..3d69b0d 100644
--- a/debian/rules
+++ b/debian/rules
@@ -1,30 +1,6 @@
#!/usr/bin/make -f
-
-libpkgs_gen_strict_local_shlibs = $(libpkgs_all_packages)
-
-backend_packages = $(filter akonadi-backend-%,$(shell dh_listpackages))
-
+# SPDX-License-Identifier: LGPL-2.0-or-later
+# SPDX-FileCopyrightText: 2023 Jonathan Riddell <jr at jriddell.org>
%:
dh $@ --with kf6 --buildsystem kf6
-
-override_dh_shlibdeps:
- dh_shlibdeps -l$(CURDIR)/debian/$(shell dh_listpackages | head -n1)/usr/kf6/lib/$(DEB_HOST_MULTIARCH)/
-
-override_dh_auto_configure:
- dh_auto_configure -- -DMYSQLD_EXECUTABLE:STRING=/usr/sbin/mysqld-akonadi \
- -DBUILD_TESTING=OFF -DBUILD_TOOLS=ON \
- -D_testrunner=/usr/bin/akonaditest
-
-override_dh_installinit:
- dh_installinit
- dh_apparmor -pakonadi-backend-mysql --profile-name=mysqld_akonadi
-
-override_dh_installdocs:
- dh_installdocs
-
-override_dh_makeshlibs:
- dh_makeshlibs -V -- -c0
-
-override_dh_auto_test:
- # Avoid tests extra build dependencies, check them with autopkgtests
More information about the Neon-commits
mailing list