Merge version 2.9.0-1+rpi1 and 2.10.1-1 to produce 2.10.1-1+rpi1

diff --cc debian/changelog
index eeff806294c05505e1da59d87b42329458471238,97959eea76e9d8e726b87d46b07d38f1a2d3117d..c30b9bec99a86cb14740fdca74c6a5561e79f5a7
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,8 -1,36 +1,43 @@@
- labplot (2.9.0-1+rpi1) bookworm-staging; urgency=medium
++labplot (2.10.1-1+rpi1) trixie-staging; urgency=medium
 +
++  [changes brought forward from 2.9.0-1+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Sat, 03 Sep 2022 17:52:39 +0000]
 +  * Don't build against cantor on armhf.
 +
-  -- Peter Michael Green <plugwash@raspbian.org>  Sat, 03 Sep 2022 17:52:39 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Sat, 28 Oct 2023 08:02:42 +0000
++
+ labplot (2.10.1-1) unstable; urgency=medium
+ 
+   * New upstream release.
+   * Fix the /usr/share/doc/labplot/examples symlink. (Closes: #1040560)
+   * Remove an obsolete maintscript entry.
+   * Stop using libcantor on mipsel, as libcantor uses qtwebengine which will be
+     soon dropped from mipsel.
+ 
+  -- Pino Toscano <pino@debian.org>  Sun, 16 Jul 2023 19:44:14 +0200
+ 
+ labplot (2.10.0-2) unstable; urgency=medium
+ 
+   * Upload to unstable.
+   * Switch Vcs-* fields back to the 'master' packaging branch.
+ 
+  -- Pino Toscano <pino@debian.org>  Sun, 11 Jun 2023 21:33:45 +0200
+ 
+ labplot (2.10.0-1) experimental; urgency=medium
+ 
+   * New upstream release.
+   * Switch Vcs-* fields to the 'experimental' packaging branch.
+   * Update watch file for the new path.
+   * Set upstream metadata fields: Bug-Database, Bug-Submit.
+   * Update standards version to 4.6.2, no changes needed.
+   * Update the build dependencies according to the upstream build system:
+     - bump cmake to 3.17.0
+     - bump Qt packages to 5.10.0
+     - bump extra-cmake-modules to 5.16.0
+     - add qtbase5-private-dev, needed for the embedded copy of QXlsx
+   * Pass -DENABLE_VECTOR_BLF=OFF to cmake to not build the Vector BLF file
+     format support, as it requires libraries not currently available in Debian.
+ 
+  -- Pino Toscano <pino@debian.org>  Wed, 22 Mar 2023 22:28:40 +0100
  
  labplot (2.9.0-1) unstable; urgency=medium
  

diff --cc debian/control
index c120749e7f952f61109c4222a73bac91816b0d02,bc335c7e69fa4b65b5d3cc8b6c1688e2cbe9dc3c..9d9d7e4a9528e9c0d5caa18f0f4973572d234856
--- 1/debian/control
--- 2/debian/control
+++ b/debian/control
@@@ -31,7 -32,7 +32,7 @@@ Build-Depends: debhelper-compat (= 13)
   libkf5xmlgui-dev (>= 5.16.0),
   kuserfeedback-dev,
   bison,
-  libcantor-dev [amd64 arm64 i386 mips64el mipsel],
 - libcantor-dev [amd64 arm64 armhf i386 mips64el],
++ libcantor-dev [amd64 arm64 i386 mips64el],
   libpoppler-qt5-dev (>= 19.12~),
   libspectre-dev,
   libcfitsio-dev,