[neon/kde/kwave/Neon/unstable_jammy] debian: Revert "revert kf6 change for now in user edition"

[Jonathan Riddell]

Git commit 4168d688f4efb6547a534a2637d9029ff120c4c2 by Jonathan Riddell.
Committed on 22/08/2024 at 14:47.
Pushed by jriddell into branch 'Neon/unstable_jammy'.

Revert "revert kf6 change for now in user edition"

This reverts commit f140609c67acb3835f1d5e3b042df0a4734be001.

M  +1    -1    debian/changelog
M  +35   -27   debian/control
M  +2    -12   debian/rules

https://invent.kde.org/neon/kde/kwave/-/commit/4168d688f4efb6547a534a2637d9029ff120c4c2

diff --git a/debian/changelog b/debian/changelog
index 1b22c02..d389394 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-kwave (24.05.2-0neon) jammy; urgency=medium
+kwave (24.08.0-0neon) jammy; urgency=medium
 
   * New release
 
diff --git a/debian/control b/debian/control
index ce34111..b4ca4f5 100644
--- a/debian/control
+++ b/debian/control
@@ -3,34 +3,42 @@ Section: kde
 Priority: optional
 Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
 Uploaders: Mark Purcell <msp at debian.org>
-Build-Depends: debhelper (>= 11~), pkg-kde-tools (>= 0.15.16),
- extra-cmake-modules (>= 1.7.0),
- qtbase5-dev (>= 5.4.0),
- qtmultimedia5-dev (>= 5.4.0),
- libkf5completion-dev,
- libkf5config-dev,
- libkf5configwidgets-dev,
- libkf5coreaddons-dev,
- libkf5crash-dev,
- libkf5dbusaddons-dev,
- libkf5doctools-dev,
- libkf5i18n-dev,
- libkf5iconthemes-dev,
- libkf5kio-dev,
- libkf5service-dev,
- libkf5textwidgets-dev,
- libkf5widgetsaddons-dev,
- libkf5xmlgui-dev,
- gettext, pkg-config,
- libsamplerate0-dev, libpulse-dev,
- librsvg2-bin, libid3-3.8.3-dev (>= 3.8.3-4.2),
- libaudiofile-dev (>> 0.3.0), libogg-dev, libvorbis-dev (>= 1.0.0-2), libopus-dev (>= 1.0.0),
- libflac++-dev (>= 1.1.4), libmad0-dev,
- libasound2-dev [linux-any],
- libfftw3-dev,
- cmake,
+Build-Depends: debhelper-compat (= 13),
+               cmake,
+               gettext,
+               kf6-extra-cmake-modules,
+               kf6-kcompletion-dev,
+               kf6-kconfig-dev,
+               kf6-kconfigwidgets-dev,
+               kf6-kcoreaddons-dev,
+               kf6-kcrash-dev,
+               kf6-kdbusaddons-dev,
+               kf6-kdoctools-dev,
+               kf6-ki18n-dev,
+               kf6-kiconthemes-dev,
+               kf6-kio-dev,
+               kf6-kservice-dev,
+               kf6-ktextwidgets-dev,
+               kf6-kwidgetsaddons-dev,
+               kf6-kxmlgui-dev,
+               libaudiofile-dev,
+               libasound2-dev [linux-any],
+               libfftw3-dev,
+               libflac++-dev,
+               libid3-3.8.3-dev,
+               libmad0-dev,
+               libogg-dev,
+               libopus-dev,
+               libpulse-dev,
+               librsvg2-bin,
+               libsamplerate0-dev,
+               libvorbis-dev, 
+               pkg-config,
+               pkg-kde-tools-neon,
+               qt6-base-dev,
+               qt6-multimedia-dev,
 Homepage: https://www.kde.org/applications/multimedia/kwave
-Standards-Version: 4.2.1
+Standards-Version: 4.6.2
 Vcs-Git: https://salsa.debian.org/qt-kde-team/kde/kwave.git
 Vcs-Browser: https://salsa.debian.org/qt-kde-team/kde/kwave
 
diff --git a/debian/rules b/debian/rules
index d0af6e3..c553955 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,18 +1,8 @@
 #!/usr/bin/make -f
 
-DEB_HOST_ARCH_OS ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_OS)
-
-ifneq ($(DEB_HOST_ARCH_OS),linux)
-  DEB_CMAKE_CUSTOM_FLAGS += -DWITH_ALSA=OFF
-endif
-
-export DEB_LDFLAGS_MAINT_APPEND := -Wl,--as-needed
 
 %:
-	dh $@ --with kf5
+	dh $@ --with kf6 --buildsystem kf6
 
 override_dh_auto_configure:
-	dh_auto_configure -- -DWITH_MP3=ON $(DEB_CMAKE_CUSTOM_FLAGS)
-
-override_dh_strip:
-	dh_strip --dbgsym-migration='kwave-dbg (<< 0.9.2-1-1~)'
+	dh_auto_configure -- -DWITH_MP3=ON
\ No newline at end of file