From: Peter Michael Green Date: Thu, 24 Apr 2025 22:49:16 +0000 (+0000) Subject: Manual merge of version 0.10.6-1+rpi1 and 0.10.6-5 to produce 0.10.6-5+rpi1 X-Git-Tag: archive/raspbian/0.10.6-5+rpi1^0 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=fe6fda299190d441cde9495a7b533f8f523b70fb;p=pygalmesh.git Manual merge of version 0.10.6-1+rpi1 and 0.10.6-5 to produce 0.10.6-5+rpi1 --- fe6fda299190d441cde9495a7b533f8f523b70fb diff --cc debian/changelog index 06a8d7d,67944d9..28446df --- a/debian/changelog +++ b/debian/changelog @@@ -1,8 -1,34 +1,41 @@@ - pygalmesh (0.10.6-1+rpi1) bookworm-staging; urgency=medium ++pygalmesh (0.10.6-5+rpi1) trixie-staging; urgency=medium + ++ [changes brought forward from 0.10.6-1+rpi1 by Peter Michael Green at Sat, 23 Apr 2022 15:15:39 +0000] + * Link with libatomic. + - -- Peter Michael Green Sat, 23 Apr 2022 15:15:39 +0000 ++ -- Peter Michael Green Thu, 24 Apr 2025 22:48:24 +0000 ++ + pygalmesh (0.10.6-5) unstable; urgency=medium + + * fix test skip for s390x + + -- Drew Parsons Mon, 30 Dec 2024 19:21:18 +0100 + + pygalmesh (0.10.6-4) unstable; urgency=medium + + * skip test_from_array_with_subdomain_sizing on s390x + * use DEB_HOST_ARCH not DEB_BUILD_ARCH to control build config + + -- Drew Parsons Mon, 30 Dec 2024 10:25:15 +0100 + + pygalmesh (0.10.6-3) unstable; urgency=medium + + * Team upload. + * Fix ftbfs with upstream commit. (Closes: #1074381) + * Add DEB_BUILD_MAINT_OPTIONS to fix hardening issues. + * Add pybuild-plugin-pyproject on B-D. + * Bump Standards-Version to 4.7.0. + * Add Rules-Requires-Root + + -- Bo YU Fri, 15 Nov 2024 23:29:58 +0800 + + pygalmesh (0.10.6-2) unstable; urgency=medium + + * update debian patch test_relax_tolerance.patch to relax tolerance + in test_inr. Closes: #1060276. + * Standards-Version: 4.6.2 + + -- Drew Parsons Wed, 17 Jan 2024 12:44:41 +0100 pygalmesh (0.10.6-1) unstable; urgency=medium diff --cc debian/patches/link-with-libatomic.patch index 4eba1e9,0000000..e60fe18 mode 100644,000000..100644 --- a/debian/patches/link-with-libatomic.patch +++ b/debian/patches/link-with-libatomic.patch @@@ -1,29 -1,0 +1,29 @@@ +Description: Link with libatomic. +Author: Peter Michael Green + - Index: pygalmesh-0.10.6/src/CMakeLists.txt - =================================================================== - --- pygalmesh-0.10.6.orig/src/CMakeLists.txt - +++ pygalmesh-0.10.6/src/CMakeLists.txt - @@ -13,7 +13,7 @@ FILE(GLOB pygalmesh_SRCS "${CMAKE_CURREN - pybind11_add_module(pygalmesh ${pygalmesh_SRCS}) - - # ADD_LIBRARY(pygalmesh ${pygalmesh_SRCS}) - -target_link_libraries(pygalmesh PRIVATE ${CGAL_LIBRARIES}) - +target_link_libraries(pygalmesh PRIVATE ${CGAL_LIBRARIES} -latomic) - - # https://github.com/CGAL/cgal/issues/6002 - # find_program(iwyu_path NAMES include-what-you-use iwyu REQUIRED) - Index: pygalmesh-0.10.6/setup.py - =================================================================== - --- pygalmesh-0.10.6.orig/setup.py - +++ pygalmesh-0.10.6/setup.py ++diff --git a/setup.py b/setup.py ++index 5a75a1c..8d50592 100644 ++--- a/setup.py +++++ b/setup.py +@@ -27,7 +27,7 @@ ext_modules = [ + "/usr/local/include/eigen3", + ], + # no CGAL libraries necessary from CGAL 5.0 onwards +- libraries=["gmp", "mpfr"], ++ libraries=["gmp", "mpfr","atomic"], + ) + ] + ++diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt ++index fbd597d..36fb840 100644 ++--- a/src/CMakeLists.txt +++++ b/src/CMakeLists.txt ++@@ -12,7 +12,7 @@ FILE(GLOB pygalmesh_SRCS "${CMAKE_CURRENT_SOURCE_DIR}/*.cpp") ++ pybind11_add_module(pygalmesh ${pygalmesh_SRCS}) ++ ++ # ADD_LIBRARY(pygalmesh ${pygalmesh_SRCS}) ++-target_link_libraries(pygalmesh PRIVATE CGAL::CGAL) +++target_link_libraries(pygalmesh PRIVATE CGAL::CGAL -latomic) ++ ++ # https://github.com/CGAL/cgal/issues/6002 ++ # find_program(iwyu_path NAMES include-what-you-use iwyu REQUIRED) diff --cc debian/patches/series index 8595dd9,40ed474..c95ffbd --- a/debian/patches/series +++ b/debian/patches/series @@@ -1,2 -1,2 +1,3 @@@ test_relax_tolerance.patch + build-with-CGAL-6.0.patch +link-with-libatomic.patch diff --cc src/CMakeLists.txt index 0a18986,fbd597d..36fb840 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@@ -13,7 -12,7 +12,7 @@@ FILE(GLOB pygalmesh_SRCS "${CMAKE_CURRE pybind11_add_module(pygalmesh ${pygalmesh_SRCS}) # ADD_LIBRARY(pygalmesh ${pygalmesh_SRCS}) - target_link_libraries(pygalmesh PRIVATE ${CGAL_LIBRARIES} -latomic) -target_link_libraries(pygalmesh PRIVATE CGAL::CGAL) ++target_link_libraries(pygalmesh PRIVATE CGAL::CGAL -latomic) # https://github.com/CGAL/cgal/issues/6002 # find_program(iwyu_path NAMES include-what-you-use iwyu REQUIRED)