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

[Harald Sitter]

Git commit 9868e6218ba9781f0f72d25644082d9a708e6337 by Harald Sitter.
Committed on 07/03/2023 at 16:32.
Pushed by sitter into branch 'Neon/unstable'.

port to kf6

M  +7    -7    debian/control
M  +1    -1    debian/libkdecorations2private10.install
M  +5    -12   debian/rules

https://invent.kde.org/neon/kde/kdecoration/commit/9868e6218ba9781f0f72d25644082d9a708e6337

diff --git a/debian/control b/debian/control
index e0f333a..3533d2a 100644
--- a/debian/control
+++ b/debian/control
@@ -9,10 +9,10 @@ Build-Depends: cmake (>= 3.0~),
                debhelper-compat (= 13),
                extra-cmake-modules (>= 5.78~),
                gettext,
-               libkf5i18n-dev (>= 5.78~),
-               libkf5coreaddons-dev,
+               kf6-kcoreaddons-dev,
+               kf6-ki18n-dev (>= 5.78~),
                pkg-kde-tools (>= 0.15.15ubuntu1~),
-               qtbase5-dev (>= 5.15.0~)
+               qt6-base-dev (>= 5.15.0~)
 Standards-Version: 4.5.1
 Homepage: https://invent.kde.org/plasma/kdecoration
 Vcs-Browser: https://salsa.debian.org/qt-kde-team/kde/kdecoration
@@ -44,7 +44,7 @@ Architecture: any
 Multi-Arch: same
 Depends: libkdecorations2-5v5 (= ${binary:Version}),
          libkdecorations2private10 (= ${binary:Version}),
-         qtbase5-dev (>= 5.15.0~),
+         qt6-base-dev (>= 5.15.0~),
          ${misc:Depends}
 Description: library to create window decorations - development files
  KDecoration2 is a library to create window decorations. These window
@@ -61,13 +61,13 @@ Breaks: libkdecorations2private5,
         libkdecorations2private5v5,
         libkdecorations2private6,
         libkdecorations2private7,
-        libkdecorations2private8
+        libkdecorations2private8,
         libkdecorations2private9 (<< 4:5.26.4)
 Replaces: libkdecorations2private5,
           libkdecorations2private5v5,
           libkdecorations2private6,
           libkdecorations2private7,
-          libkdecorations2private8
+          libkdecorations2private8,
           libkdecorations2private9 (<< 4:5.26.4)
 Description: library to create window decorations - private library
  KDecoration2 is a library to create window decorations. These window
@@ -79,6 +79,6 @@ Description: library to create window decorations - private library
 Package: libkdecorations2private9
 Architecture: any
 Multi-Arch: same
-Depends: ${misc:Depends}, ${shlibs:Depends}, libkdecorations2private10
+Depends: libkdecorations2private10, ${misc:Depends}, ${shlibs:Depends}
 Description: dummy transitional
  Empty transitional package.
diff --git a/debian/libkdecorations2private10.install b/debian/libkdecorations2private10.install
index 295df50..dd256cc 100644
--- a/debian/libkdecorations2private10.install
+++ b/debian/libkdecorations2private10.install
@@ -1,2 +1,2 @@
-usr/lib/*/libkdecorations2private.so.5.*
 usr/lib/*/libkdecorations2private.so.10
+usr/lib/*/libkdecorations2private.so.5.*
diff --git a/debian/rules b/debian/rules
index 3fa4e2f..47c772a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,16 +1,9 @@
 #!/usr/bin/make -f
-
-export DEB_BUILD_MAINT_OPTIONS=hardening=+all
-
-libpkgs_gen_strict_local_shlibs = $(libpkgs_all_packages)
-include /usr/share/pkg-kde-tools/qt-kde-team/3/library-packages.mk
+# SPDX-License-Identifier: LGPL-2.0-or-later
+# SPDX-FileCopyrightText: 2023 Jonathan Riddell <jr at jriddell.org>
 
 %:
-	dh $@ --with kf5,pkgkde_symbolshelper --buildsystem kf5 --without build_stamp
-
-override_dh_auto_test:
-	# Disable dh_auto_test at build time
-	:
+	dh $@ --with kf6 --buildsystem kf6
 
-override_dh_gencontrol-arch: libpkgs_gen_strict_local_shlibs
-	dh_gencontrol -a
+override_dh_shlibdeps:
+	dh_shlibdeps -l$(CURDIR)/debian/$(shell dh_listpackages | head -n1)/usr/kf6/lib/$(DEB_HOST_MULTIARCH)/