Merge version 3.1+ds1-3+rpi1 and 3.1+ds1-3.1 to produce 3.1+ds1-3.1+rpi1

diff --cc debian/changelog
index effc89cc7d15df42ea7f218edc69cc2e1619c3c5,ba0c9ca2c200ae081fe42b815bb8d4ddd4572db1..1bc7a2a7f8e7828d5d0c4bf0a24f44dc93ac4f56
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,9 +1,16 @@@
- solvespace (3.1+ds1-3+rpi1) bookworm-staging; urgency=medium
++solvespace (3.1+ds1-3.1+rpi1) trixie-staging; urgency=medium
 +
 +  [changes brought forward from 3.0.rc2+repack1-3+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Sat, 08 May 2021 11:09:42 +0000]
 +  * Link with libatomic on armhf too.
 +
-  -- Raspbian forward porter <root@raspbian.org>  Tue, 14 Feb 2023 23:42:48 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Wed, 02 Oct 2024 13:26:01 +0000
++
+ solvespace (3.1+ds1-3.1) unstable; urgency=medium
+ 
+   * Non-maintainer upload.
+   * Rename libraries for 64-bit time_t transition.  Closes: #1062911
+ 
+  -- Benjamin Drung <bdrung@debian.org>  Thu, 29 Feb 2024 17:02:12 +0000
  
  solvespace (3.1+ds1-3) unstable; urgency=medium