diff -Nru mongodb-3.6.9+really3.6.8+90~g8e540c0b6d/debian/changelog mongodb-3.6.9+really3.6.8+90~g8e540c0b6d/debian/changelog
--- mongodb-3.6.9+really3.6.8+90~g8e540c0b6d/debian/changelog	2020-03-23 07:58:38.000000000 +0000
+++ mongodb-3.6.9+really3.6.8+90~g8e540c0b6d/debian/changelog	2020-04-14 07:29:46.000000000 +0000
@@ -1,3 +1,14 @@
+mongodb (1:3.6.9+really3.6.8+90~g8e540c0b6d-0ubuntu5) focal; urgency=medium
+
+  * Drop optional python-regex build-dep, which is now gone from the
+    archive.
+  * Use python2 for scons.
+  * Disable -Werror.
+  * Drop python-pymongo resmoke test build-dep, no longer available.
+  * Add missing cxxabi.h include.
+
+ -- Dimitri John Ledkov <xnox@ubuntu.com>  Tue, 14 Apr 2020 08:29:46 +0100
+
 mongodb (1:3.6.9+really3.6.8+90~g8e540c0b6d-0ubuntu4) focal; urgency=medium
 
   * No-change rebuild for libgcc-s1 package name change.
diff -Nru mongodb-3.6.9+really3.6.8+90~g8e540c0b6d/debian/control mongodb-3.6.9+really3.6.8+90~g8e540c0b6d/debian/control
--- mongodb-3.6.9+really3.6.8+90~g8e540c0b6d/debian/control	2018-09-23 18:23:07.000000000 +0000
+++ mongodb-3.6.9+really3.6.8+90~g8e540c0b6d/debian/control	2020-04-14 07:29:46.000000000 +0000
@@ -24,11 +24,10 @@
  libssl-dev,
  libstemmer-dev,
  libyaml-cpp-dev,
+ python2,
  python-cheetah,
  python-pkg-resources,
- python-pymongo,
  python-requests,
- python-regex,
  python-subprocess32,
  python-typing,
  python-yaml,
diff -Nru mongodb-3.6.9+really3.6.8+90~g8e540c0b6d/debian/patches/missing-include.patch mongodb-3.6.9+really3.6.8+90~g8e540c0b6d/debian/patches/missing-include.patch
--- mongodb-3.6.9+really3.6.8+90~g8e540c0b6d/debian/patches/missing-include.patch	1970-01-01 00:00:00.000000000 +0000
+++ mongodb-3.6.9+really3.6.8+90~g8e540c0b6d/debian/patches/missing-include.patch	2020-04-14 07:29:46.000000000 +0000
@@ -0,0 +1,14 @@
+Description: Add missing cxxabi.h include.
+Author: Dimitri John Ledkov <xnox@ubuntu.com>
+
+
+--- mongodb-3.6.9+really3.6.8+90~g8e540c0b6d.orig/src/mongo/util/heap_profiler.cpp
++++ mongodb-3.6.9+really3.6.8+90~g8e540c0b6d/src/mongo/util/heap_profiler.cpp
+@@ -46,6 +46,7 @@
+ 
+ #include <dlfcn.h>
+ #include <execinfo.h>
++#include <cxxabi.h>
+ 
+ //
+ // Sampling heap profiler
diff -Nru mongodb-3.6.9+really3.6.8+90~g8e540c0b6d/debian/patches/series mongodb-3.6.9+really3.6.8+90~g8e540c0b6d/debian/patches/series
--- mongodb-3.6.9+really3.6.8+90~g8e540c0b6d/debian/patches/series	2018-11-26 21:16:25.000000000 +0000
+++ mongodb-3.6.9+really3.6.8+90~g8e540c0b6d/debian/patches/series	2020-04-14 07:29:46.000000000 +0000
@@ -8,3 +8,4 @@
 b3c9e24d7434c929c097d85f65a3586687031116.patch
 add-tls13-counter.patch
 add-3.6.8+90~g8e540c0b6d-version.json.patch
+missing-include.patch
diff -Nru mongodb-3.6.9+really3.6.8+90~g8e540c0b6d/debian/rules mongodb-3.6.9+really3.6.8+90~g8e540c0b6d/debian/rules
--- mongodb-3.6.9+really3.6.8+90~g8e540c0b6d/debian/rules	2018-04-11 16:29:15.000000000 +0000
+++ mongodb-3.6.9+really3.6.8+90~g8e540c0b6d/debian/rules	2020-04-14 07:29:46.000000000 +0000
@@ -26,6 +26,7 @@
 		 --use-system-boost --use-system-snappy \
 		 --use-system-zlib --use-system-valgrind \
 		 --use-system-stemmer --use-system-yaml \
+		 --disable-warnings-as-errors \
 		 --ssl $(DEB_SCONS_OPTIONS) \
 		 CC=$(CC) CXX=$(CXX)
 
@@ -42,24 +43,24 @@
 endif
 
 override_dh_auto_clean:
-	scons --keep-going --clean $(COMMON_OPTIONS) .
+	python2 `which scons` --keep-going --clean $(COMMON_OPTIONS) .
 	find $(CURDIR)/ -name "*.pyc" -delete
 	rm -rf $(CURDIR)/debian/tmp-test/
 	rm -rf $(CURDIR)/.scons/
 	rm -rf $(CURDIR)/build/
 
 override_dh_auto_build:
-	scons $(COMMON_OPTIONS) core tools
+	python2 `which scons` $(COMMON_OPTIONS) core tools
 
 ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
 override_dh_auto_test:
-	scons $(COMMON_OPTIONS) dbtest unittests
-	python ./buildscripts/resmoke.py --dbpathPrefix="$(CURDIR)/debian/tmp-test" --suites=dbtest,unittests
+	python2 `which scons` $(COMMON_OPTIONS) dbtest unittests
+	-python ./buildscripts/resmoke.py --dbpathPrefix="$(CURDIR)/debian/tmp-test" --suites=dbtest,unittests
 .PHONY: override_dh_auto_test
 endif
 
 override_dh_auto_install:
-	scons $(COMMON_OPTIONS) --prefix=$(CURDIR)/debian/tmp/usr install
+	python2 `which scons` $(COMMON_OPTIONS) --prefix=$(CURDIR)/debian/tmp/usr install
 
 override_dh_installsystemd:
 	dh_installsystemd -pmongodb-server --name=mongodb