Merge version 2023.7-3+rpi1 and 2023.8-2 to produce 2023.8-2+rpi1

diff --cc debian/changelog
index 2f8bec93fcb7ddb3de4f589be73467dd7a9210bc,ac7adc0eed923feb637586fcb3cdfe89874e1f3b..8cfde9b2fb923a9018e4e8c5719bc8de72edc87b
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,20 +1,27 @@@
- ostree (2023.7-3+rpi1) trixie-staging; urgency=medium
++ostree (2023.8-2+rpi1) trixie-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>  Fri, 10 Nov 2023 22:59:44 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Wed, 10 Jan 2024 04:32:00 +0000
++
+ ostree (2023.8-2) unstable; urgency=medium
+ 
+   * d/control, d/rules: Enable cross-compilation.
+     When cross-compiling, this requires a version of gobject-introspection
+     that is currently only available in experimental. When not
+     cross-compiling, the version in testing is sufficient.
+ 
+  -- Simon McVittie <smcv@debian.org>  Sun, 31 Dec 2023 15:34:37 +0000
+ 
+ ostree (2023.8-1) unstable; urgency=medium
+ 
+   * New upstream release
+   * d/libostree-1-1.symbols: Update
+   * d/p/bootloader-zipl-No-op-if-run-as-non-root.patch:
+     Drop patch, applied upstream
+ 
+  -- Simon McVittie <smcv@debian.org>  Fri, 08 Dec 2023 10:35:12 +0000
  
  ostree (2023.7-3) unstable; urgency=medium
  

diff --cc debian/rules
index b545268a8e355d7b3ac4a2bfb344ff4589e35de4,6095fef48c5cdb1ce2abab10e6a756496a1ed1a6..231ce612c4f54b38739fe11a749395da2214d0e1
--- 1/debian/rules
--- 2/debian/rules
+++ b/debian/rules
@@@ -48,8 -52,14 +52,14 @@@ endi
  override_dh_auto_configure:
        dh_auto_configure -- $(configure_options)
  
+ override_dh_auto_build:
+       # The upstream build system overrides this to gcc as a way to avoid
+       # passing unsupported options to clang, but that's wrong for
+       # cross-builds
+       dh_auto_build -- INTROSPECTION_SCANNER_ENV="CC=$(DEB_HOST_GNU_TYPE)-gcc"
+ 
  override_dh_auto_test-arch:
 -ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
 +ifeq (testsuitedisabled,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
        chmod +x tests/test-pull-bareuseronly.sh
        debian/test.sh
  endif