Merge version 1.21.1+ds1-1+rpi1 and 1.22.5+ds1-1 to produce 1.22.5+ds1-1+rpi1

diff --cc debian/changelog
index c892b4dbd76da0e43b7295aceb2c493f299747bc,733aebfd532080c85fc24084442f994e46a7726e..a30caf460a21d9ee31aba22ab61124ec29063e69
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,10 +1,17 @@@
- pymupdf (1.21.1+ds1-1+rpi1) bookworm-staging; urgency=medium
++pymupdf (1.22.5+ds1-1+rpi1) trixie-staging; urgency=medium
 +
 +  [changes brought forward from 1.19.2+ds1-1+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Thu, 21 Apr 2022 07:16:29 +0000]
 +  * Disable testsuite.
 +
-  -- Raspbian forward porter <root@raspbian.org>  Thu, 02 Feb 2023 22:56:00 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Sun, 01 Oct 2023 02:44:54 +0000
++
+ pymupdf (1.22.5+ds1-1) unstable; urgency=medium
+ 
+   * Team upload
+   * New upstream version 1.22.5+ds1 (Closes: #1038758)
+   * Drop build fix for non-Linux platforms
+ 
+  -- Bastian Germann <bage@debian.org>  Thu, 29 Jun 2023 01:14:36 +0200
  
  pymupdf (1.21.1+ds1-1) unstable; urgency=medium