[neon/kde/akonadi/Neon/unstable] debian: modernise, drop qt4 cruft and also the mysql as default dep.

Carlos De Maine null at kde.org
Sat Jul 22 10:29:07 BST 2023


Git commit c72494c0c8f48e5f36c2b08cd30564307773f033 by Carlos De Maine.
Committed on 22/07/2023 at 09:28.
Pushed by carlosdem into branch 'Neon/unstable'.

modernise, drop qt4 cruft and also the mysql as default dep.

D  +0    -1    debian/compat
M  +24   -128  debian/control

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

diff --git a/debian/compat b/debian/compat
deleted file mode 100644
index b4de394..0000000
--- a/debian/compat
+++ /dev/null
@@ -1 +0,0 @@
-11
diff --git a/debian/control b/debian/control
index 6268fba..56151be 100644
--- a/debian/control
+++ b/debian/control
@@ -5,30 +5,30 @@ Maintainer: Debian/Kubuntu Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
 Uploaders: Sune Vuorela <debian at pusling.com>,
            Modestas Vainius <modax at debian.org>,
            Maximiliano Curia <maxy at debian.org>
-Build-Depends: cmake (>= 3.0~),
-               debhelper (>= 11),
+Build-Depends: cmake,
+               debhelper-compat (= 13),
                dh-apparmor,
-               extra-cmake-modules (>= 5.47.0~),
-               kdesignerplugin (>= 5.39.0~),
-               kgendesignerplugin (>= 5.47.0~),
+               extra-cmake-modules,
+               kdesignerplugin,
+               kgendesignerplugin,
                libaccounts-glib-dev,
                libaccounts-qt5-dev,
                libboost-dev (>= 1.34.0~),
                libkaccounts-dev,
-               libkf5completion-dev (>= 5.47.0~),
-               libkf5config-dev (>= 5.47.0~),
-               libkf5configwidgets-dev (>= 5.47.0~),
-               libkf5coreaddons-dev (>= 5.47.0~),
-               libkf5crash-dev (>= 5.47.0~),
-               libkf5dbusaddons-dev (>= 5.47.0~),
-               libkf5i18n-dev (>= 5.47.0~),
-               libkf5iconthemes-dev (>= 5.47.0~),
-               libkf5itemmodels-dev (>= 5.47.0~),
-               libkf5itemviews-dev (>= 5.47.0~),
-               libkf5kio-dev (>= 5.47.0~),
-               libkf5widgetsaddons-dev (>= 5.47.0~),
-               libkf5windowsystem-dev (>= 5.47.0~),
-               libkf5xmlgui-dev (>= 5.47.0~),
+               libkf5completion-dev,
+               libkf5config-dev,
+               libkf5configwidgets-dev,
+               libkf5coreaddons-dev,
+               libkf5crash-dev,
+               libkf5dbusaddons-dev,
+               libkf5i18n-dev,
+               libkf5iconthemes-dev,
+               libkf5itemmodels-dev,
+               libkf5itemviews-dev,
+               libkf5kio-dev,
+               libkf5widgetsaddons-dev,
+               libkf5windowsystem-dev,
+               libkf5xmlgui-dev,
                liblzma-dev,
                libmariadb-dev-compat,
                libsqlite3-dev (>= 3.6.23),
@@ -42,7 +42,7 @@ Build-Depends: cmake (>= 3.0~),
                qttools5-dev,
                shared-mime-info (>= 1.3~),
                xsltproc
-Standards-Version: 4.3.0
+Standards-Version: 4.6.2
 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
@@ -55,8 +55,6 @@ Depends: libqt5sql5-mysql,
          mariadb-server-core-10.6,
          ${misc:Depends}
 Recommends: akonadi-server
-Replaces: akonadi-server (<< 1.3.60~)
-Breaks: akonadi-server (<< 1.3.60~)
 Description: MySQL 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
@@ -72,8 +70,6 @@ Section: misc
 Architecture: all
 Depends: libqt5sql5-psql, ${misc:Depends}
 Recommends: akonadi-server, postgresql
-Replaces: akonadi-server (<< 1.3.60~)
-Breaks: akonadi-server (<< 1.3.60~)
 Description: PostgreSQL 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
@@ -101,18 +97,12 @@ Description: SQLite storage backend for Akonadi
 Package: akonadi-server
 Section: net
 Architecture: any
-Depends: akonadi-backend-mysql (= ${source:Version}) | akonadi-backend-sqlite (= ${binary:Version}),
+Depends: akonadi-backend-sqlite (= ${binary:Version}),
          ${misc:Depends},
          ${shlibs:Depends}
 Suggests: akonadi-backend-mysql (= ${source:Version}),
           akonadi-backend-postgresql (= ${source:Version}),
           akonadi-backend-sqlite (= ${binary:Version})
-Breaks: akonadiconsole (<< 4:16.04),
-        kdepim-runtime (<< 4:17.08),
-        kdepimlibs-data (<< 4:16.04),
-        kmail (<< 4:17.08),
-        korganizer (<< 4:16.04)
-Replaces: kdepimlibs-data (<< 4:16.04)
 Description: Akonadi PIM storage service
  Akonadi is an extensible cross-desktop Personal Information Management (PIM)
  storage service. It provides a common framework for applications to store and
@@ -124,8 +114,6 @@ Package: libkf5akonadi-data
 Architecture: all
 Multi-Arch: foreign
 Depends: ${misc:Depends}, ${shlibs:Depends}
-Breaks: libkf5akonadicore5 (<< 4:19.08.0), ${kde-l10n:all}
-Replaces: libkf5akonadicore5 (<< 4:19.08.0), ${kde-l10n:all}
 Description: Akonadi arch independent data
  Akonadi is an extensible cross-desktop Personal Information Management (PIM)
  storage service. It provides a common framework for applications to store and
@@ -142,37 +130,12 @@ Depends: libboost-dev (>= 1.34.0~),
          libkf5akonadiserver-dev (>= ${binary:Version}),
          libkf5akonadiwidgets5 (= ${binary:Version}),
          libkf5akonadixml5 (= ${binary:Version}),
-         libkf5completion-dev (>= 5.47.0~),
-         libkf5itemmodels-dev (>= 5.47.0~),
-         libkf5xmlgui-dev (>= 5.47.0~),
+         libkf5completion-dev,
+         libkf5itemmodels-dev,
+         libkf5xmlgui-dev,
          qtbase5-dev (>= 5.9.0~),
          ${misc:Depends},
          ${shlibs:Depends}
-Replaces: akonadi-server (<< 4:19.08.0),
-          kapptemplate (<< 4:17.08.3-2),
-          kdepim-runtime (<< 4:4.13),
-          kdepimlibs5-dev
-Breaks: akonadi-server (<< 4:19.08.0),
-        kapptemplate (<< 4:17.08.3-2),
-        kdepim-runtime (<< 4:4.13),
-        libkf5akonadicalendar-dev (<< 4:17.08),
-        libkf5akonadicontact-dev (<< 4:17.08),
-        libkf5akonadimime-dev (<< 4:17.08),
-        libkf5akonadinotes-dev (<< 4:17.08),
-        libkf5akonadisearch-dev (<< 4:17.08),
-        libkf5akonadisocialutils-dev (<< 4:17.08),
-        libkf5alarmcalendar-dev (<< 4:17.08),
-        libkf5calendarsupport-dev (<< 4:17.08),
-        libkf5eventviews-dev (<< 4:17.08),
-        libkf5followupreminder-dev (<< 4:17.08),
-        libkf5incidenceeditor-dev (<< 17.08),
-        libkf5kdepimdbusinterfaces-dev (<< 4:17.08),
-        libkf5ksieve-dev (<< 4:17.08),
-        libkf5libkdepim-dev (<< 4:17.08),
-        libkf5mailimporter-dev (<< 4:17.08),
-        libkf5pimcommon-dev (<< 4:17.08),
-        libkf5sendlater-dev (<< 4:17.08)
-Conflicts: kdepimlibs5-dev
 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.
@@ -184,8 +147,6 @@ Section: libdevel
 Architecture: any
 Multi-Arch: foreign
 Depends: ${misc:Depends}, ${shlibs:Depends}
-Breaks: kdepimlibs5-dev, ${kde-l10n:all}
-Replaces: kdepimlibs5-dev, ${kde-l10n:all}
 Description: Additional development binaries for the Akonadi KDE PIM libraries
  This package contains development files for building software that uses
  the KDE Development Platform Personal Information Management libraries.
@@ -203,10 +164,6 @@ Description: Akonadi agent base library
  data server.
  .
  This package is part of the KDE Development Platform PIM libraries module.
-Breaks: kdepim-runtime (<< 4:17.08),
-        kmail (<< 4:17.08),
-        knotes (<< 4:17.08),
-        libkf5akonadisearch-bin (<< 4:17.08)
 
 Package: libkf5akonadicore5
 Architecture: any
@@ -215,41 +172,6 @@ Depends: libkf5akonadi-data (= ${source:Version}),
          ${misc:Depends},
          ${shlibs:Depends}
 Recommends: libkf5akonadiwidgets5 (= ${binary:Version})
-Breaks: accountwizard (<< 4:17.08),
-        akonadiconsole (<< 4:17.08),
-        kaddressbook (<< 4:17.08),
-        kalarm (<< 4:17.08),
-        kdepim-addons (<< 17.08),
-        kdepim-runtime (<< 4:17.08),
-        kmail (<< 4:17.08),
-        knotes (<< 4:17.08),
-        konsolekalendar (<< 4:17.08),
-        korganizer (<< 4:17.08),
-        libkf5akonadicalendar5 (<< 4:17.08),
-        libkf5akonadicontact5 (<< 4:17.08),
-        libkf5akonadimime5 (<< 4:17.08),
-        libkf5akonadisearch-bin (<< 4:17.08),
-        libkf5akonadisearch-plugins (<< 4:17.08),
-        libkf5akonadisearchdebug5 (<< 4:17.08),
-        libkf5akonadisearchpim5 (<< 4:17.08),
-        libkf5alarmcalendar5 (<< 4:17.08),
-        libkf5calendarsupport5 (<< 4:17.08),
-        libkf5eventviews5 (<< 4:17.08),
-        libkf5incidenceeditor-bin (<< 17.08),
-        libkf5incidenceeditor5 (<< 17.08),
-        libkf5kaddressbookgrantlee5 (<< 4:17.08),
-        libkf5kdepimdbusinterfaces5 (<< 4:17.08),
-        libkf5ksieveui5 (<< 4:17.08),
-        libkf5libkdepim5 (<< 4:17.08),
-        libkf5mailimporter5 (<< 4:17.08),
-        libkf5mailtransport5 (<< 17.08),
-        libkf5messagecomposer5 (<< 4:17.08),
-        libkf5messagecore5 (<< 4:17.08),
-        libkf5messagelist5 (<< 4:17.08),
-        libkf5messageviewer5 (<< 4:17.08),
-        libkf5pimcommon5 (<< 4:17.08),
-        libkf5templateparser5 (<< 4:17.08),
-        libkolab1 (<= 1.0.2-3)
 Description: Akonadi core library
  This library contains Akonadi PIM data server core classes.
  .
@@ -260,10 +182,6 @@ Architecture: any
 Multi-Arch: same
 Depends: ${misc:Depends}, ${shlibs:Depends}
 Suggests: akonadi-server (= ${binary:Version})
-Breaks: akonadiconsole (<< 4:17.08),
-        kdepim-runtime (<< 4:17.08),
-        libkf5akonadiprivate5abi2 (<< 4:20.08.0-0neon)
-Replaces: libkf5akonadiprivate5abi2 (<< 4:20.08.0-0neon)
 Description: libraries for the Akonadi PIM storage service
  Akonadi is an extensible cross-desktop Personal Information Management (PIM)
  storage service. It provides a common framework for applications to store and
@@ -287,8 +205,6 @@ Package: libkf5akonadiserver-dev
 Section: libdevel
 Architecture: any
 Depends: libkf5akonadiprivate5 (= ${binary:Version}), ${misc:Depends}
-Breaks: libakonadi-dev, libkf5akonadisearch-dev (<< 4:17.08)
-Replaces: libakonadi-dev
 Description: development files for the Akonadi PIM storage service
  Akonadi is an extensible cross-desktop Personal Information Management (PIM)
  storage service. It provides a common framework for applications to store and
@@ -301,26 +217,6 @@ Package: libkf5akonadiwidgets5
 Architecture: any
 Multi-Arch: same
 Depends: ${misc:Depends}, ${shlibs:Depends}
-Breaks: accountwizard (<< 4:17.08),
-        akonadiconsole (<< 4:17.08),
-        kaddressbook (<< 4:17.08),
-        kalarm (<< 4:17.08),
-        kdepim-addons (<< 17.08),
-        kdepim-runtime (<< 4:17.08),
-        kmail (<< 4:17.08),
-        knotes (<< 4:17.08),
-        korganizer (<< 4:17.08),
-        libkf5akonadicalendar5 (<< 4:17.08),
-        libkf5akonadicontact5 (<< 4:17.08),
-        libkf5akonadicore5 (<< 4:15.07.90+git20150817.0936),
-        libkf5akonadimime5 (<< 4:17.08),
-        libkf5calendarsupport5 (<< 4:17.08),
-        libkf5eventviews5 (<< 4:17.08),
-        libkf5incidenceeditor5 (<< 17.08),
-        libkf5libkdepim5 (<< 4:17.08),
-        libkf5messagecomposer5 (<< 4:17.08),
-        libkf5pimcommon5 (<< 4:17.08)
-Replaces: libkf5akonadicore5 (<< 4:15.07.90+git20150817.0936)
 Description: Akonadi widgets library
  This library contains standard widgets for the Akonadi PIM data server.
  .


More information about the Neon-commits mailing list