Merge version 1.9.25+dfsg2-12+rpi1 and 1.9.25+dfsg2-13 to produce 1.9.25+dfsg2-13...

diff --cc debian/changelog
index 772dbad7f8474752e9bd4adeda69767cfaf10b4c,aaf6bbe38feb8d8b7d5bb1f7263b0b09818302c5..49187b863b8e866b5c1875c873c9e6556e31fe18
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,10 -1,8 +1,16 @@@
- filament (1.9.25+dfsg2-12+rpi1) trixie-staging; urgency=medium
++filament (1.9.25+dfsg2-13+rpi1) trixie-staging; urgency=medium
 +
 +  [changes brought forward from 1.9.25+dfsg2-4+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Sun, 27 Feb 2022 15:24:21 +0000]
 +  * Build with clang 11 to hopefully avoid armv7 contamination.
 +  * Fix clean target.
 +
-  -- Peter Michael Green <plugwash@raspbian.org>  Sat, 30 Sep 2023 14:20:52 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Sat, 17 Feb 2024 14:25:58 +0000
++
+ filament (1.9.25+dfsg2-13) unstable; urgency=medium
+ 
+   * Fix build with imgui 1.90 (Closes: #1061621)
+ 
+  -- Timo Röhling <roehling@debian.org>  Sun, 28 Jan 2024 15:11:07 +0100
  
  filament (1.9.25+dfsg2-12) unstable; urgency=medium
  

diff --cc debian/patches/series
index 86671e1812e88a34ff49b7ea7d300fe0a0e8b6e0,b887976063e965b301a13ef844087ee4133ce2e2..11f99145b86541411454e13f6d8d9af8b54b4a9f
--- 1/debian/patches/series
--- 2/debian/patches/series
+++ b/debian/patches/series
@@@ -18,4 -18,4 +18,5 @@@
  0018-Fix-compatibility-with-spirv-cross-SDK-1.3.236.patch
  0019-Fix-build-with-gcc-13.patch
  0020-Do-not-overwrite-debianized-ImportExecutables.patch
+ 0021-Fix-build-with-imgui-1.90.patch
 +auto-1.9.25+dfsg2-12+rpi1-4642f2afe8fe9adb140d2d29c4f5097b1dc46765-1696086414