Merge version 1.20+ds-7+rpi1 and 1.21+ds-3 to produce 1.21+ds-3+rpi1

diff --cc debian/changelog
index 756f9c5af3191981ecf17f85fdc2db5980bdf14f,8a4db97601ce6a0434db818d9bdc4055732dc65a..8269980a9d7e117f6c4e7ba3de3ada6e7e6f66e8
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,17 -1,93 +1,108 @@@
- macaulay2 (1.20+ds-7+rpi1) bookworm-staging; urgency=medium
++macaulay2 (1.21+ds-3+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>  Mon, 04 Jul 2022 07:40:31 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Sun, 08 Jan 2023 19:34:59 +0000
++
+ macaulay2 (1.21+ds-3) unstable; urgency=medium
+ 
+   * debian/control
+     - Bump Standards-Version to 4.6.2.
+   * debian/macaulay2-common.linktrees
+     - Go back to providing paths to specific KaTeX files in "contrib"
+       folder; the documentation is expecting ".min.js", but the Debian
+       package has only ".js".
+   * debian/patches/skip-failing-package-tests.patch
+     - Skip Topcom and Triangulations tests that are mysteriously failing
+       during Ubuntu autopkgtests.
+ 
+  -- Doug Torrance <dtorrance@debian.org>  Sat, 31 Dec 2022 10:43:00 -0500
+ 
+ macaulay2 (1.21+ds-2) unstable; urgency=medium
+ 
+   * debian/copyright
+     - Add license info for GMP <-> Python integer conversion routines from
+       gmpy2 used by Python package.
+     - Add license info for JSON parsing tests.
+   * debian/patches/topcom-memopt.patch
+     - New patch; use --memopt option when calling TOPCOM to save memory and
+       avoid example/test failures.
+   * debian/rules
+     - Update comment about cached examples.
+     - Add -latomics to LIBS on armel to fix TBB linking issue.
+   * debian/tests/control
+     - Add libmpfi-dev to Depends for package tests; it is needed for a
+       ForeignFunctions test.
+ 
+  -- Doug Torrance <dtorrance@debian.org>  Fri, 16 Dec 2022 06:07:27 -0500
+ 
+ macaulay2 (1.21+ds-1) unstable; urgency=medium
+ 
+   * New upstream release.
+   * debian/control
+     - Add libffi-dev to Build-Depends; needed for new ForeignFunctions
+       package.
+   * debian/copyright
+     - Add license information for new packages.
+   * debian/macaulay2-common.lintian-overrides
+     - Update package-contains-documentation-outside-usr-share-doc paths.
+   * debian/patches/customize-argument-mode.patch
+     - Remove patch; applied upstream.
+   * debian/patches/libatomic.patch
+     - Remove patch; issue fixed in tbb package.
+   * debian/patches/skip-failing-core-tests.patch
+     - Remove timing-quotient patch; applied upstream.
+   * debian/patches/skip-failing-package-tests.patch
+     - Restore Topcom tests; they were only failing occassionally and we'd
+       like to make sure they run with the most recent version of TOPCOM.
+     - Remove VersalDeformations patch; this test was commented out
+       upstream.
+     - Skip some AssociativeAlgebras and MinimalPrimes tests that have been
+       failing.
+ 
+  -- Doug Torrance <dtorrance@debian.org>  Wed, 14 Dec 2022 19:54:09 -0500
+ 
+ macaulay2 (1.20+ds-9) unstable; urgency=medium
+ 
+   * debian/patches/skip-failing-package-tests.patch
+     - Skip RandomGenus14Curves tests on armel; they were running out of
+       memory during CI tests.
+ 
+  -- Doug Torrance <dtorrance@debian.org>  Sun, 30 Oct 2022 09:40:50 -0400
+ 
+ macaulay2 (1.20+ds-8) unstable; urgency=medium
+ 
+   * debian/control
+     - Add bergman to Suggests.  It was recently uploaded to Debian and is
+       used by the NCAlgebra package.
+   * debian/macaulay2-common.linktrees
+     - Create symlink to katex/contrib directory instead of specific
+       files within the directory since copy-tex.css was removed in
+       KaTeX 0.16.0 (Closes: #1022732).
+   * debian/macaulay2-common.lintian-overrides
+     - Add square brackets around filenames to match new lintian output.
+   * debian/README.Debian
+     - Begin documenting non-free 3rd-party programs.
+     - Mention bergman in "Suggested packages" section.
+   * debian/rules
+     - Build without link-time optimization (Closes: #1015537).
+   * debian/scripts/m2-get-orig-source.sh
+     - Exit when there's an error regenerating examples.
+   * debian/source/lintian-overrides
+     - Add square brackets around filenames to match new lintian output.
+     - Add source-is-missing override for WeylGroups package tutorial; false
+       positive.
+ 
+  -- Doug Torrance <dtorrance@debian.org>  Tue, 25 Oct 2022 08:04:19 -0400
  
  macaulay2 (1.20+ds-7) unstable; urgency=medium
  

diff --cc debian/macaulay2-common.linktrees
index 74a3bfe946701ac3eff758e42d95e10334f38790,5700731a6b473d48763871d62d9c6d8e9625264d..f7c98fe3c8749a20f2ff16aee0380e0d12c91e1d
--- 1/debian/macaulay2-common.linktrees
--- 2/debian/macaulay2-common.linktrees
+++ b/debian/macaulay2-common.linktrees
@@@ -17,68 -17,8 +17,67 @@@ embed-weakdep usr/share/javascript/thre
  embed-weakdep usr/share/javascript/underscore/underscore.min.js usr/share/Macaulay2/Visualize/js/underscore.js
  
  # KaTeX
 -embed-weakdep usr/share/fonts/truetype/katex usr/share/Macaulay2/Style/katex/fonts
 +embed-weakdep usr/share/fonts/truetype/katex/KaTeX_AMS-Regular.ttf usr/share/Macaulay2/Style/katex/fonts/KaTeX_AMS-Regular.ttf
 +embed-weakdep usr/share/fonts/truetype/katex/KaTeX_AMS-Regular.woff usr/share/Macaulay2/Style/katex/fonts/KaTeX_AMS-Regular.woff
 +embed-weakdep usr/share/fonts/truetype/katex/KaTeX_AMS-Regular.woff2 usr/share/Macaulay2/Style/katex/fonts/KaTeX_AMS-Regular.woff2
 +embed-weakdep usr/share/fonts/truetype/katex/KaTeX_Caligraphic-Bold.ttf usr/share/Macaulay2/Style/katex/fonts/KaTeX_Caligraphic-Bold.ttf
 +embed-weakdep usr/share/fonts/truetype/katex/KaTeX_Caligraphic-Bold.woff usr/share/Macaulay2/Style/katex/fonts/KaTeX_Caligraphic-Bold.woff
 +embed-weakdep usr/share/fonts/truetype/katex/KaTeX_Caligraphic-Bold.woff2 usr/share/Macaulay2/Style/katex/fonts/KaTeX_Caligraphic-Bold.woff2
 +embed-weakdep usr/share/fonts/truetype/katex/KaTeX_Caligraphic-Regular.ttf usr/share/Macaulay2/Style/katex/fonts/KaTeX_Caligraphic-Regular.ttf
 +embed-weakdep usr/share/fonts/truetype/katex/KaTeX_Caligraphic-Regular.woff usr/share/Macaulay2/Style/katex/fonts/KaTeX_Caligraphic-Regular.woff
 +embed-weakdep usr/share/fonts/truetype/katex/KaTeX_Caligraphic-Regular.woff2 usr/share/Macaulay2/Style/katex/fonts/KaTeX_Caligraphic-Regular.woff2
 +embed-weakdep usr/share/fonts/truetype/katex/KaTeX_Fraktur-Bold.ttf usr/share/Macaulay2/Style/katex/fonts/KaTeX_Fraktur-Bold.ttf
 +embed-weakdep usr/share/fonts/truetype/katex/KaTeX_Fraktur-Bold.woff usr/share/Macaulay2/Style/katex/fonts/KaTeX_Fraktur-Bold.woff
 +embed-weakdep usr/share/fonts/truetype/katex/KaTeX_Fraktur-Bold.woff2 usr/share/Macaulay2/Style/katex/fonts/KaTeX_Fraktur-Bold.woff2
 +embed-weakdep usr/share/fonts/truetype/katex/KaTeX_Fraktur-Regular.ttf usr/share/Macaulay2/Style/katex/fonts/KaTeX_Fraktur-Regular.ttf
 +embed-weakdep usr/share/fonts/truetype/katex/KaTeX_Fraktur-Regular.woff usr/share/Macaulay2/Style/katex/fonts/KaTeX_Fraktur-Regular.woff
 +embed-weakdep usr/share/fonts/truetype/katex/KaTeX_Fraktur-Regular.woff2 usr/share/Macaulay2/Style/katex/fonts/KaTeX_Fraktur-Regular.woff2
 +embed-weakdep usr/share/fonts/truetype/katex/KaTeX_Main-BoldItalic.ttf usr/share/Macaulay2/Style/katex/fonts/KaTeX_Main-BoldItalic.ttf
 +embed-weakdep usr/share/fonts/truetype/katex/KaTeX_Main-BoldItalic.woff usr/share/Macaulay2/Style/katex/fonts/KaTeX_Main-BoldItalic.woff
 +embed-weakdep usr/share/fonts/truetype/katex/KaTeX_Main-BoldItalic.woff2 usr/share/Macaulay2/Style/katex/fonts/KaTeX_Main-BoldItalic.woff2
 +embed-weakdep usr/share/fonts/truetype/katex/KaTeX_Main-Bold.ttf usr/share/Macaulay2/Style/katex/fonts/KaTeX_Main-Bold.ttf
 +embed-weakdep usr/share/fonts/truetype/katex/KaTeX_Main-Bold.woff usr/share/Macaulay2/Style/katex/fonts/KaTeX_Main-Bold.woff
 +embed-weakdep usr/share/fonts/truetype/katex/KaTeX_Main-Bold.woff2 usr/share/Macaulay2/Style/katex/fonts/KaTeX_Main-Bold.woff2
 +embed-weakdep usr/share/fonts/truetype/katex/KaTeX_Main-Italic.ttf usr/share/Macaulay2/Style/katex/fonts/KaTeX_Main-Italic.ttf
 +embed-weakdep usr/share/fonts/truetype/katex/KaTeX_Main-Italic.woff usr/share/Macaulay2/Style/katex/fonts/KaTeX_Main-Italic.woff
 +embed-weakdep usr/share/fonts/truetype/katex/KaTeX_Main-Italic.woff2 usr/share/Macaulay2/Style/katex/fonts/KaTeX_Main-Italic.woff2
 +embed-weakdep usr/share/fonts/truetype/katex/KaTeX_Main-Regular.ttf usr/share/Macaulay2/Style/katex/fonts/KaTeX_Main-Regular.ttf
 +embed-weakdep usr/share/fonts/truetype/katex/KaTeX_Main-Regular.woff usr/share/Macaulay2/Style/katex/fonts/KaTeX_Main-Regular.woff
 +embed-weakdep usr/share/fonts/truetype/katex/KaTeX_Main-Regular.woff2 usr/share/Macaulay2/Style/katex/fonts/KaTeX_Main-Regular.woff2
 +embed-weakdep usr/share/fonts/truetype/katex/KaTeX_Math-BoldItalic.ttf usr/share/Macaulay2/Style/katex/fonts/KaTeX_Math-BoldItalic.ttf
 +embed-weakdep usr/share/fonts/truetype/katex/KaTeX_Math-BoldItalic.woff usr/share/Macaulay2/Style/katex/fonts/KaTeX_Math-BoldItalic.woff
 +embed-weakdep usr/share/fonts/truetype/katex/KaTeX_Math-BoldItalic.woff2 usr/share/Macaulay2/Style/katex/fonts/KaTeX_Math-BoldItalic.woff2
 +embed-weakdep usr/share/fonts/truetype/katex/KaTeX_Math-Italic.ttf usr/share/Macaulay2/Style/katex/fonts/KaTeX_Math-Italic.ttf
 +embed-weakdep usr/share/fonts/truetype/katex/KaTeX_Math-Italic.woff usr/share/Macaulay2/Style/katex/fonts/KaTeX_Math-Italic.woff
 +embed-weakdep usr/share/fonts/truetype/katex/KaTeX_Math-Italic.woff2 usr/share/Macaulay2/Style/katex/fonts/KaTeX_Math-Italic.woff2
 +embed-weakdep usr/share/fonts/truetype/katex/KaTeX_SansSerif-Bold.ttf usr/share/Macaulay2/Style/katex/fonts/KaTeX_SansSerif-Bold.ttf
 +embed-weakdep usr/share/fonts/truetype/katex/KaTeX_SansSerif-Bold.woff usr/share/Macaulay2/Style/katex/fonts/KaTeX_SansSerif-Bold.woff
 +embed-weakdep usr/share/fonts/truetype/katex/KaTeX_SansSerif-Bold.woff2 usr/share/Macaulay2/Style/katex/fonts/KaTeX_SansSerif-Bold.woff2
 +embed-weakdep usr/share/fonts/truetype/katex/KaTeX_SansSerif-Italic.ttf usr/share/Macaulay2/Style/katex/fonts/KaTeX_SansSerif-Italic.ttf
 +embed-weakdep usr/share/fonts/truetype/katex/KaTeX_SansSerif-Italic.woff usr/share/Macaulay2/Style/katex/fonts/KaTeX_SansSerif-Italic.woff
 +embed-weakdep usr/share/fonts/truetype/katex/KaTeX_SansSerif-Italic.woff2 usr/share/Macaulay2/Style/katex/fonts/KaTeX_SansSerif-Italic.woff2
 +embed-weakdep usr/share/fonts/truetype/katex/KaTeX_SansSerif-Regular.ttf usr/share/Macaulay2/Style/katex/fonts/KaTeX_SansSerif-Regular.ttf
 +embed-weakdep usr/share/fonts/truetype/katex/KaTeX_SansSerif-Regular.woff usr/share/Macaulay2/Style/katex/fonts/KaTeX_SansSerif-Regular.woff
 +embed-weakdep usr/share/fonts/truetype/katex/KaTeX_SansSerif-Regular.woff2 usr/share/Macaulay2/Style/katex/fonts/KaTeX_SansSerif-Regular.woff2
 +embed-weakdep usr/share/fonts/truetype/katex/KaTeX_Script-Regular.ttf usr/share/Macaulay2/Style/katex/fonts/KaTeX_Script-Regular.ttf
 +embed-weakdep usr/share/fonts/truetype/katex/KaTeX_Script-Regular.woff usr/share/Macaulay2/Style/katex/fonts/KaTeX_Script-Regular.woff
 +embed-weakdep usr/share/fonts/truetype/katex/KaTeX_Script-Regular.woff2 usr/share/Macaulay2/Style/katex/fonts/KaTeX_Script-Regular.woff2
 +embed-weakdep usr/share/fonts/truetype/katex/KaTeX_Size1-Regular.ttf usr/share/Macaulay2/Style/katex/fonts/KaTeX_Size1-Regular.ttf
 +embed-weakdep usr/share/fonts/truetype/katex/KaTeX_Size1-Regular.woff usr/share/Macaulay2/Style/katex/fonts/KaTeX_Size1-Regular.woff
 +embed-weakdep usr/share/fonts/truetype/katex/KaTeX_Size1-Regular.woff2 usr/share/Macaulay2/Style/katex/fonts/KaTeX_Size1-Regular.woff2
 +embed-weakdep usr/share/fonts/truetype/katex/KaTeX_Size2-Regular.ttf usr/share/Macaulay2/Style/katex/fonts/KaTeX_Size2-Regular.ttf
 +embed-weakdep usr/share/fonts/truetype/katex/KaTeX_Size2-Regular.woff usr/share/Macaulay2/Style/katex/fonts/KaTeX_Size2-Regular.woff
 +embed-weakdep usr/share/fonts/truetype/katex/KaTeX_Size2-Regular.woff2 usr/share/Macaulay2/Style/katex/fonts/KaTeX_Size2-Regular.woff2
 +embed-weakdep usr/share/fonts/truetype/katex/KaTeX_Size3-Regular.ttf usr/share/Macaulay2/Style/katex/fonts/KaTeX_Size3-Regular.ttf
 +embed-weakdep usr/share/fonts/truetype/katex/KaTeX_Size3-Regular.woff usr/share/Macaulay2/Style/katex/fonts/KaTeX_Size3-Regular.woff
 +embed-weakdep usr/share/fonts/truetype/katex/KaTeX_Size3-Regular.woff2 usr/share/Macaulay2/Style/katex/fonts/KaTeX_Size3-Regular.woff2
 +embed-weakdep usr/share/fonts/truetype/katex/KaTeX_Size4-Regular.ttf usr/share/Macaulay2/Style/katex/fonts/KaTeX_Size4-Regular.ttf
 +embed-weakdep usr/share/fonts/truetype/katex/KaTeX_Size4-Regular.woff usr/share/Macaulay2/Style/katex/fonts/KaTeX_Size4-Regular.woff
 +embed-weakdep usr/share/fonts/truetype/katex/KaTeX_Size4-Regular.woff2 usr/share/Macaulay2/Style/katex/fonts/KaTeX_Size4-Regular.woff2
 +embed-weakdep usr/share/fonts/truetype/katex/KaTeX_Typewriter-Regular.ttf usr/share/Macaulay2/Style/katex/fonts/KaTeX_Typewriter-Regular.ttf
 +embed-weakdep usr/share/fonts/truetype/katex/KaTeX_Typewriter-Regular.woff usr/share/Macaulay2/Style/katex/fonts/KaTeX_Typewriter-Regular.woff
 +embed-weakdep usr/share/fonts/truetype/katex/KaTeX_Typewriter-Regular.woff2 usr/share/Macaulay2/Style/katex/fonts/KaTeX_Typewriter-Regular.woff2
  embed-weakdep usr/share/javascript/katex/contrib/auto-render.js usr/share/Macaulay2/Style/katex/contrib/auto-render.min.js
- embed-weakdep usr/share/javascript/katex/contrib/copy-tex.css usr/share/Macaulay2/Style/katex/contrib/copy-tex.min.css
  embed-weakdep usr/share/javascript/katex/contrib/copy-tex.js usr/share/Macaulay2/Style/katex/contrib/copy-tex.min.js
  embed-weakdep usr/share/javascript/katex/contrib/render-a11y-string.js usr/share/Macaulay2/Style/katex/contrib/render-a11y-string.min.js
  embed-weakdep usr/share/javascript/katex/katex.css usr/share/Macaulay2/Style/katex/katex.min.css

diff --cc debian/rules
index c4607b93c1927d570d5469c8ef6ca5502dda6ff9,08a5aba4c56b1009251e1f8b83b11e66419ea9b2..da2963bfcb893750e8d2e8c4a63249139c1a834e
--- 1/debian/rules
--- 2/debian/rules
+++ b/debian/rules
@@@ -26,14 -26,19 +26,19 @@@ LIBDIR := \$${exec_prefix}/lib/$(DEB_HO
  EMACSDIR := \
        \$${prefix}/share/emacs/site-lisp/elpa/macaulay2-$(VERSION)
  
+ # fix TBB linking issue on armel (https://github.com/Macaulay2/M2/pull/2528)
+ ifeq ($(DEB_HOST_ARCH),armel)
+       LIBS = -latomic
+ endif
+ 
  WITH_PYTHON := $(if $(filter nopython, $(DEB_BUILD_PROFILES)),, --with-python)
  
 -ifneq (,$(filter nodoc,$(DEB_BUILD_OPTIONS)))
 +#ifneq (,$(filter nodoc,$(DEB_BUILD_OPTIONS)))
  DISABLE_DOCUMENTATION = --disable-documentation
 -else
 -DISABLE_DOCUMENTATION := $(if $(shell dh_listpackages -i),,\
 -      --disable-documentation)
 -endif
 +#else
 +#DISABLE_DOCUMENTATION := $(if $(shell dh_listpackages -i),,\
 +#     --disable-documentation)
 +#endif
  
  override_dh_auto_configure:
        dh_auto_configure --                \