diff -Nru macaulay2-1.18+ds/debian/changelog macaulay2-1.18+ds/debian/changelog
--- macaulay2-1.18+ds/debian/changelog	2021-08-21 01:34:00.000000000 +0000
+++ macaulay2-1.18+ds/debian/changelog	2021-09-30 05:27:45.000000000 +0000
@@ -1,3 +1,13 @@
+macaulay2 (1.18+ds-1+rpi1) bookworm-staging; urgency=medium
+
+  * 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)
+
+ -- Peter Michael Green <plugwash@raspbian.org>  Thu, 30 Sep 2021 05:27:45 +0000
+
 macaulay2 (1.18+ds-1) unstable; urgency=medium
 
   * Upload to unstable.
diff -Nru macaulay2-1.18+ds/debian/macaulay2-common.linktrees macaulay2-1.18+ds/debian/macaulay2-common.linktrees
--- macaulay2-1.18+ds/debian/macaulay2-common.linktrees	2021-08-21 01:27:20.000000000 +0000
+++ macaulay2-1.18+ds/debian/macaulay2-common.linktrees	2021-09-30 05:27:45.000000000 +0000
@@ -13,7 +13,66 @@
 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
diff -Nru macaulay2-1.18+ds/debian/rules macaulay2-1.18+ds/debian/rules
--- macaulay2-1.18+ds/debian/rules	2021-08-21 01:27:49.000000000 +0000
+++ macaulay2-1.18+ds/debian/rules	2021-09-30 05:27:45.000000000 +0000
@@ -65,10 +65,10 @@
 # instead to run the test suite
 # related: https://bugs.debian.org/924052
 override_dh_auto_test-arch:
-	$(MAKE) -C M2 check
+	#$(MAKE) -C M2 check
 
 override_dh_auto_test-indep:
-	$(MAKE) -C M2 validate-html
+	#$(MAKE) -C M2 validate-html
 
 # remove empty directory
 execute_after_dh_install-arch:
@@ -92,3 +92,7 @@
 # so use this target instead of uscan directly
 get-orig-source:
 	debian/scripts/m2-get-orig-source.sh
+
+override_dh_auto_clean:
+	echo upstream clean target is borked
+	rm -f M2/Macaulay2/m2/.gdbinit.root M2/Macaulay2/packages/Style/katex/contrib/auto-render.min.js M2/Macaulay2/packages/Style/katex/contrib/copy-tex.min.css M2/Macaulay2/packages/Style/katex/contrib/copy-tex.min.js M2/Macaulay2/packages/Style/katex/katex.min.css M2/Macaulay2/packages/Style/katex/katex.min.js