Merge version 3.0.rc2+repack1-3+rpi1 and 3.1+ds1-3 to produce 3.1+ds1-3+rpi1

diff --cc debian/changelog
index 9ca1b9566c0f4b74a34361ecc67d085b28d6b871,55ea8ce073abdc0b7553f1c96177b5784484db71..effc89cc7d15df42ea7f218edc69cc2e1619c3c5
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,8 -1,53 +1,60 @@@
- solvespace (3.0.rc2+repack1-3+rpi1) bullseye-staging; urgency=medium
++solvespace (3.1+ds1-3+rpi1) bookworm-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.
 +
-  -- Peter Michael Green <plugwash@raspbian.org>  Sat, 08 May 2021 11:09:42 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Tue, 14 Feb 2023 23:42:48 +0000
++
+ solvespace (3.1+ds1-3) unstable; urgency=medium
+ 
+   * Team upload.
+   * Restore architectures, and just exclude s390x from affected tests.
+     Thanks to Graham Inggs. Closes: #1025311
+ 
+  -- Ryan Pavlik <ryan@ryanpavlik.com>  Wed, 07 Dec 2022 16:25:41 -0600
+ 
+ solvespace (3.1+ds1-2) unstable; urgency=medium
+ 
+   * Team upload.
+   * Drop s390x architecture due to test failures. Closes: #1013163
+   * Bump Standards-Version to 4.6.1. No changes required.
+   * d/copyright: Update
+   * Update lintian overrides.
+ 
+  -- Ryan Pavlik <ryan@ryanpavlik.com>  Mon, 19 Sep 2022 12:49:06 -0500
+ 
+ solvespace (3.1+ds1-1) unstable; urgency=medium
+ 
+   * Team upload.
+   * New upstream version 3.1+ds1
+   * Rediff patches.
+     Drop 05_eigen_dependency_fix.patch: Applied upstream.
+     Drop 06_desktop_file_exec.patch: Applied upstream.
+ 
+  -- Ryan Pavlik <ryan@ryanpavlik.com>  Mon, 11 Jul 2022 08:55:26 -0500
+ 
+ solvespace (3.1~rc1+ds1-1) unstable; urgency=medium
+ 
+   * New upstream version 3.1~rc1+ds1. Closes: #983952
+   * d/watch: Update to get new pattern for tarballs with submodules
+   * d/control:
+     - Add Build-Depends.
+     - Remove libjs-three and unifont from Build-Depends, only
+       needed at runtime for the GUI
+   * d/copyright: Exclude vendored files available in Debian, binaries,
+     minified Javascript, prebuilt docs
+   * d/solvespace.lintian-overrides: Add overrides for false positives
+   * d/get_orig.sh: Remove, no longer needed, uscan works now.
+   * d/patches:
+     - Drop 10_mimalloc_restrict_cpu_yield.patch: applied upstream.
+     - Drop 11_update_js_three_r111.patch: applied upstream.
+     - Drop 12_Remove-march-native-from-mimalloc-build.patch: applied upstream.
+     - Revise 01_RemoveGitHash.patch into 01_hardcode_git_hash.patch: Hash
+       needed to create commit link in app now.
+     - Add 05_eigen_dependency_fix.patch: Fix test suite build.
+     - Add 06_desktop_file_exec.patch: Fix desktop file lintian warning.
+ 
+  -- Ryan Pavlik <ryan@ryanpavlik.com>  Thu, 19 May 2022 16:05:37 -0500
  
  solvespace (3.0.rc2+repack1-3) unstable; urgency=medium