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

[Carlos De Maine]

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

port to kf6

M  +8    -12   debian/control
M  +1    -1    debian/kpim6-kpimtextedit.install
M  +2    -4    debian/rules

https://invent.kde.org/neon/kde/kpimtextedit/-/commit/16d0d627608d56d3d6d70cab74950962c8d982ea

diff --git a/debian/control b/debian/control
index 0682e81..64cb2d3 100644
--- a/debian/control
+++ b/debian/control
@@ -6,24 +6,24 @@ Uploaders: Maximiliano Curia <maxy at debian.org>
 Build-Depends: cmake (>= 2.8.12~),
                debhelper-compat (= 12),
                doxygen,
-               kf6-extra-cmake-modules,
                kdesignerplugin,
-               libgrantlee5-dev (>= 5.0~),
+               kf6-extra-cmake-modules,
                kf6-kcodecs-dev,
                kf6-kconfigwidgets-dev,
                kf6-kcoreaddons-dev,
                kf6-kiconthemes-dev,
                kf6-kio-dev,
                kf6-ktextaddons-dev,
-               kf6-sonnet-dev,
-               kf6-syntax-highlighting-dev,
+               kf6-ktexttemplate-dev,
                kf6-ktextwidgets-dev,
                kf6-kwidgetsaddons-dev,
                kf6-kxmlgui-dev,
+               kf6-sonnet-dev,
+               kf6-syntax-highlighting-dev,
                ninja-build,
                pkg-kde-tools-neon,
                qt6-base-dev,
-               qt6-tools-dev,
+               qt6-tools-dev
 Standards-Version: 3.9.8
 Homepage: https://projects.kde.org/projects/kde/pim/kpimtextedit
 Vcs-Browser: https://anonscm.debian.org/git/pkg-kde/applications/kpimtextedit.git
@@ -39,9 +39,9 @@ Package: kpim6-kpimtextedit-dev
 Section: libdevel
 Architecture: any
 X-Neon-MergedPackage: true
-Depends: kpim6-kpimtextedit (= ${binary:Version}),
+Depends: kf6-ktextwidgets-dev,
          kf6-syntax-highlighting-dev,
-         kf6-ktextwidgets-dev,
+         kpim6-kpimtextedit (= ${binary:Version}),
          ${misc:Depends}
 Description: kpim6kpimtextedit - development files
  KPIMTextedit provides a textedit with PIM-specific features. It also provides
@@ -50,7 +50,6 @@ Description: kpim6kpimtextedit - development files
  .
  This package contains the development files.
 
-
 Package: libkf6pimtextedit-dev
 Architecture: all
 Depends: kpim6-kpimtextedit-dev
@@ -61,8 +60,7 @@ Package: kpim6-kpimtextedit
 Architecture: any
 Multi-Arch: same
 X-Neon-MergedPackage: true
-Depends: ${misc:Depends},
-         ${shlibs:Depends}
+Depends: ${misc:Depends}, ${shlibs:Depends}
 Description: library that provides a textedit with PIM-specific features
  KPIMTextedit provides a textedit with PIM-specific features. It also provides
  so-called rich text builders which can convert the formatted text in the text
@@ -82,7 +80,6 @@ Depends: kpim6-kpimtextedit
 Description: Dummy transitional
  Transitional dummy package.
 
-
 Package: libkf6pimtextedittexttospeech-data
 Architecture: all
 Depends: kpim6-kpimtextedit
@@ -100,4 +97,3 @@ Architecture: all
 Depends: kpim6-kpimtextedit
 Description: Dummy transitional
  Transitional dummy package.
-
diff --git a/debian/kpim6-kpimtextedit.install b/debian/kpim6-kpimtextedit.install
index b524a7e..c8aea43 100644
--- a/debian/kpim6-kpimtextedit.install
+++ b/debian/kpim6-kpimtextedit.install
@@ -1,4 +1,4 @@
-usr/lib/*/libKPim6TextEdit.so.6
 usr/lib/*/libKPim6TextEdit.so.*.*
+usr/lib/*/libKPim6TextEdit.so.6
 usr/share/locale/
 usr/share/qlogging-categories6/kpimtextedit.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
-	: