From: Raspbian automatic forward porter Date: Thu, 2 Nov 2023 04:43:48 +0000 (+0000) Subject: Merge version 2019.2.0~git20200924.c27eb18+dfsg1-7+rpi1 and 2019.2.0~git20200924... X-Git-Tag: archive/raspbian/2019.2.0_git20200924.c27eb18+dfsg1-10+rpi1 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=9da550be906cc6a724b487e4af7f493cedca0f0d;p=mshr.git Merge version 2019.2.0~git20200924.c27eb18+dfsg1-7+rpi1 and 2019.2.0~git20200924.c27eb18+dfsg1-10 to produce 2019.2.0~git20200924.c27eb18+dfsg1-10+rpi1 --- fa8e3a11c28e67f2d657e7ece4fb5efeb479683e diff --cc debian/changelog index f94380d,e7cbe8a..e0f86b9 --- a/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 at Sun, 24 Apr 2022 21:08:59 +0000] + * Link with libatomic. + - -- Peter Michael Green Sun, 24 Apr 2022 21:08:59 +0000 ++ -- Raspbian forward porter 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 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 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 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 37d5896,7f1d795..162b442 --- a/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