diff -Nru devscripts-2.20.2ubuntu1/debian/changelog devscripts-2.20.2ubuntu2/debian/changelog --- devscripts-2.20.2ubuntu1/debian/changelog 2020-02-13 20:35:18.000000000 +0000 +++ devscripts-2.20.2ubuntu2/debian/changelog 2020-02-13 21:05:38.000000000 +0000 @@ -1,3 +1,10 @@ +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: diff -Nru devscripts-2.20.2ubuntu1/test/test_uscan_svn devscripts-2.20.2ubuntu2/test/test_uscan_svn --- devscripts-2.20.2ubuntu1/test/test_uscan_svn 2020-02-13 20:35:18.000000000 +0000 +++ devscripts-2.20.2ubuntu2/test/test_uscan_svn 2020-02-13 21:05:15.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" }