diff -Nru devscripts-2.20.1ubuntu1/debian/changelog devscripts-2.20.2ubuntu2/debian/changelog --- devscripts-2.20.1ubuntu1/debian/changelog 2020-01-31 21:56:52.000000000 +0000 +++ devscripts-2.20.2ubuntu2/debian/changelog 2020-02-13 21:05:38.000000000 +0000 @@ -1,3 +1,23 @@ +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 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 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 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. @@ -8746,3 +8766,4 @@ * Update documentation -- Christoph Lameter Mon, 20 Oct 1997 21:02:27 -0700 + diff -Nru devscripts-2.20.1ubuntu1/debian/tests/control devscripts-2.20.2ubuntu2/debian/tests/control --- devscripts-2.20.1ubuntu1/debian/tests/control 2020-01-30 20:28:06.000000000 +0000 +++ devscripts-2.20.2ubuntu2/debian/tests/control 2020-02-05 21:42:49.000000000 +0000 @@ -15,6 +15,7 @@ python3-debian, python3-pyftpdlib, shunit2, + subversion, wdiff, zip, @,