Merge version 2019.2.0~git20230811.ff54a68+dfsg1-1+rpi1 and 2019.2.0~git20230811...

diff --cc CMakeLists.txt
Simple merge

diff --cc debian/changelog
index f3d8b340424e37e659452b370daf22ba7e5434c3,4818ba3836c7b10ee00d80c7c47eb083ffcdba72..f8d5b57d62f2829e2c66050def61caafb698df65
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,20 +1,27 @@@
- mshr (2019.2.0~git20230811.ff54a68+dfsg1-1+rpi1) trixie-staging; urgency=medium
++mshr (2019.2.0~git20230811.ff54a68+dfsg1-3+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>  Sat, 17 Feb 2024 21:33:12 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Sat, 19 Oct 2024 01:34:33 +0000
++
+ mshr (2019.2.0~git20230811.ff54a68+dfsg1-3) unstable; urgency=medium
+ 
+   * Upload to unstable
+ 
+  -- Francesco Ballarin <francesco.ballarin@unicatt.it>  Sun, 06 Oct 2024 13:52:13 +0000
+ 
+ mshr (2019.2.0~git20230811.ff54a68+dfsg1-2exp1) experimental; urgency=medium
+ 
+   * Add Francesco Ballarin to uploaders
+   * Add patch CGAL_6_compatibility.diff for compatibility with CGAL 6:
+     - bump minum required CGAL version to 6 in cmake
+     - require C++17 standard in cmake
+     - replace boost::get and assignment to a local variable with CGAL::assign
+     Closes: #1074116
+   * Build-Depends on libcgal-dev >= 6.0~
+ 
+  -- Francesco Ballarin <francesco.ballarin@unicatt.it>  Tue, 25 Jun 2024 12:40:24 +0000
  
  mshr (2019.2.0~git20230811.ff54a68+dfsg1-1) unstable; urgency=medium
  

diff --cc debian/patches/series
index 413f4d35a88e2d9f2789dea8b6ea8bd0c235be61,16c4b6f5512ee6e585b3471812f808cd6ed0b860..7fe4ad7c63e5cc17a018433863c0f8f447e01263
--- 1/debian/patches/series
--- 2/debian/patches/series
+++ b/debian/patches/series
@@@ -1,3 -1,3 +1,4 @@@
  test_controls.diff
  lib_rename.patch
+ CGAL_6_compatibility.diff
 +link-with-libatomic.patch