diff -Nru cups-2.3.3/debian/changelog cups-2.3.3/debian/changelog --- cups-2.3.3/debian/changelog 2020-11-24 07:49:46.000000000 +0000 +++ cups-2.3.3/debian/changelog 2020-11-26 17:50:27.000000000 +0000 @@ -1,3 +1,10 @@ +cups (2.3.3-4+rpi1) bullseye-staging; urgency=medium + + [changes brought forward from 2.3.3-3+rpi1 by Peter Michael Green at Mon, 07 Sep 2020 08:26:52 +0000] + * Disable testsuite. + + -- Raspbian forward porter Thu, 26 Nov 2020 17:50:27 +0000 + cups (2.3.3-4) unstable; urgency=medium * Drop Ubuntu "Make lpoptions list a printer's options correctly also when diff -Nru cups-2.3.3/debian/rules cups-2.3.3/debian/rules --- cups-2.3.3/debian/rules 2020-11-24 07:49:46.000000000 +0000 +++ cups-2.3.3/debian/rules 2020-11-26 17:50:27.000000000 +0000 @@ -213,7 +213,7 @@ dh_strip_nondeterminism override_dh_auto_test: -ifeq (,$(findstring nocheck,$(DEB_BUILD_OPTIONS))) +ifeq (testsuitedisabled,$(findstring nocheck,$(DEB_BUILD_OPTIONS))) CUPS_TESTBASE=$(shell mktemp -d /tmp/cups.XXXXXX) make check # Check that cups-config is not architecture-specific [ -r cups-config ] && grep -vq $(shell dpkg-architecture -qDEB_HOST_MULTIARCH) cups-config