[neon/kde/kmime/Neon/unstable] debian: port to kf6

[Carlos De Maine]

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

port to kf6

M  +5    -7    debian/control
M  +1    -1    debian/kpim6-kmime.install
M  +2    -4    debian/rules
M  +2    -3    debian/tests/control

https://invent.kde.org/neon/kde/kmime/-/commit/d9a4b66b453abe11c883662482155af83e47039b

diff --git a/debian/control b/debian/control
index 16fa0c1..eebe9c8 100644
--- a/debian/control
+++ b/debian/control
@@ -5,11 +5,11 @@ Maintainer: Debian/Kubuntu Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
 Uploaders: Maximiliano Curia <maxy at debian.org>
 Build-Depends: cmake (>= 2.8.12~),
                debhelper (>= 9),
-               extra-cmake-modules,
-               libboost-dev (>= 1.49),
+               kf6-extra-cmake-modules,
                kf6-kcodecs-dev,
-               kf6-ki18n-dev,
                kf6-kcolorscheme-dev,
+               kf6-ki18n-dev,
+               libboost-dev (>= 1.49),
                pkg-kde-tools-neon,
                qt6-base-dev
 Standards-Version: 3.9.8
@@ -20,9 +20,9 @@ Vcs-Git: https://anonscm.debian.org/git/pkg-kde/applications/kmime.git
 Package: kpim6-kmime-dev
 Section: libdevel
 Architecture: any
-Depends: libboost-dev (>= 1.49~),
-         kf6-kcodecs-dev,
+Depends: kf6-kcodecs-dev,
          kpim6-kmime (= ${binary:Version}),
+         libboost-dev (>= 1.49~),
          qt6-base-dev,
          ${misc:Depends}
 Description: library for handling MIME data - development files
@@ -64,5 +64,3 @@ Architecture: all
 Depends: kpim6-kmime
 Description: Dummy transitional
  Transitional dummy package.
-
-
diff --git a/debian/kpim6-kmime.install b/debian/kpim6-kmime.install
index 57127a4..d778db4 100644
--- a/debian/kpim6-kmime.install
+++ b/debian/kpim6-kmime.install
@@ -1,4 +1,4 @@
-usr/lib/*/libKPim6Mime.so.6
 usr/lib/*/libKPim6Mime.so.*.*
+usr/lib/*/libKPim6Mime.so.6
 usr/share/locale/
 usr/share/qlogging-categories6/kmime.categories
diff --git a/debian/rules b/debian/rules
index bb99127..3d69b0d 100644
--- 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:
-	# Disable auto test at build time, fakeroot breaks them
-	:
diff --git a/debian/tests/control b/debian/tests/control
index 5df159f..bfee6c3 100644
--- a/debian/tests/control
+++ b/debian/tests/control
@@ -1,8 +1,7 @@
 Tests: testsuite
-Depends: @, @builddeps@, build-essential,
-         dbus-x11
+Depends: build-essential, dbus-x11, @, @builddeps@
 Restrictions: build-needed
 
 Tests: acc
-Depends: @, dh-acc, exuberant-ctags
+Depends: dh-acc, exuberant-ctags, @
 Restrictions: allow-stderr