Merge branch 'debian/trixie' into debian/master

diff --cc debian/changelog
index ca861e79d8a9e2e1af1875523ee0ec06030fe9b6,8344da3ffd01731da1ff74cc82b470045ed79a51..1f37ed4958662f3aac6e6da6b6b867352a0edc4f
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,18 -1,17 +1,38 @@@
++gtk4 (4.12.0+ds-2) UNRELEASED; urgency=medium
++
++  * 
++
++ -- Simon McVittie <smcv@debian.org>  Tue, 22 Aug 2023 15:03:56 +0100
++
+ gtk4 (4.10.5+ds-4) unstable; urgency=medium
+ 
+   [ Jeremy Bícha ]
+   * Restore sysprof integration
+ 
+   [ Simon McVittie ]
+   * d/p/debian/tests-Allow-longer-for-a-dialog-to-open.patch:
+     Add patch to work around a test failure on riscv64 by extending an
+     arbitrary timeout. Other architectures are occasionally affected by this.
+     Thanks to Aurelien Jarno (Closes: #1049434)
+   * d/control.in, d/gbp.conf: Use debian/trixie and upstream/4.10.x branches
+ 
+  -- Simon McVittie <smcv@debian.org>  Tue, 22 Aug 2023 12:11:51 +0100
+ 
 +gtk4 (4.12.0+ds-1) experimental; urgency=medium
 +
 +  * New upstream release
 +  * Restore sysprof integration
 +  * debian/control.in: Bump minimum glib, gobject-introspection, meson
 +    & wayland-protocols
 +  * debian/libgtk-4-bin.install: Install gtk4-rendernode-tool
 +  * debian/libgtk-4-1.symbols.in: Add new symbols
 +  * Drop patch marking the clipboard test flaky: applied upstream
 +  * Cherry-pick patch to fix undefined references
 +  * Add patch to adapt to Debian's tzdata 2023c-8
 +  * Add patch to mark headless tests as flaky
 +
 + -- Jeremy Bícha <jbicha@ubuntu.com>  Tue, 08 Aug 2023 17:31:01 -0400
 +
  gtk4 (4.10.5+ds-3) unstable; urgency=medium
  
    * Temporarily disable sysprof integration altogether, to get the package