diff -Nru devscripts-2.20.3/debian/changelog devscripts-2.20.3ubuntu1/debian/changelog
--- devscripts-2.20.3/debian/changelog	2020-04-25 19:15:48.000000000 +0000
+++ devscripts-2.20.3ubuntu1/debian/changelog	2020-04-28 08:13:01.000000000 +0000
@@ -1,3 +1,10 @@
+devscripts (2.20.3ubuntu1) groovy; urgency=low
+
+  * Merge from Debian unstable.  Remaining changes:
+    - Don't build-depend on subversion on i386, not supported on this arch.
+
+ -- Gianfranco Costamagna <locutusofborg@debian.org>  Tue, 28 Apr 2020 10:13:01 +0200
+
 devscripts (2.20.3) unstable; urgency=medium
 
   [ Mattia Rizzolo ]
@@ -84,12 +91,38 @@
 
  -- Mattia Rizzolo <mattia@debian.org>  Sat, 25 Apr 2020 21:15:48 +0200
 
+devscripts (2.20.2ubuntu3) groovy; urgency=medium
+
+  * No-change upload to pick up new distro name.
+
+ -- Matthias Klose <doko@ubuntu.com>  Fri, 24 Apr 2020 19:35:01 +0200
+
+devscripts (2.20.2ubuntu2) focal; urgency=medium
+
+  * Restore changes to test/test_uscan_svn, required to properly skip
+    subversion tests at build time on i386.
+
+ -- Steve Langasek <steve.langasek@ubuntu.com>  Thu, 13 Feb 2020 13:05:38 -0800
+
+devscripts (2.20.2ubuntu1) focal; urgency=low
+
+  * Merge from Debian unstable.  Remaining changes:
+    - Don't build-depend on subversion on i386, not supported on this arch.
+
+ -- Steve Langasek <steve.langasek@ubuntu.com>  Thu, 13 Feb 2020 12:35:18 -0800
+
 devscripts (2.20.2) unstable; urgency=medium
 
   * d/tests/control: add missing dependency on subversion.
 
  -- Mattia Rizzolo <mattia@debian.org>  Wed, 05 Feb 2020 16:41:11 +0100
 
+devscripts (2.20.1ubuntu1) focal; urgency=medium
+
+  * Don't build-depend on subversion on i386, not supported on this arch.
+
+ -- Steve Langasek <steve.langasek@ubuntu.com>  Fri, 31 Jan 2020 13:56:52 -0800
+
 devscripts (2.20.1) unstable; urgency=medium
 
   [ Xavier Guimard ]
diff -Nru devscripts-2.20.3/debian/control devscripts-2.20.3ubuntu1/debian/control
--- devscripts-2.20.3/debian/control	2020-04-23 13:53:08.000000000 +0000
+++ devscripts-2.20.3ubuntu1/debian/control	2020-04-28 08:13:01.000000000 +0000
@@ -50,7 +50,7 @@
  python3-unidiff <!nocheck>,
  python3-xdg <!nocheck>,
  shunit2 <!nocheck>,
- subversion <!nocheck>,
+ subversion [!i386] <!nocheck>,
  unzip <!nocheck>,
  wdiff <!nocheck>,
  xsltproc,
diff -Nru devscripts-2.20.3/test/test_uscan_svn devscripts-2.20.3ubuntu1/test/test_uscan_svn
--- devscripts-2.20.3/test/test_uscan_svn	2020-04-23 13:53:08.000000000 +0000
+++ devscripts-2.20.3ubuntu1/test/test_uscan_svn	2020-04-28 08:13:01.000000000 +0000
@@ -32,6 +32,11 @@
 #COMMAND="$COMMAND --verbose"
 #COMMAND="$COMMAND --debug"
 
+if [ -z "$(which svn)" ]; then
+    echo "SKIP: Not running svn tests, svn command not found."
+    exit 0
+fi
+
 cleanup(){
     rm -rf "$TEMP_PKG_DIR"
 }