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

diff --cc debian/changelog
index 40c353aa23311b42ef9c5619266e031f29c4f343,debc81df90f826c1d3decdc4ca7ef8e0ad828f49..490c276f7413f332699dceafaa81393d3cdd6133
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,13 -1,9 +1,20 @@@
- fpc (3.2.2+dfsg-33+rpi1) trixie-staging; urgency=medium
++fpc (3.2.2+dfsg-34+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>  Mon, 10 Jun 2024 11:11:55 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Wed, 24 Jul 2024 16:38:15 +0000
++
+ fpc (3.2.2+dfsg-34) unstable; urgency=medium
+ 
+   * Added Content-Type to prevent msgfmt crash.
+     Thanks to Peter Blackman <peter@pblackman.plus.com> (Closes: Bug#1074706)
+ 
+  -- Abou Al Montacir <abou.almontacir@sfr.fr>  Sat, 13 Jul 2024 17:35:36 +0200
  
  fpc (3.2.2+dfsg-33) unstable; urgency=medium
  

diff --cc debian/patches/series
index 40f451f2f988d4ac30af20212f02e5310cda8505,613d94ce1f40fc3ad57c9be860f4fe5152a1dd63..6eb0dda2dfccd919d4deaa2579121ed42faa1c86
--- 1/debian/patches/series
--- 2/debian/patches/series
+++ b/debian/patches/series
@@@ -37,5 -37,4 +37,6 @@@ Fix-missing-crtbeginS.o-on-mipsel.patc
  5-85c7368759f5fb53aa23e03c8cc27c2deb424b62.patch
  6-3bb2586269c876856a834fb0d72a09928ff9d16b.patch
  7-060f24600bb559f62b6350899864f3ac4155c207.patch
+ added-content-type-to-prevent-msgfmt-crash.patch
 +raspbian.diff
 +force-abi-tags-in-cprt0.patch