diff -Nru guile-2.2-2.2.7+1/debian/changelog guile-2.2-2.2.7+1/debian/changelog
--- guile-2.2-2.2.7+1/debian/changelog	2020-07-22 08:27:11.000000000 +0000
+++ guile-2.2-2.2.7+1/debian/changelog	2020-07-23 09:47:25.000000000 +0000
@@ -1,3 +1,10 @@
+guile-2.2 (2.2.7+1-5.1ubuntu1) groovy; urgency=low
+
+  * Merge from Debian unstable.  Remaining changes:
+    - Ignore test results on riscv64, test-out-of-memory fails.
+
+ -- Gianfranco Costamagna <locutusofborg@debian.org>  Thu, 23 Jul 2020 11:47:25 +0200
+
 guile-2.2 (2.2.7+1-5.1) unstable; urgency=medium
 
   * Non-maintainer upload.
@@ -6,6 +13,24 @@
 
  -- Matthias Klose <doko@debian.org>  Wed, 22 Jul 2020 10:27:11 +0200
 
+guile-2.2 (2.2.7+1-5ubuntu2) groovy; urgency=medium
+
+  * Ignore test results on riscv64, test-out-of-memory fails.
+
+ -- Matthias Klose <doko@ubuntu.com>  Fri, 17 Jul 2020 09:17:06 +0200
+
+guile-2.2 (2.2.7+1-5ubuntu1) groovy; urgency=medium
+
+  * Fix build with make 4.3.
+
+ -- Matthias Klose <doko@ubuntu.com>  Wed, 15 Jul 2020 00:09:07 +0200
+
+guile-2.2 (2.2.7+1-5build1) groovy; urgency=medium
+
+  * No-change rebuild for libgc soname change.
+
+ -- Matthias Klose <doko@ubuntu.com>  Tue, 14 Jul 2020 19:39:17 +0200
+
 guile-2.2 (2.2.7+1-5) unstable; urgency=medium
 
   * debian/rules: exclude guile.m4 from arch all package install.
diff -Nru guile-2.2-2.2.7+1/debian/rules guile-2.2-2.2.7+1/debian/rules
--- guile-2.2-2.2.7+1/debian/rules	2020-07-22 08:27:11.000000000 +0000
+++ guile-2.2-2.2.7+1/debian/rules	2020-07-22 15:16:05.000000000 +0000
@@ -193,6 +193,13 @@
 	trap "kill $$!" EXIT \
 	&& $(MAKE) -j "$(joblimit)"
 
+override_dh_auto_test:
+ifeq ($(DEB_HOST_ARCH),riscv64)
+	-dh_auto_test
+else
+	dh_auto_test
+endif
+
 override_dh_auto_clean:
         # If Makefile doesn't exist GNUmakefile will abort on distclean.
 	if test -e Makefile; then make distclean; fi