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

[Carlos De Maine]

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

port to kf6

M  +3    -3    debian/control
M  +4    -4    debian/kpim6-grantleetheme.install
M  +2    -5    debian/rules
M  +2    -5    debian/tests/control

https://invent.kde.org/neon/kde/grantleetheme/-/commit/de589934a81f4f92246afa163f576ea8bf2c5d00

diff --git a/debian/control b/debian/control
index 091c133..7d0c0bd 100644
--- a/debian/control
+++ b/debian/control
@@ -5,17 +5,17 @@ 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-compat (= 12),
-               kf6-extra-cmake-modules,
-               libgrantlee5-dev (>= 5.0.0~),
                kf6-attica-dev,
-               kf6-kcoreaddons-dev,
+               kf6-extra-cmake-modules,
                kf6-kcolorscheme-dev,
+               kf6-kcoreaddons-dev,
                kf6-kguiaddons-dev,
                kf6-ki18n-dev,
                kf6-kiconthemes-dev,
                kf6-knewstuff-dev,
                kf6-ktexttemplate-dev,
                kf6-kxmlgui-dev,
+               libgrantlee5-dev,
                pkg-kde-tools-neon,
                qt6-base-dev
 Standards-Version: 3.9.8
diff --git a/debian/kpim6-grantleetheme.install b/debian/kpim6-grantleetheme.install
index 312d9af..8332dfe 100644
--- a/debian/kpim6-grantleetheme.install
+++ b/debian/kpim6-grantleetheme.install
@@ -1,6 +1,6 @@
-usr/share/qlogging-categories6/grantleetheme.categories
-usr/share/qlogging-categories6/grantleetheme.renamecategories
-usr/lib/*/libKPim6GrantleeTheme.so.6
 usr/lib/*/libKPim6GrantleeTheme.so.*.*
-usr/share/locale/
+usr/lib/*/libKPim6GrantleeTheme.so.6
 usr/lib/*/qt6/plugins/kf6/ktexttemplate/kde_grantlee_plugin*
+usr/share/locale/
+usr/share/qlogging-categories6/grantleetheme.categories
+usr/share/qlogging-categories6/grantleetheme.renamecategories
diff --git a/debian/rules b/debian/rules
index fb2ff18..3d69b0d 100644
--- a/debian/rules
+++ b/debian/rules
@@ -1,9 +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 dh_auto_test at build time
-	:
diff --git a/debian/tests/control b/debian/tests/control
index 0859b03..c879eae 100644
--- a/debian/tests/control
+++ b/debian/tests/control
@@ -1,10 +1,7 @@
 Tests: testsuite
-Depends: @, @builddeps@, build-essential,
-         xvfb, xauth, dbus-x11,
-         libxml2-utils
+Depends: build-essential, dbus-x11, libxml2-utils, xauth, xvfb, @, @builddeps@
 Restrictions: build-needed
 
 Tests: acc
-Depends: @,
-         dh-acc, exuberant-ctags
+Depends: dh-acc, exuberant-ctags, @
 Restrictions: allow-stderr