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

diff --cc debian/changelog
index b36e2506dca87f413bcde10def9b45c880c2aaf7,4ac91913d1eca2f5ca01d07bf164593021206a67..6a777e89754fa79eaa40790f7289d85ecf34c375
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,16 -1,9 +1,23 @@@
- ocaml (5.3.0-2+rpi1) trixie-staging; urgency=medium
++ocaml (5.3.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.
 +
-  -- Raspbian forward porter <root@raspbian.org>  Mon, 10 Feb 2025 01:24:41 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Sat, 21 Jun 2025 00:00:16 +0000
++
+ ocaml (5.3.0-3) unstable; urgency=medium
+ 
+   * Mark tests that actually require multicore (Closes: #1101353)
+   * Do not run flaky test (Closes: #1103008)
+ 
+  -- Stéphane Glondu <glondu@debian.org>  Thu, 12 Jun 2025 14:08:28 +0200
  
  ocaml (5.3.0-2) unstable; urgency=medium
  

diff --cc debian/patches/series
index 58efb0b742968755ded908313f92cf179a599393,fa84b141ba9b5102d665abe4fdb737e691fbaf1c..1ed950efbe14480f2083e60cd8162c1b8ce7c409
--- 1/debian/patches/series
--- 2/debian/patches/series
+++ b/debian/patches/series
@@@ -5,5 -5,4 +5,6 @@@
  0005-Check-for-definition-of-AT_SECURE-before-using-it.patch
  0006-Disable-DT_TEXTREL-warnings-on-Linux-i386.patch
  0007-Enable-native-backend-and-dynlink-on-hurd-amd64.patch
+ 0008-Mark-tests-that-actually-require-multicore.patch
 +use-armv6-for-raspbian.patch
 +remove-gitattributes-that-cause-problems.patch

diff --cc debian/rules
Simple merge