diff -Nru golang-github-elithrar-simple-scrypt-1.3.0/debian/changelog golang-github-elithrar-simple-scrypt-1.3.0/debian/changelog
--- golang-github-elithrar-simple-scrypt-1.3.0/debian/changelog	2021-01-08 15:32:18.000000000 +0000
+++ golang-github-elithrar-simple-scrypt-1.3.0/debian/changelog	2021-01-24 21:20:59.000000000 +0000
@@ -1,3 +1,11 @@
+golang-github-elithrar-simple-scrypt (1.3.0-1.1ubuntu1) hirsute; urgency=medium
+
+  * d/p/disable-TestCalibrate.patch: Disable test that is nondeterministic per
+    upstream and causing FTBFS (see
+    https://github.com/elithrar/simple-scrypt/issues/16).
+
+ -- Logan Rosen <logan@ubuntu.com>  Sun, 24 Jan 2021 16:20:59 -0500
+
 golang-github-elithrar-simple-scrypt (1.3.0-1.1) unstable; urgency=medium
 
   * Non maintainer upload by the Reproducible Builds team.
diff -Nru golang-github-elithrar-simple-scrypt-1.3.0/debian/control golang-github-elithrar-simple-scrypt-1.3.0/debian/control
--- golang-github-elithrar-simple-scrypt-1.3.0/debian/control	2018-06-09 08:00:57.000000000 +0000
+++ golang-github-elithrar-simple-scrypt-1.3.0/debian/control	2021-01-24 21:20:59.000000000 +0000
@@ -1,7 +1,8 @@
 Source: golang-github-elithrar-simple-scrypt
 Section: devel
 Priority: optional
-Maintainer: Debian Go Packaging Team <pkg-go-maintainers@lists.alioth.debian.org>
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+XSBC-Original-Maintainer: Debian Go Packaging Team <pkg-go-maintainers@lists.alioth.debian.org>
 Uploaders: Félix Sipma <felix+debian@gueux.org>
 Build-Depends: debhelper (>= 11),
                dh-golang,
diff -Nru golang-github-elithrar-simple-scrypt-1.3.0/debian/patches/disable-TestCalibrate.patch golang-github-elithrar-simple-scrypt-1.3.0/debian/patches/disable-TestCalibrate.patch
--- golang-github-elithrar-simple-scrypt-1.3.0/debian/patches/disable-TestCalibrate.patch	1970-01-01 00:00:00.000000000 +0000
+++ golang-github-elithrar-simple-scrypt-1.3.0/debian/patches/disable-TestCalibrate.patch	2021-01-24 21:20:59.000000000 +0000
@@ -0,0 +1,10 @@
+--- a/scrypt_test.go
++++ b/scrypt_test.go
+@@ -110,6 +110,7 @@
+ }
+ 
+ func TestCalibrate(t *testing.T) {
++	t.Skip("Test is nondeterministic per upstream")
+ 	timeout := 500 * time.Millisecond
+ 	for testNum, tc := range []struct {
+ 		MemMiB int
diff -Nru golang-github-elithrar-simple-scrypt-1.3.0/debian/patches/series golang-github-elithrar-simple-scrypt-1.3.0/debian/patches/series
--- golang-github-elithrar-simple-scrypt-1.3.0/debian/patches/series	1970-01-01 00:00:00.000000000 +0000
+++ golang-github-elithrar-simple-scrypt-1.3.0/debian/patches/series	2021-01-24 21:20:14.000000000 +0000
@@ -0,0 +1 @@
+disable-TestCalibrate.patch