From: Raspbian automatic forward porter Date: Sat, 19 Oct 2024 01:34:34 +0000 (+0100) Subject: Merge version 2019.2.0~git20230811.ff54a68+dfsg1-1+rpi1 and 2019.2.0~git20230811... X-Git-Tag: archive/raspbian/2019.2.0_git20230811.ff54a68+dfsg1-3+rpi1 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=3501208a0690a7bdaeba082a57613805d15b15bf;p=mshr.git Merge version 2019.2.0~git20230811.ff54a68+dfsg1-1+rpi1 and 2019.2.0~git20230811.ff54a68+dfsg1-3 to produce 2019.2.0~git20230811.ff54a68+dfsg1-3+rpi1 --- a415cd89a6e0d9bbf16b5f6fe3afa90baee46a62 diff --cc debian/changelog index f3d8b34,4818ba3..f8d5b57 --- a/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 at Sun, 24 Apr 2022 21:08:59 +0000] + * Link with libatomic. + - -- Raspbian forward porter Sat, 17 Feb 2024 21:33:12 +0000 ++ -- Raspbian forward porter Sat, 19 Oct 2024 01:34:33 +0000 ++ + mshr (2019.2.0~git20230811.ff54a68+dfsg1-3) unstable; urgency=medium + + * Upload to unstable + + -- Francesco Ballarin 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 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 413f4d3,16c4b6f..7fe4ad7 --- a/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