Merge version 4.8.3+ds-2+rpi1 and 4.8.3+ds-2+deb12u1 to produce 4.8.3+ds-2+rpi1+deb12u1

diff --cc debian/changelog
index 22db17935dcbf286323d200106d2feabc7975689,120f52f0e64b80399845a9e73eff855e08c51b1a..df992e1dbc528c6c41ae644ce5add90a551fea3e
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,16 -1,13 +1,27 @@@
- gtk4 (4.8.3+ds-2+rpi1) bookworm-staging; urgency=medium
++gtk4 (4.8.3+ds-2+rpi1+deb12u1) bookworm-staging; urgency=medium
 +
 +  [changes brought forward from 4.4.0+ds1-5+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Tue, 07 Sep 2021 10:26:09 +0000]
 +  * Disable a couple of faliing tests in Raspbian.
 +  * Fix clean target.
 +
 +  [changes introduced in 4.8.3+ds-1+rpi1 by Peter Michael Green]
 +  * Disable a couple more failing tests.
 +
 +  [changes introudce in 4.8.3+ds-2+rpi1 by Peter Michael Green]
 +  * Disable linear-gradient-transition-to-other test.
 +
-  -- Peter Michael Green <plugwash@raspbian.org>  Sat, 11 Feb 2023 22:31:33 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Wed, 11 Oct 2023 13:35:35 +0000
++
+ gtk4 (4.8.3+ds-2+deb12u1) bookworm; urgency=medium
+ 
+   * d/p/placessidebar-Make-all-rows-ellipsize.patch:
+     Add patch from upstream gtk-4-8 branch to fix truncation in places
+     sidebar with large text accessibility setting (Closes: #1043261)
+   * d/patches: Mark patch for #1029972 as also applied for 4.8.4
+   * d/watch: Only watch for versions 4.8.x for bookworm
+   * d/gbp.conf, d/control.in: Switch packaging branch to debian/bookworm
+ 
+  -- Simon McVittie <smcv@debian.org>  Sat, 09 Sep 2023 20:32:02 +0100
  
  gtk4 (4.8.3+ds-2) unstable; urgency=medium
  

diff --cc debian/patches/series
Simple merge