[neon/forks/kaidan/Neon/unstable] debian: kf6ify

[Carlos De Maine]

Git commit 30bb8034d9707bf6e6fe5bd94d23629257cd0a91 by Carlos De Maine.
Committed on 31/01/2025 at 23:45.
Pushed by carlosdem into branch 'Neon/unstable'.

kf6ify

D  +0    -1    debian/compat
M  +19   -24   debian/control
D  +0    -12   debian/patches/qt5_suffix.diff
D  +0    -1    debian/patches/series
M  +7    -6    debian/rules

https://invent.kde.org/neon/forks/kaidan/-/commit/30bb8034d9707bf6e6fe5bd94d23629257cd0a91

diff --git a/debian/compat b/debian/compat
deleted file mode 100644
index f599e28..0000000
--- a/debian/compat
+++ /dev/null
@@ -1 +0,0 @@
-10
diff --git a/debian/control b/debian/control
index cf3f454..7eca0f9 100644
--- a/debian/control
+++ b/debian/control
@@ -3,28 +3,24 @@ Section: comm
 Priority: optional
 Maintainer: Kaidan Packaging Team <git at lnj.li>
 Build-Depends: cmake,
-               debhelper (>= 9),
-               extra-cmake-modules (>= 5.40.0),
-               kirigami-addons-dev,
-               kirigami2-dev (>= 5.42.0),
-               libkf5kio-dev,
-               libkf5notifications-dev,
-               libkf5qqc2desktopstyle-dev,
-               libqt5svg5-dev,
+               debhelper-compat (= 13),
+               kf6-extra-cmake-modules,
+               kf6-kirigami-addons-dev,
+               kf6-kirigami-dev,
+               kf6-kio-dev,
+               kf6-knotifications-dev,
+               kf6-qqc2-desktop-style-dev,
                libqxmpp-dev (>= 1.2.0),
                libzxingcore-dev | libzxing-dev,
-               pkg-config,
-               qtbase5-dev (>= 5.8.0),
-               qtbase5-private-dev,
-               qtdeclarative5-dev (>= 5.8.0),
-               qtdeclarative5-dev-tools,
-               qtlocation5-dev,
-               qtmultimedia5-dev,
-               qtpositioning5-dev,
-               qtquickcontrols2-5-dev,
-               qttools5-dev,
-               qttools5-dev-tools
-Standards-Version: 4.3.0
+               pkgconf,
+               qt6-base-dev,
+               qt6-declarative-dev,
+               qt6-location-dev,
+               qt6-multimedia-dev,
+               qt6-positioning-dev,
+               qt6-svg-dev,
+               qt6-tools-dev,
+Standards-Version: 4.6.2
 Homepage: https://kaidan.im
 Vcs-Git: git://git.kaidan.im/kaidan/kaidan-packaging-deb.git
 Vcs-Browser: https://git.kaidan.im/kaidan/kaidan-packaging-deb
@@ -32,10 +28,9 @@ Vcs-Browser: https://git.kaidan.im/kaidan/kaidan-packaging-deb
 Package: kaidan
 Architecture: any
 Depends: kaidan-data,
-         qml-module-org-kde-kirigami-addons-labs-mobileform,
-         qml-module-org-kde-kirigami2,
-         qml-module-org-kde-kirigamiaddons,
-         qml-module-qtquick-controls2,
+         kf6-kirigami,
+         kf6-kirigami-addons,
+         qt6-declarative,
          ${misc:Depends},
          ${shlibs:Depends}
 Recommends: libnotify-bin
diff --git a/debian/patches/qt5_suffix.diff b/debian/patches/qt5_suffix.diff
deleted file mode 100644
index 089878e..0000000
--- a/debian/patches/qt5_suffix.diff
+++ /dev/null
@@ -1,12 +0,0 @@
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -78,7 +78,7 @@
- find_package(KQuickImageEditor REQUIRED)
- find_package(KF5KirigamiAddons 0.7.0 REQUIRED)
- find_package(ZXing REQUIRED)
--find_package(QXmpp 1.9.0 REQUIRED COMPONENTS Omemo)
-+find_package(QXmppQt5 1.9.0 REQUIRED COMPONENTS Omemo)
- 
- # Optional QtQuickCompiler
- if(QUICK_COMPILER)
-
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 567b66d..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-qt5_suffix.diff
diff --git a/debian/rules b/debian/rules
index 838dfcc..c765fed 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,10 +1,11 @@
 #!/usr/bin/make -f
+# SPDX-License-Identifier: LGPL-2.0-or-later
+# # SPDX-FileCopyrightText: 2023 Jonathan Riddell <jr at jriddell.org>
 
-export DEB_BUILD_MAINT_OPTIONS=optimize=-lto
-
-%:
-	dh $@ --with kf5 --buildsystem kf5
+# Uncomment this to turn on verbose mode.
+export DH_VERBOSE=1
 
+export DEB_LDFLAGS_MAINT_APPEND := -Wl,--as-needed
 
-override_dh_auto_configure:
-	dh_auto_configure --  -DQUICK_COMPILER=OFF
+%:
+	dh $@ --with kf6 --buildsystem kf6