diff -Nru libbfio-20170123/debian/changelog libbfio-20170123/debian/changelog
--- libbfio-20170123/debian/changelog	2019-11-28 17:28:31.000000000 +0000
+++ libbfio-20170123/debian/changelog	2020-04-19 06:58:51.000000000 +0000
@@ -1,3 +1,10 @@
+libbfio (20170123-5ubuntu1) focal; urgency=medium
+
+  * Disable HAVE_BFIO_TEST_MEMORY on riscv64 to fix test failure, as already
+    done on several other architectures.
+
+ -- William Grant <wgrant@ubuntu.com>  Sun, 19 Apr 2020 16:58:51 +1000
+
 libbfio (20170123-5) unstable; urgency=medium
 
   [ Raphaël Hertzog ]
diff -Nru libbfio-20170123/debian/control libbfio-20170123/debian/control
--- libbfio-20170123/debian/control	2019-11-28 17:28:31.000000000 +0000
+++ libbfio-20170123/debian/control	2020-04-19 06:58:51.000000000 +0000
@@ -1,6 +1,7 @@
 Source: libbfio
 Priority: optional
-Maintainer: Debian Security Tools <team+pkg-security@tracker.debian.org>
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+XSBC-Original-Maintainer: Debian Security Tools <team+pkg-security@tracker.debian.org>
 Uploaders: Pierre Chifflier <pollux@debian.org>,
  Hilko Bengen <bengen@debian.org>
 Build-Depends: debhelper (>= 10),pkg-config
diff -Nru libbfio-20170123/debian/patches/riscv64-no-HAVE_BFIO_TEST_MEMORY.patch libbfio-20170123/debian/patches/riscv64-no-HAVE_BFIO_TEST_MEMORY.patch
--- libbfio-20170123/debian/patches/riscv64-no-HAVE_BFIO_TEST_MEMORY.patch	1970-01-01 00:00:00.000000000 +0000
+++ libbfio-20170123/debian/patches/riscv64-no-HAVE_BFIO_TEST_MEMORY.patch	2020-04-19 06:58:50.000000000 +0000
@@ -0,0 +1,13 @@
+Index: libbfio-20170123/tests/bfio_test_memory.h
+===================================================================
+--- libbfio-20170123.orig/tests/bfio_test_memory.h
++++ libbfio-20170123/tests/bfio_test_memory.h
+@@ -30,7 +30,7 @@ extern "C" {
+ 
+ #if defined( HAVE_GNU_DL_DLSYM ) && defined( __GNUC__ ) && !defined( __clang__ )
+ 
+-#if !defined( __arm__ ) && !defined( __mips__ ) && !defined( __hppa__ ) && !defined( __sparc__ )
++#if !defined( __arm__ ) && !defined( __mips__ ) && !defined( __hppa__ ) && !defined(__riscv) && !defined( __sparc__ )
+ 
+ #define HAVE_BFIO_TEST_MEMORY		1
+ 
diff -Nru libbfio-20170123/debian/patches/series libbfio-20170123/debian/patches/series
--- libbfio-20170123/debian/patches/series	2019-11-28 17:28:31.000000000 +0000
+++ libbfio-20170123/debian/patches/series	2020-04-19 06:58:23.000000000 +0000
@@ -1,2 +1,3 @@
 0001-Fix-test-script.patch
 0002-Don-t-define-HAVE_BFIO_TEST_MEMORY-on-some-architect.patch
+riscv64-no-HAVE_BFIO_TEST_MEMORY.patch