Merge version 2022.5-4+rpi1 and 2022.6-1 to produce 2022.6-1+rpi1

diff --cc debian/changelog
index 413fbbc18141faae83163222f783bd77b5047d6e,98f44537ae6950588fee24032a183ccc77ab384f..a7b291f6f3ba7a892870c696eabc2abe14573a83
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,12 +1,19 @@@
- ostree (2022.5-4+rpi1) bookworm-staging; urgency=medium
++ostree (2022.6-1+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>  Wed, 05 Oct 2022 13:49:49 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Wed, 19 Oct 2022 01:56:43 +0000
++
+ ostree (2022.6-1) unstable; urgency=medium
+ 
+   * New upstream release
+   * Build-depend on libext2fs-dev instead of transitional e2fslibs-dev
+   * Don't install s390x-se-luks-gencpio script.
+     It was reimplemented in C as part of ostree(1).
+   * Install another early-boot service in ostree-boot
+ 
+  -- Simon McVittie <smcv@debian.org>  Sat, 15 Oct 2022 10:48:34 +0100
  
  ostree (2022.5-4) unstable; urgency=medium