[neon/kde/kmail/Neon/unstable] debian: kf6ify

Carlos De Maine null at kde.org
Mon Sep 25 07:02:50 BST 2023


Git commit c57773d8388651e1d5998b8dad68b18a2d9b8d2f by Carlos De Maine.
Committed on 25/09/2023 at 08:02.
Pushed by carlosdem into branch 'Neon/unstable'.

kf6ify

D  +0    -1    debian/compat
M  +21   -40   debian/control
D  +0    -1    debian/docs
M  +1    -1    debian/kmail.install

https://invent.kde.org/neon/kde/kmail/-/commit/c57773d8388651e1d5998b8dad68b18a2d9b8d2f

diff --git a/debian/compat b/debian/compat
deleted file mode 100644
index f599e28..0000000
--- a/debian/compat
+++ /dev/null
@@ -1 +0,0 @@
-10
diff --git a/debian/control b/debian/control
index 11d3651..0fe1425 100644
--- a/debian/control
+++ b/debian/control
@@ -9,12 +9,13 @@ Uploaders: Sune Vuorela <sune at debian.org>,
            George Kiagiadakis <kiagiadakis.george at gmail.com>,
            Eshat Cakar <info at eshat.de>,
            Maximiliano Curia <maxy at debian.org>
-Build-Depends: cmake (>= 2.8.12~),
-               debhelper (>= 9),
+Build-Depends: cmake,
+               debhelper-compat (= 13),
                kf6-codecs-dev,
                kf6-extra-cmake-modules,
                kf6-karchive-dev,
                kf6-kauth-dev,
+               kf6-calendarcore-dev,
                kf6-kcmutils-dev,
                kf6-kcompletion-dev,
                kf6-kconfig-dev,
@@ -35,6 +36,7 @@ Build-Depends: cmake (>= 2.8.12~),
                kf6-ktexteditor-dev,
                kf6-ktexttemplate-dev,
                kf6-ktextwidgets-dev,
+               kf6-kuserfeedback-dev,
                kf6-kwallet-dev,
                kf6-kwidgetsaddons-dev,
                kf6-kwindowsystem-dev,
@@ -48,7 +50,6 @@ Build-Depends: cmake (>= 2.8.12~),
                kpim6-akonadi-mime-dev,
                kpim6-akonadi-notes-dev,
                kpim6-akonadi-search-dev,
-               kpim6-calendar-dev,
                kpim6-calendarsupport-dev,
                kpim6-calendarutils-dev,
                kpim6-contacteditor-dev,
@@ -56,18 +57,19 @@ Build-Depends: cmake (>= 2.8.12~),
                kpim6-eventviews-dev,
                kpim6-grantleetheme-dev,
                kpim6-gravatar-dev,
-               kpim6-identitymanagement-dev,
-               kpim6-imap-dev,
                kpim6-incidenceeditor-dev,
-               kpim6-kdepim-dev,
-               kpim6-kleo-dev,
+               kpim6-kgapi-dev,
+               kpim6-kidentitymanagement-dev,
+               kpim6-kimap-dev,
+               kpim6-kldap-dev,
+               kpim6-kmbox-dev,
                kpim6-kontactinterface-dev,
                kpim6-ksieve-dev,
-               kpim6-ldap-dev,
+               kpim6-libkdepim-dev,
+               kpim6-libkleo-dev,
                kpim6-mailcommon-dev,
                kpim6-mailimporter-dev,
                kpim6-mailtransport-dev,
-               kpim6-mbox-dev,
                kpim6-messagecomposer-dev,
                kpim6-messagecore-dev,
                kpim6-messagelib-dev,
@@ -76,19 +78,16 @@ Build-Depends: cmake (>= 2.8.12~),
                kpim6-mime-dev,
                kpim6-mimetreeparser-dev,
                kpim6-pimcommon-dev,
-               kpim6-pimtextedit-dev,
+               kpim6-kpimtextedit-dev,
                kpim6-templateparser-dev,
                kpim6-tnef-dev,
-               kross-dev (>= 5.19.0~),
-               kuserfeedback-dev,
                libassuan-dev,
                libboost-dev (>= 1.40.0-2),
                libboost-graph-dev (>= 1.40.0-2),
                libgpgme11-dev,
                libgpgmepp-dev | libqgpgme7-dev,
                libkgantt-dev,
-               libkpimgapi-dev (>= 5.1~),
-               libqgpgme-dev,
+               libqgpgme15-qt6-dev,
                libx11-dev,
                pkg-config,
                pkg-kde-tools-neon,
@@ -103,23 +102,21 @@ Build-Depends: cmake (>= 2.8.12~),
                shared-mime-info,
                xsltproc,
                zlib1g-dev
-Standards-Version: 3.9.8
+Standards-Version: 4.6.2
 Homepage: http://pim.kde.org/
 Vcs-Browser: https://anonscm.debian.org/git/pkg-kde/applications/kmail.git
 Vcs-Git: https://anonscm.debian.org/git/pkg-kde/applications/kmail.git
 
 Package: kdepim-doc
-Section: oldlibs
 Architecture: all
-Priority: optional
-Depends: kmail, ${misc:Depends}
-Description: transitional package
- This is a transitional package. It can safely be removed.
+Depends: kpim6-akonadi-search
+Description: Dummy transitional
+ Transitional dummy package.
 
 Package: kmail
 Section: mail
 Architecture: any
-Depends: akonadi-server (>= 4:16.04),
+Depends: akonadi-server,
          kdepim-runtime,
          kpim6-akonadi-search,
          kpim6-grantleetheme,
@@ -127,10 +124,10 @@ Depends: akonadi-server (>= 4:16.04),
          ${misc:Depends},
          ${perl:Depends},
          ${shlibs:Depends}
-Recommends: accountwizard,
-            gnupg-agent,
+Recommends: gnupg-agent,
             gnupg2,
-            kdepim-addons,
+            kpim6-accountwizard,
+            kpim6-kdepim-addons,
             kdepim-themeeditors,
             mbox-importer,
             pim-data-exporter,
@@ -141,22 +138,6 @@ Suggests: clamav,
           kleopatra,
           procmail,
           spamassassin | bogofilter | spambayes (>= 1.0.4-6) | bsfilter | crm114
-Breaks: kdepim-doc (<< 4:16.12.0),
-        kontact (<< 4:16.11),
-        ktnef (<< 4:16.12.0),
-        libkdepim4 (<< 4:4.13.90),
-        libkf5libkdepim5 (<= 4:16.04),
-        libkf5messageviewer5 (<= 4:16.04),
-        libmessageviewer4 (<< 4:4.13.90),
-        ${kde-l10n:all}
-Replaces: kdepim-doc (<< 4:16.12.0),
-          kontact (<< 4:16.11),
-          ktnef (<< 4:16.12.0),
-          libkdepim4 (<< 4:4.13.90),
-          libkf5libkdepim5 (<= 4:16.04),
-          libkf5messageviewer5 (<= 4:16.04),
-          libmessageviewer4 (<< 4:4.13.90),
-          ${kde-l10n:all}
 Provides: imap-client, mail-reader
 Homepage: http://kontact.kde.org/kmail/
 Description: full featured graphical email client
diff --git a/debian/docs b/debian/docs
deleted file mode 100644
index 8b13789..0000000
--- a/debian/docs
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/debian/kmail.install b/debian/kmail.install
index fa81035..21e3e90 100644
--- a/debian/kmail.install
+++ b/debian/kmail.install
@@ -7,7 +7,7 @@ usr/bin/akonadi_unifiedmailbox_agent
 usr/bin/kmail
 usr/bin/kmail-refresh-settings
 usr/bin/ktnef
-usr/lib/*/libkmailprivate.so.5*
+usr/lib/*/libkmailprivate.so.*.*
 usr/lib/*/qt6/plugins/kmailpart.so
 usr/lib/*/qt6/plugins/pim5/akonadi/config/archivemailagentconfig.so
 usr/lib/*/qt6/plugins/pim5/akonadi/config/followupreminderagentconfig.so


More information about the Neon-commits mailing list