From: Raspbian automatic forward porter Date: Sat, 17 Feb 2024 21:33:13 +0000 (+0000) Subject: Merge version 2019.2.0~git20200924.c27eb18+dfsg1-10+rpi1 and 2019.2.0~git20230811... X-Git-Tag: archive/raspbian/2019.2.0_git20230811.ff54a68+dfsg1-1+rpi1^0 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=aaad160c903b8432825e5821ef41fd6edaaf2e8e;p=mshr.git Merge version 2019.2.0~git20200924.c27eb18+dfsg1-10+rpi1 and 2019.2.0~git20230811.ff54a68+dfsg1-1 to produce 2019.2.0~git20230811.ff54a68+dfsg1-1+rpi1 --- aaad160c903b8432825e5821ef41fd6edaaf2e8e diff --cc debian/changelog index e0f86b9,bcfa667..f3d8b34 --- a/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 at Sun, 24 Apr 2022 21:08:59 +0000] + * Link with libatomic. + - -- Raspbian forward porter Thu, 02 Nov 2023 04:43:48 +0000 ++ -- Raspbian forward porter 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 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 162b442,1e0f03c..413f4d3 --- a/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