Manual merge of version 4:22.12.3-1+rpi1 and 4:24.12.1-2 to produce 4:24.12.1-2+rpi1

diff --cc debian/changelog
index 44548db8a5634c607a745fd3f618429483ed70ed,615ab86b483d57a7dd71cba3298d80a4b6b79b8b..2a34e6253c7d47f4c9f09f1fdad79f5f841fa9a9
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,10 -1,64 +1,72 @@@
- kalgebra (4:22.12.3-1+rpi1) bookworm-staging; urgency=medium
++kalgebra (4:24.12.1-2+rpi1) trixie-staging; urgency=medium
 +
 +  [changes brought forward from 4:17.08.3-2+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Sat, 16 Dec 2017 12:52:33 +0000]
 +  * Make armhf a non-webengine architecture.
 +  * Fix clean target.
 +
-  -- Raspbian forward porter <root@raspbian.org>  Mon, 13 Mar 2023 04:55:24 +0000
++ -- Peter Michael Green <plugwash@raspbian.org>  Thu, 30 Jan 2025 13:31:51 +0000
++
+ kalgebra (4:24.12.1-2) unstable; urgency=medium
+ 
+   * Release to unstable
+ 
+  -- Salvo 'LtWorf' Tomaselli <ltworf@debian.org>  Fri, 17 Jan 2025 13:38:11 +0100
+ 
+ kalgebra (4:24.12.1-1) experimental; urgency=medium
+ 
+   [ Sandro Knauß ]
+   * Update copyright file
+ 
+   [ Salvo 'LtWorf' Tomaselli ]
+   * New upstream release
+ 
+  -- Salvo 'LtWorf' Tomaselli <ltworf@debian.org>  Fri, 17 Jan 2025 10:20:46 +0100
+ 
+ kalgebra (4:24.08.3-1) experimental; urgency=medium
+ 
+   * Team upload.
+ 
+   [ Rik Mills ]
+   * Fix analitza qml module runtime depend to be Qt6 version (Closes:
+     #1089529).
+ 
+   [ Sandro Knauß ]
+   * New upstream release (24.08.3)
+   * Use dh_qmldeps to calculate QML dependencies.
+   * Mark kalgebra-common as Arch:all.
+   * Build plasmoid for Plasma6 in kalgebra-plasmoid.
+ 
+  -- Sandro Knauß <hefee@debian.org>  Sun, 08 Dec 2024 16:51:42 +0100
+ 
+ kalgebra (4:24.08.2-1) experimental; urgency=medium
+ 
+   * Team upload.
+   * New upstream release.
+   * Update build dependencies and rules for KF6.
+   * Update Standards-Version to 4.7.0, no changes needed.
+ 
+  -- Simon Quigley <tsimonq2@debian.org>  Fri, 01 Nov 2024 20:48:06 -0500
+ 
+ kalgebra (4:22.12.3-2) unstable; urgency=medium
+ 
+   * Team upload.
+   * Remove inactive Uploaders.
+   * Avoid explicitly specifying -Wl,--as-needed linker flag.
+   * Drop the unused debian/kalgebramobile.qml-ignore file.
+   * Add the configuration for the CI on salsa.
+   * Modernize building:
+     - add the dh-sequence-kf5 build dependency to use the kf5 addon
+       automatically, removing pkg-kde-tools
+     - drop all the manually specified addons and buildsystem for dh
+   * Stop using qtwebengine5-dev on mipsel, as it will be removed soon from
+     that architecture.
+   * Update the build dependencies according to the upstream build system:
+     - drop the unused kirigami2-dev, libqt5opengl5-dev, qtquickcontrols2-5-dev
+     - switch the transitional libgl1-mesa-dev to libgl-dev
+     - switch the transitional libglu1-mesa-dev to libglu-dev
+     - switch the transitional libncurses5-dev to libncurses-dev
+ 
+  -- Pino Toscano <pino@debian.org>  Wed, 19 Jul 2023 07:02:48 +0200
  
  kalgebra (4:22.12.3-1) unstable; urgency=medium
  

diff --cc debian/control
index 98b24b4baeefa471d45425a339066fb8365aea64,e661d6c8ccbfa10224fc17cde822712bf953cf22..040b943902a9d755c929457b3191796ac145e902
--- 1/debian/control
--- 2/debian/control
+++ b/debian/control
@@@ -3,42 -3,43 +3,43 @@@ Section: kd
  Priority: optional
  Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>
  Uploaders: Aurélien COUDERC <coucouf@debian.org>,
-            Norbert Preining <norbert@preining.info>,
  Build-Depends: cmake (>= 3.16~),
                 debhelper-compat (= 13),
-                extra-cmake-modules (>= 5.90.0~),
-                kirigami2-dev,
-                libanalitza-dev (>= 4:20.08.0~),
-                libgl1-mesa-dev,
-                libglu1-mesa-dev,
-                libkf5configwidgets-dev (>= 5.90.0~),
-                libkf5coreaddons-dev (>= 5.90.0~),
-                libkf5doctools-dev (>= 5.90.0~),
-                libkf5i18n-dev (>= 5.90.0~),
-                libkf5kio-dev (>= 5.90.0~),
-                libkf5widgetsaddons-dev (>= 5.90.0~),
-                libncurses5-dev,
-                libqt5opengl5-dev (>= 5.14),
-                libqt5svg5-dev (>= 5.15~),
+                dh-sequence-kf6,
+                dh-sequence-qmldeps,
+                extra-cmake-modules (>= 6.3.0~),
+                libanalitza-dev (>= 4:24.08.2~),
+                libgl-dev,
+                libglu-dev,
+                kirigami-addons-dev,
+                libkf6configwidgets-dev (>= 6.3.0~),
+                libkf6coreaddons-dev (>= 6.3.0~),
+                libkf6doctools-dev (>= 6.3.0~),
+                libkf6i18n-dev (>= 6.3.0~),
+                libkf6kio-dev (>= 6.3.0~),
+                libkf6xmlgui-dev (>= 6.3.0~),
+                libkf6widgetsaddons-dev (>= 6.3.0~),
+                libncurses-dev,
+                libplasma-dev,
+                qt6-svg-dev (>= 6.5.0~),
                 libreadline-dev,
-                pkg-config,
-                pkg-kde-tools (>> 0.15.15),
-                qtbase5-dev (>= 5.15~),
-                qtdeclarative5-dev (>= 5.15~),
-                qtquickcontrols2-5-dev,
-                qtwebengine5-dev [amd64 arm64 i386 mipsel],
- Standards-Version: 4.6.2
+                pkgconf,
+                qt6-base-dev (>= 6.5.0~),
+                qt6-declarative-dev (>= 6.5.0~),
 -               qt6-webengine-dev (>= 6.5.0~) [amd64 arm64 armhf i386],
++               qt6-webengine-dev (>= 6.5.0~) [amd64 arm64 i386],
+ Standards-Version: 4.7.0
  Homepage: https://edu.kde.org/kalgebra
  Vcs-Browser: https://salsa.debian.org/qt-kde-team/kde/kalgebra
  Vcs-Git: https://salsa.debian.org/qt-kde-team/kde/kalgebra.git
  Rules-Requires-Root: no
  
  Package: kalgebra
- Architecture: amd64 arm64 i386 mipsel
 -Architecture: amd64 arm64 armhf i386
++Architecture: amd64 arm64 i386
  Section: math
- Depends: kalgebra-common (= ${binary:Version}),
+ Depends: kalgebra-common (= ${source:Version}),
           ${misc:Depends},
           ${shlibs:Depends},
+ Suggests: kalgebra-plasmoid
  Conflicts: calgebra,
  Description: algebraic graphing calculator
   KAlgebra is a algebraic graphing calculator with support for 3D graphing and

diff --cc debian/rules
index adb305af705b0c1a2a66d841af2ac28ac64b91a7,af7e89d784e4de2b19d99ad4d18e81643acfdfcc..f4a8a9af296696d7b66b0183232bac280ed5e575
--- 1/debian/rules
--- 2/debian/rules
+++ b/debian/rules
@@@ -6,22 -6,12 +6,16 @@@ export DEB_BUILD_MAINT_OPTIONS = harden
  
  include /usr/share/dpkg/architecture.mk
  
- webengine_archs := amd64 arm64 i386 mipsel
 -webengine_archs := amd64 arm64 armhf i386
++webengine_archs := amd64 arm64 i386
  
  %:
-       dh $@ --with kf5
+       dh $@
  
  ifneq ($(DEB_HOST_ARCH),$(filter $(DEB_HOST_ARCH),$(webengine_archs)))
  override_dh_auto_configure:
-       dh_auto_configure --buildsystem=kf5 -- -DMOBILE_BACKEND="none"
+       dh_auto_configure --buildsystem=kf6 -- -DMOBILE_BACKEND="none"
  endif
 +
 +override_dh_auto_clean:
 +      dh_auto_clean
 +      rm -rf debian/kalgebra