diff -pruN 0.9.4-0.2/debian/changelog 0.9.4-0.2ubuntu1/debian/changelog
--- 0.9.4-0.2/debian/changelog	2020-04-22 14:06:49.000000000 +0000
+++ 0.9.4-0.2ubuntu1/debian/changelog	2021-01-02 23:47:36.000000000 +0000
@@ -1,3 +1,10 @@
+uftrace (0.9.4-0.2ubuntu1) hirsute; urgency=medium
+
+  * d/p/0001-test-Robustify-mcount_wrap_dlopen-test.patch: Import patch from
+    upstream Git to fix a failing test.
+
+ -- Logan Rosen <logan@ubuntu.com>  Sat, 02 Jan 2021 18:47:36 -0500
+
 uftrace (0.9.4-0.2) unstable; urgency=high
 
   * Non-maintainer upload.
diff -pruN 0.9.4-0.2/debian/control 0.9.4-0.2ubuntu1/debian/control
--- 0.9.4-0.2/debian/control	2019-09-19 02:14:16.000000000 +0000
+++ 0.9.4-0.2ubuntu1/debian/control	2021-01-02 23:47:36.000000000 +0000
@@ -1,7 +1,8 @@
 Source: uftrace
 Section: utils
 Priority: optional
-Maintainer: paul cannon <pik@debian.org>
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+XSBC-Original-Maintainer: paul cannon <pik@debian.org>
 Build-Depends: debhelper (>= 9), libelf-dev, pandoc, python, pkg-config,
  libpython2.7-dev, libdw-dev, libncursesw5-dev, libcapstone-dev,
  bash-completion
diff -pruN 0.9.4-0.2/debian/patches/0001-test-Robustify-mcount_wrap_dlopen-test.patch 0.9.4-0.2ubuntu1/debian/patches/0001-test-Robustify-mcount_wrap_dlopen-test.patch
--- 0.9.4-0.2/debian/patches/0001-test-Robustify-mcount_wrap_dlopen-test.patch	1970-01-01 00:00:00.000000000 +0000
+++ 0.9.4-0.2ubuntu1/debian/patches/0001-test-Robustify-mcount_wrap_dlopen-test.patch	2021-01-02 23:47:36.000000000 +0000
@@ -0,0 +1,28 @@
+From 6483d9ac46bd6ed65bb4ad7ba5788fbe4533d414 Mon Sep 17 00:00:00 2001
+From: Namhyung Kim <namhyung@gmail.com>
+Date: Fri, 20 Nov 2020 22:36:03 +0900
+Subject: [PATCH] test: Robustify mcount_wrap_dlopen test
+
+I found that it fails in some environment, which seems to call dlopen
+internally somewhere.  As its purpose is to check whether the hookup
+code is called, we can reset the real_dlopen pointer to NULL and check
+the value after the call.
+
+Signed-off-by: Namhyung Kim <namhyung@gmail.com>
+---
+ libmcount/wrap.c | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+--- a/libmcount/wrap.c
++++ b/libmcount/wrap.c
+@@ -535,7 +535,9 @@
+ {
+ 	void *handle;
+ 
+-	TEST_EQ(real_dlopen, NULL);
++	/* In some environment, dlopen() is called already */
++	if (unlikely(real_dlopen != NULL))
++		real_dlopen = NULL;
+ 
+ 	handle= dlopen(NULL, RTLD_LAZY);
+ 
diff -pruN 0.9.4-0.2/debian/patches/series 0.9.4-0.2ubuntu1/debian/patches/series
--- 0.9.4-0.2/debian/patches/series	1970-01-01 00:00:00.000000000 +0000
+++ 0.9.4-0.2ubuntu1/debian/patches/series	2021-01-02 23:47:36.000000000 +0000
@@ -0,0 +1 @@
+0001-test-Robustify-mcount_wrap_dlopen-test.patch