[neon/kde/akonadi/Neon/unstable] debian: Fix install files, add back akonadi-server

[Scarlett Moore]

Git commit f2393192dce544c9d3c9a96f826b0913428cbbe2 by Scarlett Moore.
Committed on 21/09/2023 at 18:59.
Pushed by scarlettmoore into branch 'Neon/unstable'.

Fix install files, add back akonadi-server

M  +3    -3    debian/akonadi-server.install
M  +11   -0    debian/control
M  +2    -22   debian/kf6-akonadi.install

https://invent.kde.org/neon/kde/akonadi/-/commit/f2393192dce544c9d3c9a96f826b0913428cbbe2

diff --git a/debian/akonadi-server.install b/debian/akonadi-server.install
index 2a60898..9caacc2 100644
--- a/debian/akonadi-server.install
+++ b/debian/akonadi-server.install
@@ -10,7 +10,7 @@ usr/share/config.kcfg/resourcebase.kcfg
 usr/share/dbus-1/services/org.freedesktop.Akonadi.Control.service
 usr/share/icons/hicolor/*/apps/akonadi.png
 usr/share/icons/hicolor/scalable/apps/akonadi.svgz
-usr/share/kf5/akonadi/akonadi-xml.xsd
+usr/share/kf6/akonadi/akonadi-xml.xsd
 usr/share/mime/packages/akonadi-mime.xml
-usr/share/qlogging-categories5/akonadi.categories
-usr/share/qlogging-categories5/akonadi.renamecategories
+usr/share/qlogging-categories6/akonadi.categories
+usr/share/qlogging-categories6/akonadi.renamecategories
diff --git a/debian/control b/debian/control
index 930499b..4e0b85f 100644
--- a/debian/control
+++ b/debian/control
@@ -47,6 +47,17 @@ Homepage: http://pim.kde.org/akonadi
 Vcs-Browser: https://salsa.debian.org/qt-kde-team/kde/akonadi
 Vcs-Git: https://salsa.debian.org/qt-kde-team/kde/akonadi.git
 
+Package: akonadi-server
+Architecture: any
+Depends: kf6-akonadi (= ${binary:Version}),
+         ${misc:Depends},
+         ${shlibs:Depends}
+Description: development files for the KDE Development Platform PIM libraries
+ This package contains development files for building software that uses
+ the KDE Development Platform Personal Information Management libraries.
+ .
+ This package is part of the KDE Development Platform PIM libraries module.
+
 Package: kf6-akonadi-dev
 Section: libdevel
 X-Neon-MergedPackage: true
diff --git a/debian/kf6-akonadi.install b/debian/kf6-akonadi.install
index 02fe7bf..2930303 100644
--- a/debian/kf6-akonadi.install
+++ b/debian/kf6-akonadi.install
@@ -1,23 +1,3 @@
 usr/lib/*/libKPim6*.so.6
-usr/lib/*/libKPim6*.so.6.*
-etc/apparmor.d/mariadbd_akonadi
-etc/apparmor.d/mysqld_akonadi
-etc/xdg/akonadi/mysql-global-mobile.conf
-etc/xdg/akonadi/mysql-global.conf
-usr/bin/akonadi_agent_launcher
-usr/bin/akonadi_agent_server
-usr/bin/akonadi_control
-usr/bin/akonadi_rds
-usr/bin/akonadictl
-usr/bin/akonadiselftest
-usr/bin/akonadiserver
-usr/bin/asapcat
-usr/share/config.kcfg/resourcebase.kcfg
-usr/share/dbus-1/services/org.freedesktop.Akonadi.Control.service
-usr/share/icons/hicolor/*/apps/akonadi.png
-usr/share/icons/hicolor/scalable/apps/akonadi.svgz
-usr/share/kf6/akonadi/akonadi-xml.xsd
-usr/share/mime/packages/akonadi-mime.xml
-usr/share/qlogging-categories6/akonadi.categories
-usr/share/qlogging-categories6/akonadi.renamecategories
-usr/share/locale/*/LC_MESSAGES/libakonadi6.mo
+usr/lib/*/libKPim6*.so.*.*
+