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

diff --cc debian/changelog
index 1bc7a2a7f8e7828d5d0c4bf0a24f44dc93ac4f56,d47c47fb1d3c685f319d109ed4280bbd145ec9f5..7ce9602433a1138fa4d980c9a88a2450bc3df913
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,18 +1,25 @@@
- solvespace (3.1+ds1-3.1+rpi1) trixie-staging; urgency=medium
++solvespace (3.1+ds1-4+rpi1) forky-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>  Wed, 02 Oct 2024 13:26:01 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Fri, 23 Jan 2026 01:46:30 +0000
++
+ solvespace (3.1+ds1-4) unstable; urgency=medium
+ 
+   [ Michael R. Crusoe ]
+   * Team upload.
+   * d/rules: use DEB_BUILD_OPTION_PARALLEL instead of nproc to respect
+     Debian Policy 4.9.1.
+ 
+   [ Anton Gladky ]
+   * [174f833] fix(debian): Increase min CMake version (Closes: #1113526)
+   * [68aa624] chore(debian): Update debian/watch to version 5 format
+   * [bdc75ed] chore(debian): Update Standards-Version to 4.7.2
+   * [1c024cd] Update lintian override info format
+               in d/solvespace.lintian-overrides on line 2-3.
+ 
+  -- Anton Gladky <gladk@debian.org>  Sat, 11 Oct 2025 11:13:57 +0200
  
  solvespace (3.1+ds1-3.1) unstable; urgency=medium
  

diff --cc debian/rules
Simple merge