Merge version 2022.5-2+rpi1 and 2022.5-3 to produce 2022.5-3+rpi1

diff --cc debian/changelog
index 702fce1d63c8e7b7b3bdedc22dd7ff485b0b51c4,bf9dc88810007c493f55e55d321a8a44efaa23b3..14e901fcd6277f8b05560ba9663b18516364429c
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,11 +1,18 @@@
- ostree (2022.5-2+rpi1) bookworm-staging; urgency=medium
++ostree (2022.5-3+rpi1) bookworm-staging; urgency=medium
 +
 +  [changes brought forward from 2020.8-2+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Tue, 15 Dec 2020 11:54:45 +0000]
 +  * Disable testsuite.
 +
-  -- Raspbian forward porter <root@raspbian.org>  Sun, 07 Aug 2022 04:40:40 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Fri, 09 Sep 2022 19:06:32 +0000
++
+ ostree (2022.5-3) unstable; urgency=medium
+ 
+   * d/control, d/rules: Disable gjs-based tests on armel.
+     It's looking as though mozjs102, and therefore the next gjs release,
+     will not support armel due to its lack of atomic instructions.
+   * d/control, d/rules: Re-enable gjs tests on s390x
+ 
+  -- Simon McVittie <smcv@debian.org>  Wed, 31 Aug 2022 09:47:41 +0100
  
  ostree (2022.5-2) unstable; urgency=medium
  

diff --cc debian/rules
Simple merge