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

diff --cc debian/changelog
index cad8a789420a9c2e89cce7ae0b8dd3413afcecba,4a69b6824eb5b1419b8e2b21d8d18d2028fb09ea..7374bfa9a074bb20f02e2f5bf736886ef4ac6fc7
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,40 +1,47 @@@
- mshr (2019.2.0~git20230811.ff54a68+dfsg1-4+rpi1) trixie-staging; urgency=medium
++mshr (2019.2.0~git20230811.ff54a68+dfsg1-7+rpi1) forky-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>  Tue, 19 Nov 2024 20:25:58 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Sun, 25 Jan 2026 01:27:47 +0000
++
+ mshr (2019.2.0~git20230811.ff54a68+dfsg1-7) unstable; urgency=medium
+ 
+   * update Build-Depends: libtet-dev for tetgen 1.6
+   * debian patch CGAL_6.1_compatibility.diff enables build with CGAL 6.1
+ 
+  -- Drew Parsons <dparsons@debian.org>  Sun, 05 Oct 2025 22:04:07 +0200
+ 
+ mshr (2019.2.0~git20230811.ff54a68+dfsg1-6) unstable; urgency=medium
+ 
+   * Add boost_filesystem_extension.patch:
+     - Closes: #1110752.
+     - Patches app/mshrable.cpp by accessing file extension via
+       boost::filesystem.
+     - Thanks to Heinrich Schuchardt <heinrich.schuchardt@canonical.com> for
+       providing the patch.
+ 
+  -- Francesco Ballarin <ballarin@debian.org>  Sat, 04 Oct 2025 13:27:06 +0000
+ 
+ mshr (2019.2.0~git20230811.ff54a68+dfsg1-5) unstable; urgency=medium
+ 
+   * Fix Debian Science Maintainers name [Alexandre Detiste]
+   * Update Francesco Ballarin's email address
+   * Standards-Version: 4.7.2 (routine-update)
+   * Reorder sequence of d/control fields by cme (routine-update)
+   * Secure URI in copyright format (routine-update)
+   * Drop useless get-orig-source target (routine-update)
+   * Remove trailing whitespace in debian/changelog (routine-update)
+   * Do not parse d/changelog, as suggested by routine-update:
+     - Get DEB_VERSION from /usr/share/dpkg/default.mk in d/rules
+     - Drop usage of DISTRIBUTION from d/rules: it seems that the variable is not
+       actually used anywhere
+   * Use secure URI in Homepage field (routine-update)
+   * Add missing build dependency on python3-numpy-dev for command dh_numpy3
+     (routine-update).
+   * watch file standard 4 (routine-update)
+ 
+  -- Francesco Ballarin <ballarin@debian.org>  Sat, 13 Sep 2025 06:12:51 +0000
  
  mshr (2019.2.0~git20230811.ff54a68+dfsg1-4) unstable; urgency=medium
  

diff --cc debian/patches/series
index 7fe4ad7c63e5cc17a018433863c0f8f447e01263,6c76672a46948b939a7a9e8c212fbcca1ab1df9a..ece3159104237e8358f5d1a3969dce31059f207b
--- 1/debian/patches/series
--- 2/debian/patches/series
+++ b/debian/patches/series
@@@ -1,4 -1,5 +1,6 @@@
  test_controls.diff
  lib_rename.patch
  CGAL_6_compatibility.diff
+ boost_filesystem_extension.patch
+ CGAL_6.1_compatibility.diff
 +link-with-libatomic.patch