From: Raspbian automatic forward porter Date: Thu, 11 Feb 2021 23:10:21 +0000 (+0000) Subject: Merge version 3.38.2-1+rpi1 and 3.38.2-2 to produce 3.38.2-2+rpi1 X-Git-Tag: archive/raspbian/3.38.2-2+rpi1^0 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=53bc0b933cd28eb75912b405cf5583ead205951c;p=glade.git Merge version 3.38.2-1+rpi1 and 3.38.2-2 to produce 3.38.2-2+rpi1 --- 53bc0b933cd28eb75912b405cf5583ead205951c diff --cc debian/changelog index 698cb83,614560a..a0f9322 --- a/debian/changelog +++ b/debian/changelog @@@ -1,8 -1,10 +1,17 @@@ - glade (3.38.2-1+rpi1) bullseye-staging; urgency=medium ++glade (3.38.2-2+rpi1) bullseye-staging; urgency=medium + ++ [changes brought forward from 3.38.2-1+rpi1 by Peter Michael Green at Wed, 20 Jan 2021 02:42:50 +0000] + * Disable testsuite. + - -- Peter Michael Green Wed, 20 Jan 2021 02:42:50 +0000 ++ -- Raspbian forward porter Thu, 11 Feb 2021 23:10:21 +0000 ++ + glade (3.38.2-2) unstable; urgency=medium + + * debian/rules: Fix the option to disable webkit2gtk, should be "disabled" + * Restrict gjs plugin on architectures where libgjs is available + * debian/control.in Refer to GtkBuilder instead of libglade (Closes: #889538) + + -- Laurent Bigonville Sat, 19 Dec 2020 23:43:24 +0100 glade (3.38.2-1) unstable; urgency=medium diff --cc debian/rules index 6eac127,9a025d9..b0ed686 --- a/debian/rules +++ b/debian/rules @@@ -28,8 -38,13 +38,13 @@@ endi CHECK_RUNTIME_DIR= $(CURDIR)/debian/tmp/run override_dh_auto_test: -ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS))) +ifeq (testsuitedisabled,$(filter nocheck,$(DEB_BUILD_OPTIONS))) mkdir -p -m0700 $(CHECK_RUNTIME_DIR) + # Tests are failing without gjs support, see https://gitlab.gnome.org/GNOME/glade/-/issues/495 + ifeq (,$(filter $(DEB_HOST_ARCH), amd64 arm64 armel armhf i386 mips64el mipsel ppc64el s390x powerpc ppc64 riscv64)) + HOME=$(CHECK_RUNTIME_DIR) XDG_RUNTIME_DIR=$(CHECK_RUNTIME_DIR) \ + dbus-run-session -- xvfb-run dh_auto_test || true + else HOME=$(CHECK_RUNTIME_DIR) XDG_RUNTIME_DIR=$(CHECK_RUNTIME_DIR) \ dbus-run-session -- xvfb-run dh_auto_test endif