[neon/extras/konversation/Neon/stable] debian: kf6ify

[Carlos De Maine]

Git commit d8fd4b7ce22102be25e15399d47d4a62115fb1c4 by Carlos De Maine.
Committed on 15/01/2024 at 15:12.
Pushed by carlosdem into branch 'Neon/stable'.

kf6ify

M  +31   -34   debian/control
M  +6    -6    debian/konversation-data.install
M  +4    -17   debian/rules

https://invent.kde.org/neon/extras/konversation/-/commit/d8fd4b7ce22102be25e15399d47d4a62115fb1c4

diff --git a/debian/control b/debian/control
index a5ff81f..38b83e0 100644
--- a/debian/control
+++ b/debian/control
@@ -3,41 +3,40 @@ Section: net
 Priority: optional
 Maintainer: Debian KDE Extras Team <pkg-kde-extras at lists.alioth.debian.org>
 Uploaders: Modestas Vainius <modax at debian.org>, Diane Trout <diane at debian.org>
-Build-Depends: cmake (>= 2.6.2),
-               debhelper-compat (= 12),
+Build-Depends: cmake,
+               debhelper-compat (= 13),
                dh-python,
-               extra-cmake-modules (>= 1.2.0),
                gettext,
-               libkf5archive-dev (>= 5.25.0),
-               libkf5bookmarks-dev (>= 5.25.0),
-               libkf5config-dev (>= 5.25.0),
-               libkf5configwidgets-dev (>= 5.25.0),
-               libkf5coreaddons-dev (>= 5.25.0),
-               libkf5crash-dev (>= 5.25.0),
-               libkf5dbusaddons-dev (>= 5.25.0),
-               libkf5doctools-dev (>= 5.25.0),
-               libkf5emoticons-dev (>= 5.25.0),
-               libkf5globalaccel-dev (>= 5.25.0),
-               libkf5i18n-dev (>= 5.25.0),
-               libkf5iconthemes-dev (>= 5.25.0),
-               libkf5idletime-dev (>= 5.25.0),
-               libkf5kio-dev (>= 5.25.0),
-               libkf5newstuff-dev,
-               libkf5notifications-dev (>= 5.25.0),
-               libkf5notifyconfig-dev (>= 5.25.0),
-               libkf5parts-dev (>= 5.25.0),
-               libkf5solid-dev (>= 5.25.0),
-               libkf5wallet-dev (>= 5.25.0),
-               libkf5widgetsaddons-dev (>= 5.25.0),
-               libkf5windowsystem-dev (>= 5.25.0),
-               libphonon4qt5-dev (>= 4.6.60),
-               libphonon4qt5experimental-dev (>= 4.6.60),
-               libqca-qt5-2-dev (>= 2.1.0),
-               pkg-kde-tools (>= 0.15.16),
+               kf6-extra-cmake-modules,
+               kf6-karchive-dev,
+               kf6-kbookmarks-dev,
+               kf6-kconfig-dev,
+               kf6-kconfigwidgets-dev,
+               kf6-kcoreaddons-dev,
+               kf6-kcrash-dev,
+               kf6-kdbusaddons-dev,
+               kf6-kdoctools-dev,
+               kf6-kemoticons-dev,
+               kf6-kglobalaccel-dev,
+               kf6-ki18n-dev,
+               kf6-kiconthemes-dev,
+               kf6-kidletime-dev,
+               kf6-kio-dev,
+               kf6-knewstuff-dev,
+               kf6-knotifications-dev,
+               kf6-knotifyconfig-dev,
+               kf6-kparts-dev,
+               kf6-ksolid-dev,
+               kf6-kwallet-dev,
+               kf6-kwidgetsaddons-dev,
+               kf6-kwindowsystem-dev,
+               libqca-qt6-2-dev,
+               pkg-kde-tools-neon,
                python3:any,
-               qtbase5-dev (>= 5.5.0),
-               qtmultimedia5-dev
-Standards-Version: 4.4.1
+               qt6-base-dev,
+               qt6-multimedia-dev,
+               qt6-phonon-dev,
+Standards-Version: 4.6.2
 Homepage: https://konversation.kde.org/
 Vcs-Git: https://salsa.debian.org/qt-kde-team/extras/konversation.git
 Vcs-Browser: https://salsa.debian.org/qt-kde-team/extras/konversation
@@ -48,8 +47,6 @@ Depends: konversation-data (= ${source:Version}),
          ${misc:Depends},
          ${shlibs:Depends}
 Provides: irc
-Replaces: konversation-data (<< 1.6.1)
-Breaks: konversation-data (<< 1.6.1)
 Description: user friendly Internet Relay Chat (IRC) client for KDE
  Konversation is a client for the Internet Relay Chat (IRC) protocol.
  It is easy to use and well-suited for novice IRC users, but novice
diff --git a/debian/konversation-data.install b/debian/konversation-data.install
index ac3a03d..5f713a3 100644
--- a/debian/konversation-data.install
+++ b/debian/konversation-data.install
@@ -1,8 +1,8 @@
 usr/share/dbus-1/services/
-usr/share/doc/HTML/*
-usr/share/icons/hicolor/*
-usr/share/knotifications5/konversation.notifyrc
+usr/share/doc/HTML/
+usr/share/icons/hicolor/
+usr/share/knotifications6/
 usr/share/knsrcfiles/
-usr/share/konversation/*
-usr/share/locale/*
-usr/share/qlogging-categories5/
+usr/share/konversation/
+usr/share/locale/
+usr/share/qlogging-categories6/
diff --git a/debian/rules b/debian/rules
index 3a904a0..7e7814f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,22 +1,9 @@
 #!/usr/bin/make -f
+# SPDX-License-Identifier: LGPL-2.0-or-later
+# # SPDX-FileCopyrightText: 2023 Jonathan Riddell <jr at jriddell.org>
 
-export DEB_LDFLAGS_MAINT_APPEND := -Wl,--as-needed
-
-override_dh_install:
-	dh_install
-	# Install scripts README (and rename)
-	if [ -d debian/konversation ]; then \
-	    cp -a data/scripts/README debian/konversation/usr/share/doc/konversation/README.scripts; \
-	fi
+%:
+	dh $@ --with kf6,python3 --buildsystem kf6
 
 override_dh_python3:
 	dh_python3 -p konversation-data --shebang=/usr/bin/python3 /usr/share/konversation
-
-override_dh_strip:
-	dh_strip --dbgsym-migration='konversation-dbg (<< 1.6-3~)'
-
-override_dh_missing:
-	dh_missing --fail-missing
-
-%:
-	dh  $@ --with kf5,python3