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

[Carlos De Maine]

Git commit d7d60d4ab15e6decb2e03cfab177581cbf262e36 by Carlos De Maine.
Committed on 07/11/2024 at 03:39.
Pushed by carlosdem into branch 'Neon/stable'.

kf6ify

M  +28   -24   debian/control
M  +3    -3    debian/rules
D  +0    -6    debian/salsa-ci.yml

https://invent.kde.org/neon/extras/kaffeine/-/commit/d7d60d4ab15e6decb2e03cfab177581cbf262e36

diff --git a/debian/control b/debian/control
index 30ff71e..43540a9 100644
--- a/debian/control
+++ b/debian/control
@@ -3,25 +3,28 @@ Section: video
 Priority: optional
 Maintainer: Debian KDE Extras Team <pkg-kde-extras at lists.alioth.debian.org>
 Uploaders: Pino Toscano <pino at debian.org>,
-Build-Depends: debhelper-compat (= 13),
- cmake, pkg-kde-tools (>= 0.15.16),
- pkg-config,
- extra-cmake-modules (>= 1.0.0),
- qtbase5-dev (>= 5.4.0),
- libqt5x11extras5-dev (>= 5.4.0),
- libkf5coreaddons-dev (>= 5.11.0),
- libkf5doctools-dev (>= 5.41.0~),
- libkf5dbusaddons-dev (>= 5.11.0),
- libkf5i18n-dev (>= 5.11.0),
- libkf5kio-dev (>= 5.11.0),
- libkf5solid-dev (>= 5.11.0),
- libkf5widgetsaddons-dev (>= 5.11.0),
- libkf5windowsystem-dev (>= 5.11.0),
- libkf5xmlgui-dev (>= 5.11.0),
- libvlc-dev,
- libx11-dev, libxss-dev,
- libdvbv5-dev [linux-any], libudev-dev [linux-any],
- gettext,
+Build-Depends: cmake,
+               debhelper-compat (= 13),
+               gettext,
+               kf6-extra-cmake-modules,
+               kf6-kcoreaddons-dev,
+               kf6-kdoctools-dev,
+               kf6-kdbusaddons-dev,
+               kf6-ki18n-dev,
+               kf6-kio-dev,
+               kf6-kwidgetsaddons-dev,
+               kf6-kwindowsystem-dev,
+               kf6-kxmlgui-dev,
+               kf6-solid-dev,
+               libdvbv5-dev [linux-any],
+               libudev-dev [linux-any],
+               libvlc-dev,
+               libx11-dev, 
+               libxss-dev,
+               pkg-kde-tools-neon,
+               pkgconf,
+               qt6-5compat-dev,
+               qt6-base-dev,
 Standards-Version: 4.6.2
 Rules-Requires-Root: no
 Homepage: https://apps.kde.org/kaffeine/
@@ -30,11 +33,12 @@ Vcs-Git: https://salsa.debian.org/qt-kde-team/extras/kaffeine.git
 
 Package: kaffeine
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends},
- kinit,
- iso-codes,
- libqt5sql5-sqlite,
- vlc-plugin-base, vlc-plugin-video-output
+Depends: iso-codes,
+         libqt5sql5-sqlite,
+         vlc-plugin-base, 
+         vlc-plugin-video-output,
+         ${shlibs:Depends},
+         ${misc:Depends}, 
 Suggests: libdvdcss2
 Description: versatile media player for KDE
  Kaffeine is a media player for KDE based on VLC, which gives it a wide variety
diff --git a/debian/rules b/debian/rules
index 6e83671..d3ec6c4 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,9 +1,9 @@
 #!/usr/bin/make -f
+# SPDX-License-Identifier: LGPL-2.0-or-later
+# # SPDX-FileCopyrightText: 2023 Jonathan Riddell <jr at jriddell.org>
 
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
 %:
-	dh $@ --with kf5
-
-.PHONY: override_dh_auto_test
+	dh $@ --with kf6 --buildsystem kf6
diff --git a/debian/salsa-ci.yml b/debian/salsa-ci.yml
deleted file mode 100644
index 31e31c9..0000000
--- a/debian/salsa-ci.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-include:
-  - https://salsa.debian.org/salsa-ci-team/pipeline/raw/master/salsa-ci.yml
-  - https://salsa.debian.org/salsa-ci-team/pipeline/raw/master/pipeline-jobs.yml
-variables:
-  SALSA_CI_DISABLE_MISSING_BREAKS: 'no'
-  SALSA_CI_DISABLE_RC_BUGS: 'no'