[neon/kde/akonadi-mime/Neon/unstable] debian: port to kf6

[Carlos De Maine]

Git commit 7a9dc5834e151bf686b0ea7555d8b0003c70a8f4 by Carlos De Maine.
Committed on 24/09/2023 at 07:13.
Pushed by carlosdem into branch 'Neon/unstable'.

port to kf6

M  +8    -9    debian/control
M  +2    -2    debian/kpim6-akonadimime.install
M  +2    -4    debian/rules

https://invent.kde.org/neon/kde/akonadi-mime/-/commit/7a9dc5834e151bf686b0ea7555d8b0003c70a8f4

diff --git a/debian/control b/debian/control
index ec81429..f59016b 100644
--- a/debian/control
+++ b/debian/control
@@ -7,25 +7,25 @@ Uploaders: Sune Vuorela <sune at debian.org>,
            George Kiagiadakis <kiagiadakis.george at gmail.com>,
            Eshat Cakar <info at eshat.de>,
            Lisandro Damián Nicanor Pérez Meyer <lisandro at debian.org>,
-           Maximiliano Curia <maxy at debian.org>,
+           Maximiliano Curia <maxy at debian.org>
 Build-Depends: cmake (>= 3.0~),
                debhelper-compat (= 12),
                kf6-extra-cmake-modules,
-               kpim6-akonadi-dev,
-               kf6-kconfig-dev,
                kf6-kcolorscheme-dev,
+               kf6-kconfig-dev,
                kf6-kdbusaddons-dev,
                kf6-ki18n-dev,
-               kf6-kitemmodels-dev,
                kf6-kio-dev,
-               kpim6-kmime-dev,
+               kf6-kitemmodels-dev,
                kf6-kxmlgui-dev,
+               kpim6-akonadi-dev,
+               kpim6-kmime-dev,
                libxslt1-dev,
                pkg-config,
                pkg-kde-tools-neon,
                qt6-base-dev,
                shared-mime-info (>= 1.3~),
-               xsltproc,
+               xsltproc
 Standards-Version: 4.3.0
 Homepage: http://pim.kde.org/
 Vcs-Browser: https://salsa.debian.org/qt-kde-team/kde/akonadi-mime
@@ -44,7 +44,7 @@ Multi-Arch: same
 Depends: kpim6-akonadi-dev,
          kpim6-akonadimime (= ${binary:Version}),
          ${misc:Depends},
-         ${shlibs:Depends},
+         ${shlibs:Depends}
 Description: Akonadi MIME handling library - development files
  This library provides MIME handling helpers using the
  Akonadi PIM data server.
@@ -62,8 +62,7 @@ Description: Dummy transitional
 Package: kpim6-akonadimime
 Architecture: any
 Multi-Arch: same
-Depends: ${misc:Depends},
-         ${shlibs:Depends},
+Depends: ${misc:Depends}, ${shlibs:Depends}
 Description: Akonadi MIME handling library
  This library provides MIME handling helpers using the
  Akonadi PIM data server.
diff --git a/debian/kpim6-akonadimime.install b/debian/kpim6-akonadimime.install
index 58ac736..ad14b47 100644
--- a/debian/kpim6-akonadimime.install
+++ b/debian/kpim6-akonadimime.install
@@ -1,8 +1,8 @@
-usr/lib/*/libKPim6AkonadiMime.so.6
 usr/lib/*/libKPim6AkonadiMime.so.*.*
+usr/lib/*/libKPim6AkonadiMime.so.6
 usr/lib/*/qt6/plugins/akonadi_serializer_mail.so
-usr/share/qlogging-categories6/akonadi-mime.categories
 usr/share/akonadi/plugins/serializer/akonadi_serializer_mail.desktop
 usr/share/config.kcfg/specialmailcollections.kcfg
 usr/share/locale/
 usr/share/mime/packages/x-vnd.kde.contactgroup.xml
+usr/share/qlogging-categories6/akonadi-mime.categories
diff --git a/debian/rules b/debian/rules
index 64762e6..3d69b0d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,8 +1,6 @@
 #!/usr/bin/make -f
-
+# SPDX-License-Identifier: LGPL-2.0-or-later
+# SPDX-FileCopyrightText: 2023 Jonathan Riddell <jr at jriddell.org>
 
 %:
 	dh $@ --with kf6 --buildsystem kf6
-
-override_dh_auto_test:
-	- dh_auto_test --no-parallel