diff -Nru dart-6.9.2/debian/changelog dart-6.9.2/debian/changelog --- dart-6.9.2/debian/changelog 2020-06-02 18:54:24.000000000 +0000 +++ dart-6.9.2/debian/changelog 2020-08-11 09:35:53.000000000 +0000 @@ -1,3 +1,22 @@ +dart (6.9.2-3ubuntu1) groovy; urgency=medium + + * d/rules: GCC-10 issue on riscv64, skip the one failing test for now + (LP: #1891440) + + -- Christian Ehrhardt Tue, 11 Aug 2020 11:35:53 +0200 + +dart (6.9.2-3build2) groovy; urgency=medium + + * No-change rebuild against libboost-regex1.71.0-icu67 + + -- Steve Langasek Tue, 28 Jul 2020 19:18:16 +0000 + +dart (6.9.2-3build1) groovy; urgency=medium + + * No change rebuild against new icu ABI. + + -- Dimitri John Ledkov Mon, 27 Jul 2020 16:40:20 +0100 + dart (6.9.2-3) unstable; urgency=medium * Team upload. diff -Nru dart-6.9.2/debian/control dart-6.9.2/debian/control --- dart-6.9.2/debian/control 2020-06-02 18:51:07.000000000 +0000 +++ dart-6.9.2/debian/control 2020-07-27 15:40:20.000000000 +0000 @@ -1,5 +1,6 @@ Source: dart -Maintainer: Debian Science Maintainers +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Debian Science Maintainers Uploaders: Jose Luis Rivero Section: science Priority: optional diff -Nru dart-6.9.2/debian/rules dart-6.9.2/debian/rules --- dart-6.9.2/debian/rules 2020-06-02 18:20:28.000000000 +0000 +++ dart-6.9.2/debian/rules 2020-08-11 09:35:53.000000000 +0000 @@ -21,6 +21,13 @@ dh_auto_configure -- $(CMAKE_FLAGS) override_dh_auto_build: +ifeq ($(DEB_HOST_ARCH),riscv64) + # GCC-10 issue on riscv64, skip the one failing test for now + # Upstream: https://github.com/dartsim/dart/issues/1482 + # Ubuntu: https://bugs.launchpad.net/ubuntu/+source/dart/+bug/1891440 + # Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=968332 + sed -i -e '/^dart_add_test("unit" test_ContactConstraint)/d ' unittests/unit/CMakeLists.txt +endif dh_auto_build -- tests override_dh_auto_install: