diff -Nru clutter-1.0-1.26.2+dfsg/debian/changelog clutter-1.0-1.26.2+dfsg/debian/changelog --- clutter-1.0-1.26.2+dfsg/debian/changelog 2018-12-26 00:30:54.000000000 +0000 +++ clutter-1.0-1.26.2+dfsg/debian/changelog 2018-12-28 05:47:50.000000000 +0000 @@ -1,3 +1,10 @@ +clutter-1.0 (1.26.2+dfsg-10+rpi1) buster-staging; urgency=medium + + [changes brought forward from 1.26.2+dfsg-7+rpi1 by Peter Michael Green at Thu, 11 Oct 2018 23:45:19 +0000] + * Disable testsuite on armhf too (hang encountered on a raspbian autobuilder). + + -- Raspbian forward porter Fri, 28 Dec 2018 05:47:50 +0000 + clutter-1.0 (1.26.2+dfsg-10) unstable; urgency=medium * fix typo in dh_auto_test override diff -Nru clutter-1.0-1.26.2+dfsg/debian/rules clutter-1.0-1.26.2+dfsg/debian/rules --- clutter-1.0-1.26.2+dfsg/debian/rules 2018-12-26 00:30:54.000000000 +0000 +++ clutter-1.0-1.26.2+dfsg/debian/rules 2018-12-28 05:47:50.000000000 +0000 @@ -47,7 +47,7 @@ # Don't run the tests on s390x since it hangs the build on Launchpad # Don't run on armel since it hung with # https://buildd.debian.org/status/logs.php?pkg=clutter-1.0&ver=1.26.2%2Bdfsg-5 -ifneq (,$(filter armel s390x,$(DEB_HOST_ARCH))) +ifneq (,$(filter armhf armel s390x,$(DEB_HOST_ARCH))) # Ignore test failures on architectures where they fail else ifneq (,$(filter hppa hurd-i386 kfreebsd-i386 kfreebsd-amd64 mips mipsel powerpc ppc64 sparc64,$(DEB_HOST_ARCH))) -dbus-run-session -- xvfb-run -a dh_auto_test