Merge version 3.38.2-1+rpi1 and 3.38.2-2 to produce 3.38.2-2+rpi1

diff --cc debian/changelog
index 698cb83cb4cf6324ce73ab3baf9d87393de6ba3d,614560a971899610abf65d7ff167f261eb8d861c..a0f9322686628f500b20fe19d7166d2b029704ab
--- 1/debian/changelog
--- 2/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 <plugwash@raspbian.org> at Wed, 20 Jan 2021 02:42:50 +0000]
 +  * Disable testsuite.
 +
-  -- Peter Michael Green <plugwash@raspbian.org>  Wed, 20 Jan 2021 02:42:50 +0000
++ -- Raspbian forward porter <root@raspbian.org>  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 <bigon@debian.org>  Sat, 19 Dec 2020 23:43:24 +0100
  
  glade (3.38.2-1) unstable; urgency=medium
  

diff --cc debian/rules
index 6eac127914c4d66095ab9721e6608c0e1e5a44cd,9a025d91e1c751134a41c8fcd44632084a03d2d1..b0ed686c774260383a5a71852ae889042abf7770
--- 1/debian/rules
--- 2/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