Merge version 1.2.4+dfsg-1+rpi1 and 1.2.5+dfsg-1 to produce 1.2.5+dfsg-1+rpi1

diff --cc debian/changelog
index bc556b9aeeb60867f9bf0f5f78fd12a652e40ede,da83b9b22ae8fa2d508b6b31c1fab00ed61394ff..b15b1c3769afa6d7136c1139541bddda1291f763
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,8 -1,8 +1,15 @@@
- python-fitsio (1.2.4+dfsg-1+rpi1) trixie-staging; urgency=medium
++python-fitsio (1.2.5+dfsg-1+rpi1) trixie-staging; urgency=medium
 +
++  [changes brought forward from 1.2.4+dfsg-1+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Thu, 27 Jun 2024 15:35:58 +0000]
 +  * Disable testsuite.
 +
-  -- Peter Michael Green <plugwash@raspbian.org>  Thu, 27 Jun 2024 15:35:58 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Thu, 01 May 2025 01:25:43 +0000
++
+ python-fitsio (1.2.5+dfsg-1) unstable; urgency=medium
+ 
+   * New upstream version 1.2.5+dfsg
+ 
+  -- Ole Streicher <olebole@debian.org>  Sat, 08 Feb 2025 14:02:41 +0100
  
  python-fitsio (1.2.4+dfsg-1) unstable; urgency=medium