Merge version 5.2.0-2+rpi1 and 5.2.0-3 to produce 5.2.0-3+rpi1

diff --cc debian/changelog
index e9a8ba7b44bc9dbdf03d9b6164a54888d3476b3b,e7123ee8704bc4ba5fd73bb2a3768fe66094a919..1162805ca69893463859728af26d9475b00844bb
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,16 -1,9 +1,23 @@@
- ocaml (5.2.0-2+rpi1) trixie-staging; urgency=medium
++ocaml (5.2.0-3+rpi1) trixie-staging; urgency=medium
 +
 +  [changes brought forward from 4.08.1-4+rpi2 by Peter Michael Green <plugwash@raspbian.org> at Tue, 26 Nov 2019 19:38:59 +0000]
 +  * Revert previous raspbian changes, changing the triplet 
 +    now seems to cause more problems than it solves (specifically
 +    it causes ocaml to try and use nonexistant compilers).
 +  * Edit configure.ac to select armv6 when using "arm-linux-gnueabihf"
 +  * Partially fix clean target.
 +
 +  [changes introduced in 4.08.1-5+rpi1 by Peter Michael Green]
 +  * Remove gitattributes that cause problems for dgit.
 +
-  -- Peter Micheal Greem <plugwash@raspbian.org>  Thu, 05 Sep 2024 02:43:22 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Sat, 07 Sep 2024 11:31:50 +0000
++
+ ocaml (5.2.0-3) unstable; urgency=medium
+ 
+   * Import upstream patch to fix coq-elpi ppc64el failure (Closes:
+     #1078549)
+ 
+  -- Stéphane Glondu <glondu@debian.org>  Thu, 29 Aug 2024 18:03:23 +0200
  
  ocaml (5.2.0-2) unstable; urgency=medium
  

diff --cc debian/patches/series
index 7540aa72319fd548550859d60a5dbbe0278dba7d,ae74039d516aef910982e30ccfd6169f82997093..f9da30a7e470cad4c4dfc4dc75f423cedb26df06
--- 1/debian/patches/series
--- 2/debian/patches/series
+++ b/debian/patches/series
@@@ -8,5 -8,4 +8,6 @@@
  0008-Fix-call-to-test-in-configure.ac.patch
  0009-Rework-fixed-register-assignments-on-m68k.patch
  0010-Avoid-atomic-64-bit-load-on-Debian-armel.patch
+ 0011-Don-t-use-r12-to-pass-size-to-caml_call_realloc_stac.patch
 +use-armv6-for-raspbian.patch
 +remove-gitattributes-that-cause-problems.patch