diff -Nru mlton-20210117+dfsg/debian/changelog mlton-20210117+dfsg/debian/changelog
--- mlton-20210117+dfsg/debian/changelog	2022-01-04 18:37:28.000000000 +0000
+++ mlton-20210117+dfsg/debian/changelog	2022-01-04 23:38:53.000000000 +0000
@@ -1,3 +1,21 @@
+mlton (20210117+dfsg-3) unstable; urgency=medium
+
+  * Replace build-depends-arch on mlton with mlton-compiler and mlton-tools to
+    avoid pulling in mlton-doc
+  * Drop version in mlton's recommends of mlton-doc
+  * Make mlton-basis Arch: any instead of Arch: all. This avoids race
+    conditions on buildds, where mlton-compiler sometimes became uninstallable
+    if the new mlton-basis package got built before mlton-compiler on a given
+    architecture, thereby making the previous version of mlton-compiler
+    uninstallable. This then required manually rebootstrapping the
+    architecture.
+    + The build-indep target in debian/rules now only builds documentation
+    + Drop 09_install-indep.diff, no longer needed
+    + Transition versioned dependencies on mlton-basis from
+      (= ${source:Version}) to (= ${binary:Version})
+
+ -- Ryan Kavanagh <rak@debian.org>  Tue, 04 Jan 2022 18:38:53 -0500
+
 mlton (20210117+dfsg-2) unstable; urgency=medium
 
   * Move libgmp-dev to build-depends to fix binary-all builds
diff -Nru mlton-20210117+dfsg/debian/control mlton-20210117+dfsg/debian/control
--- mlton-20210117+dfsg/debian/control	2022-01-04 18:36:56.000000000 +0000
+++ mlton-20210117+dfsg/debian/control	2022-01-04 23:38:53.000000000 +0000
@@ -7,7 +7,8 @@
  libgmp-dev,
 Build-Depends-Arch:
  dh-exec,
- mlton,
+ mlton-compiler,
+ mlton-tools,
 Build-Depends-Indep:
  asciidoc,
  graphicsmagick,
@@ -35,14 +36,14 @@
  mlton-tools (>= ${source:Version}),
  ${misc:Depends},
 Recommends:
- mlton-doc (= ${source:Version}),
+ mlton-doc
 Description: ${source:Synopsis}
  ${source:Extended-Description}
  .
  This metapackage depends on all MLton packages.
 
 Package: mlton-basis
-Architecture: all
+Architecture: any
 Multi-Arch: foreign
 Depends:
  ${misc:Depends},
@@ -69,7 +70,7 @@
  gcc,
  libc6-dev,
  libgmp-dev,
- mlton-basis (= ${source:Version}),
+ mlton-basis (= ${binary:Version}),
  mlton-runtime-native (= ${binary:Version}),
  ${misc:Depends},
  ${shlibs:Depends},
@@ -103,7 +104,7 @@
 Architecture: alpha
 Multi-Arch: foreign
 Depends:
- mlton-basis (= ${source:Version}),
+ mlton-basis (= ${binary:Version}),
  ${misc:Depends},
 Provides:
  mlton-runtime,
@@ -116,7 +117,7 @@
 Architecture: amd64
 Multi-Arch: foreign
 Depends:
- mlton-basis (= ${source:Version}),
+ mlton-basis (= ${binary:Version}),
  ${misc:Depends},
 Provides:
  mlton-runtime,
@@ -129,7 +130,7 @@
 Architecture: arm64
 Multi-Arch: foreign
 Depends:
- mlton-basis (= ${source:Version}),
+ mlton-basis (= ${binary:Version}),
  ${misc:Depends},
 Provides:
  mlton-runtime,
@@ -142,7 +143,7 @@
 Architecture: armel
 Multi-Arch: foreign
 Depends:
- mlton-basis (= ${source:Version}),
+ mlton-basis (= ${binary:Version}),
  ${misc:Depends},
 Provides:
  mlton-runtime,
@@ -155,7 +156,7 @@
 Architecture: armhf
 Multi-Arch: foreign
 Depends:
- mlton-basis (= ${source:Version}),
+ mlton-basis (= ${binary:Version}),
  ${misc:Depends},
 Provides:
  mlton-runtime,
@@ -168,7 +169,7 @@
 Architecture: hppa
 Multi-Arch: foreign
 Depends:
- mlton-basis (= ${source:Version}),
+ mlton-basis (= ${binary:Version}),
  ${misc:Depends},
 Provides:
  mlton-runtime,
@@ -181,7 +182,7 @@
 Architecture: i386
 Multi-Arch: foreign
 Depends:
- mlton-basis (= ${source:Version}),
+ mlton-basis (= ${binary:Version}),
  ${misc:Depends},
 Provides:
  mlton-runtime,
@@ -194,7 +195,7 @@
 Architecture: kfreebsd-i386
 Multi-Arch: foreign
 Depends:
- mlton-basis (= ${source:Version}),
+ mlton-basis (= ${binary:Version}),
  ${misc:Depends},
 Provides:
  mlton-runtime,
@@ -207,7 +208,7 @@
 Architecture: kfreebsd-amd64
 Multi-Arch: foreign
 Depends:
- mlton-basis (= ${source:Version}),
+ mlton-basis (= ${binary:Version}),
  ${misc:Depends},
 Provides:
  mlton-runtime,
@@ -220,7 +221,7 @@
 Architecture: mips64el
 Multi-Arch: foreign
 Depends:
- mlton-basis (= ${source:Version}),
+ mlton-basis (= ${binary:Version}),
  ${misc:Depends},
 Provides:
  mlton-runtime,
@@ -233,7 +234,7 @@
 Architecture: mips
 Multi-Arch: foreign
 Depends:
- mlton-basis (= ${source:Version}),
+ mlton-basis (= ${binary:Version}),
  ${misc:Depends},
 Provides:
  mlton-runtime,
@@ -246,7 +247,7 @@
 Architecture: mipsel
 Multi-Arch: foreign
 Depends:
- mlton-basis (= ${source:Version}),
+ mlton-basis (= ${binary:Version}),
  ${misc:Depends},
 Provides:
  mlton-runtime,
@@ -259,7 +260,7 @@
 Architecture: powerpc
 Multi-Arch: foreign
 Depends:
- mlton-basis (= ${source:Version}),
+ mlton-basis (= ${binary:Version}),
  ${misc:Depends},
 Provides:
  mlton-runtime,
@@ -272,7 +273,7 @@
 Architecture: ppc64el
 Multi-Arch: foreign
 Depends:
- mlton-basis (= ${source:Version}),
+ mlton-basis (= ${binary:Version}),
  ${misc:Depends},
 Provides:
  mlton-runtime,
@@ -285,7 +286,7 @@
 Architecture: riscv64
 Multi-Arch: foreign
 Depends:
- mlton-basis (= ${source:Version}),
+ mlton-basis (= ${binary:Version}),
  ${misc:Depends},
 Provides:
  mlton-runtime,
@@ -298,7 +299,7 @@
 Architecture: s390x
 Multi-Arch: foreign
 Depends:
- mlton-basis (= ${source:Version}),
+ mlton-basis (= ${binary:Version}),
  ${misc:Depends},
 Provides:
  mlton-runtime,
@@ -311,7 +312,7 @@
 Architecture: sparc
 Multi-Arch: foreign
 Depends:
- mlton-basis (= ${source:Version}),
+ mlton-basis (= ${binary:Version}),
  ${misc:Depends},
 Provides:
  mlton-runtime,
diff -Nru mlton-20210117+dfsg/debian/patches/09_install-indep.diff mlton-20210117+dfsg/debian/patches/09_install-indep.diff
--- mlton-20210117+dfsg/debian/patches/09_install-indep.diff	2022-01-04 17:54:46.000000000 +0000
+++ mlton-20210117+dfsg/debian/patches/09_install-indep.diff	1970-01-01 00:00:00.000000000 +0000
@@ -1,43 +0,0 @@
-Description: Add target to installs arch-independent libraries
- This lets us build just arch:all packages without also having
- to compile the rest of mlton.
-Author: Ryan Kavanagh <rak@debian.org>
-Forwarded: not-needed
-Last-Update: 2022-01-03
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
-Index: mlton/Makefile
-===================================================================
---- mlton.orig/Makefile	2022-01-03 20:39:35.446208507 -0500
-+++ mlton/Makefile	2022-01-03 20:41:14.555399106 -0500
-@@ -364,7 +364,7 @@
- endif
- 
- .PHONY: install
--install: install-no-strip install-strip
-+install: install-libs install-no-strip install-strip
- 
- MAN_PAGES := mlton.1
- MAN_PAGES := $(MAN_PAGES) \
-@@ -372,15 +372,19 @@
- 	mlprof.1 \
- 	mlyacc.1
- 
-+.PHONY: install-libs
-+install-libs:
-+	$(MKDIR) "$(TLIB)"
-+	$(CP) "$(LIB)/." "$(TLIB)/"
-+
- .PHONY: install-no-strip
- install-no-strip:
--	$(MKDIR) "$(TBIN)" "$(TLIB)"
-+	$(MKDIR) "$(TBIN)"
- 	$(CP) "$(BIN)/." "$(TBIN)/"
- 	$(SED) \
- 		-e "s;^LIB_REL_BIN=.*;LIB_REL_BIN=\"$(TLIB_REL_TBIN)\";" \
- 		< "$(BIN)/$(MLTON)" > "$(TBIN)/$(MLTON)"
- 	$(CHMOD) a+x "$(TBIN)/$(MLTON)"
--	$(CP) "$(LIB)/." "$(TLIB)/"
- 	$(MKDIR) "$(TMAN)"
- 	cd "$(SRC)/man" && $(CP) $(MAN_PAGES) "$(TMAN)/"
- ifeq (true, $(GZIP_MAN))
diff -Nru mlton-20210117+dfsg/debian/patches/series mlton-20210117+dfsg/debian/patches/series
--- mlton-20210117+dfsg/debian/patches/series	2022-01-04 17:54:46.000000000 +0000
+++ mlton-20210117+dfsg/debian/patches/series	2022-01-04 22:50:02.000000000 +0000
@@ -4,4 +4,3 @@
 06_local_docs.diff
 07_DFSG.diff
 08_postpone_tests.diff
-09_install-indep.diff
diff -Nru mlton-20210117+dfsg/debian/rules mlton-20210117+dfsg/debian/rules
--- mlton-20210117+dfsg/debian/rules	2022-01-04 17:54:46.000000000 +0000
+++ mlton-20210117+dfsg/debian/rules	2022-01-04 23:06:41.000000000 +0000
@@ -20,21 +20,13 @@
 	$(MAKE) MLTON_COMPILE_ARGS="$(MLTON_FLAGS)" $(COMMON_OPTS) all
 
 override_dh_auto_build-indep:
-	# The runtime target generates some of the arch-independent
-	# includes / header files shipped in mlton-basis
-	$(MAKE) $(COMMON_OPTS) basis-no-check
-	$(MAKE) $(COMMON_OPTS) libraries-no-check
-	$(MAKE) $(COMMON_OPTS) dirs
-	$(MAKE) $(COMMON_OPTS) runtime
 	$(MAKE) $(COMMON_OPTS) docs
 	#$(MAKE) -C doc/guide mlton-guide.pdf
 
 override_dh_auto_install-arch:
-	$(MAKE) $(COMMON_OPTS) install-libs
 	$(MAKE) $(COMMON_OPTS) install-no-strip
 
 override_dh_auto_install-indep:
-	$(MAKE) $(COMMON_OPTS) install-libs
 	$(MAKE) $(COMMON_OPTS) install-docs
 
 override_dh_compress: