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

diff --cc debian/changelog
index f94380d4d71a18c957228983b5bd748991f861ae,e7cbe8aac412f7f92b0ae9989b81f2d3f80e8be3..e0f86b97a681c1e404158fe0c21ab6be64ab0b77
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,8 -1,31 +1,38 @@@
- mshr (2019.2.0~git20200924.c27eb18+dfsg1-7+rpi1) bookworm-staging; urgency=medium
++mshr (2019.2.0~git20200924.c27eb18+dfsg1-10+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.
 +
-  -- Peter Michael Green <plugwash@raspbian.org>  Sun, 24 Apr 2022 21:08:59 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Thu, 02 Nov 2023 04:43:48 +0000
++
+ mshr (2019.2.0~git20200924.c27eb18+dfsg1-10) unstable; urgency=medium
+ 
+   * update debian patch build_CGAL5.6.patch for backwards compatibility
+     - apply named parameters one-by-one
+     - check CGAL version when calling has_Has_features
+ 
+  -- Drew Parsons <dparsons@debian.org>  Thu, 10 Aug 2023 16:23:24 +0200
+ 
+ mshr (2019.2.0~git20200924.c27eb18+dfsg1-9) unstable; urgency=medium
+ 
+   * make mshr.pth more robust with respect to PETSc installation.
+     Use default path if petscconf.h can't be found. Closes: #1000950.
+   * debian patch build_CGAL5.6.patch fixes build for CGAL 5.6.
+     Named parameters can only be set in CGAL functions.
+     Closes: #1043307
+   * Standards-Version: 4.6.2
+ 
+  -- Drew Parsons <dparsons@debian.org>  Thu, 10 Aug 2023 03:47:17 +0200
+ 
+ mshr (2019.2.0~git20200924.c27eb18+dfsg1-8) unstable; urgency=medium
+ 
+   [ Debian Janitor ]
+   * Remove constraints unnecessary since buster (oldstable):
+     + Build-Depends: Drop versioned constraint on cmake, libcgal-dev and
+       python3-pybind11.
+     + libmshr-dev-common: Drop versioned constraint on cmake in Depends.
+ 
+  -- Drew Parsons <dparsons@debian.org>  Sat, 22 Jul 2023 15:18:42 +0200
  
  mshr (2019.2.0~git20200924.c27eb18+dfsg1-7) unstable; urgency=medium
  

diff --cc debian/patches/series
index 37d58964c5a09333b908f23ae5eeab2c56d41dac,7f1d79556a0c06dab683a58620e6aa49cf59b7b7..162b442379fac997ab001d515094d6bad1b006d2
--- 1/debian/patches/series
--- 2/debian/patches/series
+++ b/debian/patches/series
@@@ -3,4 -3,4 +3,5 @@@ fix_mesh3_internal.patc
  enable_CGAL5_CXX14.patch
  build_CGAL5.patch
  lib_rename.patch
+ build_CGAL5.6.patch
 +link-with-libatomic.patch