[neon/kde/akonadi/Neon/unstable] debian: more kpim6ing

Carlos De Maine null at kde.org
Sun Sep 24 04:24:09 BST 2023


Git commit 0a891d7fcd19e698fb5cd4a10964c35ae07cbf46 by Carlos De Maine.
Committed on 24/09/2023 at 05:24.
Pushed by carlosdem into branch 'Neon/unstable'.

more kpim6ing

D  +0    -1    debian/akonadi-backend-sqlite.install
D  +0    -16   debian/akonadi-server.install
M  +29   -43   debian/control
M  +17   -1    debian/kpim6-akonadi.install
R  +0    -0    debian/kpim6-akonadi.maintscript [from: debian/akonadi-server.maintscript - 100% similarity]
R  +0    -0    debian/kpim6-akonadi.manpages [from: debian/akonadi-server.manpages - 100% similarity]
M  +0    -1    debian/not-installed

https://invent.kde.org/neon/kde/akonadi/-/commit/0a891d7fcd19e698fb5cd4a10964c35ae07cbf46

diff --git a/debian/akonadi-backend-sqlite.install b/debian/akonadi-backend-sqlite.install
deleted file mode 100644
index 8b13789..0000000
--- a/debian/akonadi-backend-sqlite.install
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/debian/akonadi-server.install b/debian/akonadi-server.install
deleted file mode 100644
index 9caacc2..0000000
--- a/debian/akonadi-server.install
+++ /dev/null
@@ -1,16 +0,0 @@
-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
diff --git a/debian/control b/debian/control
index d38ac79..f29d1f1 100644
--- a/debian/control
+++ b/debian/control
@@ -8,7 +8,7 @@ Uploaders: Sune Vuorela <debian at pusling.com>,
 Build-Depends: cmake,
                debhelper-compat (= 13),
                dh-apparmor,
-               kdesignerplugin,
+#               kdesignerplugin,
                kf6-extra-cmake-modules,
                kf6-kcolorscheme-dev,
                kf6-kcompletion-dev,
@@ -25,7 +25,6 @@ Build-Depends: cmake,
                kf6-kwidgetsaddons-dev,
                kf6-kwindowsystem-dev,
                kf6-kxmlgui-dev,
-               kgendesignerplugin,
                libaccounts-glib-dev,
                libaccounts-qt6-dev,
                libboost-dev (>= 1.34.0~),
@@ -47,9 +46,26 @@ 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
+Package: kpim6-akonadi
+Architecture: any
+X-Neon-MergedPackage: true
+Multi-Arch: same
+Depends: ${misc:Depends}, ${shlibs:Depends}
+Description: Akonadi core library
+ This library contains Akonadi PIM data server core classes.
+ .
+ This package is part of the KDE Development Platform PIM libraries module.
+
+Package: kpim6-akonadi-dev
+Section: libdevel
+X-Neon-MergedPackage: true
 Architecture: any
-Depends: kpim6-akonadi (= ${binary:Version}),
+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}
 Description: development files for the KDE Development Platform PIM libraries
@@ -91,46 +107,16 @@ Description: PostgreSQL storage backend for Akonadi
  external PostgreSQL database is supported as well.
 
 Package: akonadi-backend-sqlite
-Section: misc
-Multi-Arch: same
-Architecture: any
-Pre-Depends: ${misc:Pre-Depends}
-Depends: qt6-base, ${misc:Depends}, ${shlibs:Depends}
-Recommends: akonadi-server
-Description: SQLite storage backend for Akonadi
- Akonadi is an extensible cross-desktop Personal Information Management (PIM)
- storage service. It provides a common framework for applications to store and
- access mail, calendars, addressbooks, and other PIM data.
- .
- This is a dummy transitional package and can be removed.
-
-Package: kpim6-akonadi-dev
-Section: libdevel
-X-Neon-MergedPackage: true
-Architecture: any
-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}
-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.
+Architecture: all
+Depends: kpim6-akonadi
+Description: Dummy transitional
+ Transitional dummy package.
 
-Package: kpim6-akonadi
-Architecture: any
-X-Neon-MergedPackage: true
-Multi-Arch: same
-Depends: ${misc:Depends}, ${shlibs:Depends}
-Description: Akonadi core library
- This library contains Akonadi PIM data server core classes.
- .
- This package is part of the KDE Development Platform PIM libraries module.
+Package: akonadi-server
+Architecture: all
+Depends: kpim6-akonadi
+Description: Dummy transitional
+ Transitional dummy package.
 
 Package: libkf6akonadi-data
 Architecture: all
diff --git a/debian/kpim6-akonadi.install b/debian/kpim6-akonadi.install
index fd3d1e3..af4577a 100644
--- a/debian/kpim6-akonadi.install
+++ b/debian/kpim6-akonadi.install
@@ -1,3 +1,19 @@
+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/lib/*/libKPim6*.so.*.*
 usr/lib/*/libKPim6*.so.6
-usr/share/locale
+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/locale/
+usr/share/mime/packages/akonadi-mime.xml
+usr/share/qlogging-categories6/akonadi.categories
+usr/share/qlogging-categories6/akonadi.renamecategories
diff --git a/debian/akonadi-server.maintscript b/debian/kpim6-akonadi.maintscript
similarity index 100%
rename from debian/akonadi-server.maintscript
rename to debian/kpim6-akonadi.maintscript
diff --git a/debian/akonadi-server.manpages b/debian/kpim6-akonadi.manpages
similarity index 100%
rename from debian/akonadi-server.manpages
rename to debian/kpim6-akonadi.manpages
diff --git a/debian/not-installed b/debian/not-installed
index 9a8aeb4..1b166b3 100644
--- a/debian/not-installed
+++ b/debian/not-installed
@@ -1,3 +1,2 @@
-usr/bin/asapcat
 etc/apparmor.d/postgresql_akonadi
 etc/apparmor.d/usr.bin.akonadiserver


More information about the Neon-commits mailing list