Merge version 3.2.2+dfsg-34+rpi1 and 3.2.2+dfsg-35 to produce 3.2.2+dfsg-35+rpi1

diff --cc debian/changelog
index 490c276f7413f332699dceafaa81393d3cdd6133,87f2fd23c2cbb83f79a3309f6c0f3bbe9bd7f167..8ce5e6f47a2f5ffad87c83a79d1b8e9547354a66
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,13 -1,17 +1,28 @@@
- fpc (3.2.2+dfsg-34+rpi1) trixie-staging; urgency=medium
++fpc (3.2.2+dfsg-35+rpi1) trixie-staging; urgency=medium
 +
 +  [changes brought forward from 2.6.4+dfsg-4+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Mon, 20 Oct 2014 23:12:17 +0000]
 +  * Set compiler defaults for raspbian.
 +
 +  [changes brought forward from 3.2.2+dfsg-4+rpi2 by Peter Michael Green <plugwash@raspbian.org> at Sun, 20 Feb 2022 19:45:37 +0000]
 +  * Apply hack to work around binutils bug https://sourceware.org/bugzilla/show_bug.cgi?id=28848
 +  * Fix clean target.
 +
-  -- Raspbian forward porter <root@raspbian.org>  Wed, 24 Jul 2024 16:38:15 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Thu, 16 Jan 2025 10:02:05 +0000
++
+ fpc (3.2.2+dfsg-35) unstable; urgency=medium
+ 
+   * Fixed location of third party fp-units packages configuration file.
+     Generally, the configuration file is identical for all architectures.
+     It does not make sense to have a different file per architecture
+     especially that the configuration file supports conditional sections.
+ 
+  -- Abou Al Montacir <abou.almontacir@sfr.fr>  Sun, 05 Jan 2025 19:25:14 +0100
+ 
+ fpc (3.2.2+dfsg-34~bpo12+1) bookworm-backports; urgency=medium
+ 
+   * Rebuild for bookworm-backports.
+ 
+  -- Abou Al Montacir <abou.almontacir@sfr.fr>  Sun, 17 Nov 2024 21:23:45 +0100
  
  fpc (3.2.2+dfsg-34) unstable; urgency=medium
  

diff --cc debian/rules
Simple merge