Merge version 1.20+ds-4+rpi1 and 1.20+ds-6 to produce 1.20+ds-6+rpi1

diff --cc debian/changelog
index d7805a7dc64d56c42ab4027aed32163f09a96cbf,c88b1fe1a02e3e3af7de09b8350048a8417f81f1..721dc56f774f3f9cff229c630eee9bb811f27df1
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,17 -1,17 +1,32 @@@
- macaulay2 (1.20+ds-4+rpi1) bookworm-staging; urgency=medium
++macaulay2 (1.20+ds-6+rpi1) bookworm-staging; urgency=medium
 +
 +  [Changes introduced in 1.18+ds-1+rpi1 by Peter Michael Green]
 +  * Disable testsuite.
 +  * Link individual font files rather than whole directory to avoid errors
 +    on ".uuid" file.
 +  * Disable upstream clean target, it's worse than useless
 +  * Start writing manual cleanup (far from complete at this point)
 +  
 +  [changes introduced in 1.19.1+ds-8+rpi1 by Peter Michael Green]
 +  * Disable documentation build.
 +  * Extend manual cleaning (still not complete).
 +
-  -- Peter Michael Green <plugwash@raspbian.org>  Sat, 28 May 2022 07:25:19 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Tue, 21 Jun 2022 13:20:46 +0000
++
+ macaulay2 (1.20+ds-6) unstable; urgency=medium
+ 
+   * debian/patches/libatomic.patch
+     - Fix patch; we need to include -latomic in LIBS before we try to link
+       against TBB.
+ 
+  -- Doug Torrance <dtorrance@debian.org>  Tue, 14 Jun 2022 10:41:24 -0400
+ 
+ macaulay2 (1.20+ds-5) unstable; urgency=medium
+ 
+   * debian/patches/libatomic.patch
+     - Link against libatomic for TBB check to prevent FTBFS on armel.
+ 
+  -- Doug Torrance <dtorrance@debian.org>  Tue, 14 Jun 2022 09:55:58 -0400
  
  macaulay2 (1.20+ds-4) unstable; urgency=medium