diff -Nru mercurial-5.6.1/debian/changelog mercurial-5.6.1/debian/changelog --- mercurial-5.6.1/debian/changelog 2021-02-01 16:47:09.000000000 +0000 +++ mercurial-5.6.1/debian/changelog 2021-02-05 14:29:15.000000000 +0000 @@ -1,3 +1,10 @@ +mercurial (5.6.1-2+rpi1) bullseye-staging; urgency=medium + + [changes brought forward from 5.5.2-1+rpi1 by Peter Michael Green at Sun, 13 Dec 2020 10:30:51 +0000] + * Disable testsuite. + + -- Raspbian forward porter Fri, 05 Feb 2021 14:29:15 +0000 + mercurial (5.6.1-2) unstable; urgency=medium * tests: make test-subrepo-git.t compatible with git's master->main diff -Nru mercurial-5.6.1/debian/rules mercurial-5.6.1/debian/rules --- mercurial-5.6.1/debian/rules 2020-09-01 14:33:54.000000000 +0000 +++ mercurial-5.6.1/debian/rules 2021-02-05 14:29:15.000000000 +0000 @@ -35,7 +35,7 @@ ARCH_IS_SPARC := $(if $(subst sparc,,$(DEB_HOST_ARCH)),,T) override_dh_auto_test: -ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS))) +ifeq (testsuitedisabled,$(filter nocheck,$(DEB_BUILD_OPTIONS))) # test-pull-pull-corruption tries to execute two hg commands at the # same time to test for corruption. It does so by running an hg # command in the background, sleeping one second and running the