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

diff --cc debian/changelog
index 721dc56f774f3f9cff229c630eee9bb811f27df1,6124798b24ef39617b55dd108b265eb78d1bb3a7..756f9c5af3191981ecf17f85fdc2db5980bdf14f
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,17 -1,10 +1,25 @@@
- macaulay2 (1.20+ds-6+rpi1) bookworm-staging; urgency=medium
++macaulay2 (1.20+ds-7+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).
 +
-  -- Raspbian forward porter <root@raspbian.org>  Tue, 21 Jun 2022 13:20:46 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Mon, 04 Jul 2022 07:40:31 +0000
++
+ macaulay2 (1.20+ds-7) unstable; urgency=medium
+ 
+   * debian/patches/skip-failing-core-tests.patch
+     - Update upper bound for timing-quotient test to avoid failures in
+       Ubuntu amd64 autopkgtests.  Thanks to Graham Inggs for the patch.
+ 
+  -- Doug Torrance <dtorrance@debian.org>  Tue, 28 Jun 2022 17:13:20 -0400
  
  macaulay2 (1.20+ds-6) unstable; urgency=medium