Manual merge of version 1.9.25+dfsg2-4+rpi1 and 1.9.25+dfsg2-6 to produce 1.9.25...

diff --cc debian/changelog
index 1bbaf8bce145b73cb8541ac32dbe7743137feca7,af200cf4526a96a87f374d742a07b6f3daf1c568..970bad7c909ecc92773a3cb3a55a2e4054b464d7
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,16 +1,24 @@@
- filament (1.9.25+dfsg2-4+rpi1) bookworm-staging; urgency=medium
++filament (1.9.25+dfsg2-6+rpi1) bookworm-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>  Sun, 27 Feb 2022 15:24:21 +0000
++ -- Peter Michael Greem <plugwash@raspbian.org>  Sun, 07 Aug 2022 04:37:36 +0000
++
+ filament (1.9.25+dfsg2-6) unstable; urgency=medium
+ 
+   * Workaround for armel clang compiler bug.
+     Thanks to Adrian Bunk
+   * Ignore dh_dwz failure with clang-14
+ 
+  -- Timo Röhling <roehling@debian.org>  Wed, 27 Jul 2022 22:13:33 +0200
+ 
+ filament (1.9.25+dfsg2-5) unstable; urgency=medium
+ 
+   * Fix FTBFS with GCC-12 (Closes: #1012926)
+ 
+  -- Timo Röhling <roehling@debian.org>  Thu, 16 Jun 2022 18:58:59 +0200
  
  filament (1.9.25+dfsg2-4) unstable; urgency=medium
  

diff --cc debian/rules
index c0b26e9e0ad7158d39fecc79f9bf1894d6849243,e0bd25f043e5b9d4226b2b8f9d16124f2ec72347..086d22713ca11aba363df23d2d9b6a5ffd1c26d6
--- 1/debian/rules
--- 2/debian/rules
+++ b/debian/rules
@@@ -35,6 -35,5 +35,9 @@@ override_dh_auto_configure
                -DFILAMENT_INCLUDEDIR=include/filament-$(FILAMENT_SOVERSION) \
                -DFILAMENT_CMAKEDIR=lib/$(DEB_HOST_MULTIARCH)/cmake/filament-$(FILAMENT_SOVERSION)
  
 +override_dh_auto_clean:
 +      dh_auto_clean
 +      rm -f ImportExecutables-None.cmake
++
+ override_dh_dwz:
+       dh_dwz || true