From: Peter Michael Green Date: Sun, 7 Aug 2022 04:39:55 +0000 (+0000) Subject: Manual merge of version 1.9.25+dfsg2-4+rpi1 and 1.9.25+dfsg2-6 to produce 1.9.25... X-Git-Tag: archive/raspbian/1.9.25+dfsg2-6+rpi1~1 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=a859feea591797ff810b72bdba7ae5e22e45075a;p=filament.git Manual merge of version 1.9.25+dfsg2-4+rpi1 and 1.9.25+dfsg2-6 to produce 1.9.25+dfsg2-6+rpi1 --- a859feea591797ff810b72bdba7ae5e22e45075a diff --cc debian/changelog index 1bbaf8b,af200cf..970bad7 --- a/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 at Sun, 27 Feb 2022 15:24:21 +0000] + * Build with clang 11 to hopefully avoid armv7 contamination. + * Fix clean target. + - -- Peter Michael Green Sun, 27 Feb 2022 15:24:21 +0000 ++ -- Peter Michael Greem 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 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 Thu, 16 Jun 2022 18:58:59 +0200 filament (1.9.25+dfsg2-4) unstable; urgency=medium diff --cc debian/rules index c0b26e9,e0bd25f..086d227 --- a/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