Manual merge of version 0.10.6-1+rpi1 and 0.10.6-5 to produce 0.10.6-5+rpi1

diff --cc debian/changelog
index 06a8d7d9b9d08e495d1d5f6042bfc4ae286eecd7,67944d97d5251c2290ff0ad83339f1d9bb6b5653..28446dfe34410dc0031204209f7d30e857047769
--- 1/debian/changelog
--- 2/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 <plugwash@raspbian.org> at Sat, 23 Apr 2022 15:15:39 +0000]
 +  * Link with libatomic.
 +
-  -- Peter Michael Green <plugwash@raspbian.org>  Sat, 23 Apr 2022 15:15:39 +0000
++ -- Peter Michael Green <plugwash@raspbian.org>  Thu, 24 Apr 2025 22:48:24 +0000
++
+ pygalmesh (0.10.6-5) unstable; urgency=medium
+ 
+   * fix test skip for s390x
+ 
+  -- Drew Parsons <dparsons@debian.org>  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 <dparsons@debian.org>  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 <tsu.yubo@gmail.com>  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 <dparsons@debian.org>  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 4eba1e9537cb0100d464c97ba6ddb54c6283edf4,0000000000000000000000000000000000000000..e60fe183596a3979dfe44cb893ddf531e4a49ced
mode 100644,000000..100644
--- 1/debian/patches/link-with-libatomic.patch
--- /dev/null
+++ b/debian/patches/link-with-libatomic.patch
@@@ -1,29 -1,0 +1,29 @@@
- 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
 +Description:  Link with libatomic.
 +Author: Peter Michael Green <plugwash@raspbian.org>
 +
++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 8595dd9edbfaec867c8be9ee296fa7cdb895ce1f,40ed474d2a7a8c5947af5ceb18a73cf9b10e4d99..c95ffbd9b974b026c106ad1d98dc5f37cb257847
--- 1/debian/patches/series
--- 2/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 0a189864c450807597887a21dafe2f4063a46516,fbd597dd8d2d6e86a3a36043e5178dc6f12a685d..36fb8407b6002ab36c284e7538e7a71ae6827671
--- 1/src/CMakeLists.txt
--- 2/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)