Merge version 3.2.2+dfsg-23+rpi1 and 3.2.2+dfsg-32 to produce 3.2.2+dfsg-32+rpi1

diff --cc debian/changelog
index d3b7655525dd8e3f59f9ae27f2aa535debb26e8b,60f4a0a7bdfca77e8ab0eeee9efb1e67d95cb354..dd650f577f5769387c9804d1671a2eeb2692fca2
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,13 -1,71 +1,82 @@@
- fpc (3.2.2+dfsg-23+rpi1) trixie-staging; urgency=medium
++fpc (3.2.2+dfsg-32+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>  Sun, 24 Dec 2023 10:36:38 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Wed, 10 Jan 2024 00:00:06 +0000
++
+ fpc (3.2.2+dfsg-32) unstable; urgency=medium
+ 
+   * Fixed typo in man file name.
+ 
+  -- Abou Al Montacir <abou.almontacir@sfr.fr>  Fri, 05 Jan 2024 08:40:08 +0100
+ 
+ fpc (3.2.2+dfsg-31) unstable; urgency=medium
+ 
+   * Removed fpcmkcfg man page from fp-utils as it is already shipped by fp-units-rtl.
+     (Closes: Bug#1059950)
+ 
+  -- Abou Al Montacir <abou.almontacir@sfr.fr>  Thu, 04 Jan 2024 15:54:25 +0100
+ 
+ fpc (3.2.2+dfsg-30) unstable; urgency=medium
+ 
+   * Updated timestamps file.
+ 
+  -- Abou Al Montacir <abou.almontacir@sfr.fr>  Wed, 03 Jan 2024 16:38:42 +0100
+ 
+ fpc (3.2.2+dfsg-29) unstable; urgency=medium
+ 
+   * Fixed lintian warning about missing man pages.
+   * Implement support for SPARC 64-bit in fpcres.
+     Lazarus build fails on sparc64 due to missing support of this
+     architecture in fpcres tool. This patch backports the support to
+     version 3.2.2.
+ 
+  -- Abou Al Montacir <abou.almontacir@sfr.fr>  Wed, 03 Jan 2024 16:16:21 +0100
+ 
+ fpc (3.2.2+dfsg-28) unstable; urgency=medium
+ 
+   * Reverted changes in fp-utils causing upgrade problems. (Closes: Bug#1059772)
+ 
+  -- Abou Al Montacir <abou.almontacir@sfr.fr>  Mon, 01 Jan 2024 15:28:49 +0100
+ 
+ fpc (3.2.2+dfsg-27) unstable; urgency=medium
+ 
+   * Source upload after fixing build issue on sid.
+ 
+  -- Abou Al Montacir <abou.almontacir@sfr.fr>  Sat, 30 Dec 2023 18:35:30 +0100
+ 
+ fpc (3.2.2+dfsg-26) unstable; urgency=medium
+ 
+   * Binary upload to fix build issue on sid.
+ 
+  -- Abou Al Montacir <abou.almontacir@sfr.fr>  Sat, 30 Dec 2023 18:26:09 +0100
+ 
+ fpc (3.2.2+dfsg-25) unstable; urgency=medium
+ 
+   * Fixed build issue of arch:all packages.
+     Manual pages are not needed to be built for arch:all packages.
+ 
+  -- Abou Al Montacir <abou.almontacir@sfr.fr>  Fri, 29 Dec 2023 21:36:10 +0100
+ 
+ fpc (3.2.2+dfsg-24) unstable; urgency=medium
+ 
+   * Fixed lintian warning about dependency on legacy package.
+     Packages libgl-dev superseded libgl1-measa-dev package.
+   * Fixed lintian warning about missing manual pages.
+     Used help2man to create missing manual pages.
+   * Fixed lintian warning about dh-exec script not using any dh-exec featre.
+     The script `fp-utils.install` does not need to be executable.
+   * Fixed lintian warning about outdated debhelper version.
+   * Fixed lintian warning about missing manual page.
+     Used `hlep2man` to produce manual page for the tool named
+     `${arch}-fpcmkcfg-${version}` distributed in `fp-units-rtl` package.
+ 
+  -- Abou Al Montacir <abou.almontacir@sfr.fr>  Fri, 29 Dec 2023 19:18:37 +0100
  
  fpc (3.2.2+dfsg-23) unstable; urgency=medium
  

diff --cc debian/patches/series
index 9cec8eab8fbd88383d4a8525cf177f24d890b731,c6ee2a7cbabd9ca1bdf0bf3797bfe1a8d0b89681..40f451f2f988d4ac30af20212f02e5310cda8505
--- 1/debian/patches/series
--- 2/debian/patches/series
+++ b/debian/patches/series
@@@ -36,5 -36,4 +36,6 @@@ change_fpmake_to_install_missing_packag
  Fix-missing-crtbeginS.o-on-mipsel.patch
  5-85c7368759f5fb53aa23e03c8cc27c2deb424b62.patch
  6-3bb2586269c876856a834fb0d72a09928ff9d16b.patch
+ 7-060f24600bb559f62b6350899864f3ac4155c207.patch
 +raspbian.diff
 +force-abi-tags-in-cprt0.patch

diff --cc debian/rules
Simple merge

diff --cc debian/source/timestamps
Simple merge