Merge version 2019.2.0~git20200924.c27eb18+dfsg1-10+rpi1 and 2019.2.0~git20230811...

diff --cc CMakeLists.txt
Simple merge

diff --cc debian/changelog
index e0f86b97a681c1e404158fe0c21ab6be64ab0b77,bcfa6678c692b1cb5e996e8f793e8cf5cdd53fe9..f3d8b340424e37e659452b370daf22ba7e5434c3
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,17 +1,24 @@@
- mshr (2019.2.0~git20200924.c27eb18+dfsg1-10+rpi1) trixie-staging; urgency=medium
++mshr (2019.2.0~git20230811.ff54a68+dfsg1-1+rpi1) trixie-staging; urgency=medium
 +
 +  [changes brought forward from 2019.2.0~git20200924.c27eb18+dfsg1-7+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Sun, 24 Apr 2022 21:08:59 +0000]
 +  * Link with libatomic.
 +
-  -- Raspbian forward porter <root@raspbian.org>  Thu, 02 Nov 2023 04:43:48 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Sat, 17 Feb 2024 21:33:12 +0000
++
+ mshr (2019.2.0~git20230811.ff54a68+dfsg1-1) unstable; urgency=medium
+ 
+   [ Bas Couwenberg ]
+   * Drop unused libproj-dev (build) dependency.
+ 
+   [ Drew Parsons ]
+   * New upstream snapshot.
+     - applies debian patches:
+       fix_mesh3_internal.patch
+       enable_CGAL5_CXX14.patch
+       build_CGAL5.patch
+       build_CGAL5.6.patch
+ 
+  -- Drew Parsons <dparsons@debian.org>  Mon, 05 Feb 2024 20:10:04 +0100
  
  mshr (2019.2.0~git20200924.c27eb18+dfsg1-10) unstable; urgency=medium
  

diff --cc debian/patches/series
index 162b442379fac997ab001d515094d6bad1b006d2,1e0f03ca368a3cee93fcd2bb238ba1bf053e6698..413f4d35a88e2d9f2789dea8b6ea8bd0c235be61
--- 1/debian/patches/series
--- 2/debian/patches/series
+++ b/debian/patches/series
@@@ -1,7 -1,2 +1,3 @@@
  test_controls.diff
- fix_mesh3_internal.patch
- enable_CGAL5_CXX14.patch
- build_CGAL5.patch
  lib_rename.patch
- build_CGAL5.6.patch
 +link-with-libatomic.patch