Merge version 3.2.2+dfsg-4+rpi1 and 3.2.2+dfsg-6 to produce 3.2.2+dfsg-6+rpi1

diff --cc debian/changelog
index 4a6fb45e3e1d8b956a4c83af5208dffc65751dc8,42a1d9f10aa034b4f0b4f5b869e28aacf14781d8..2f6676bf18e5203bdeb82228cb5ff586d2ef3d0f
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,17 +1,24 @@@
- fpc (3.2.2+dfsg-4+rpi1) bookworm-staging; urgency=medium
++fpc (3.2.2+dfsg-6+rpi1) bookworm-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.
 +
-  -- Peter Michael Green <plugwash@raspbian.org>  Tue, 07 Dec 2021 14:56:06 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Sun, 16 Jan 2022 21:24:05 +0000
++
+ fpc (3.2.2+dfsg-6) unstable; urgency=medium
+ 
+   * Revert "Updated timestamps for newly modified files."
+   * Revert "Imported upstream patch to fix FPU related internal compiler error."
+     (Closes: Bug#1003627)
+ 
+  -- Abou Al Montacir <abou.almontacir@sfr.fr>  Thu, 13 Jan 2022 21:54:24 +0100
+ 
+ fpc (3.2.2+dfsg-5) unstable; urgency=medium
+ 
+   * Imported upstream patch to fix FPU related internal compiler error.
+   * Updated timestamps for newly modified files.
+ 
+  -- Abou Al Montacir <abou.almontacir@sfr.fr>  Thu, 30 Dec 2021 15:08:07 +0100
  
  fpc (3.2.2+dfsg-4) unstable; urgency=medium