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

diff --cc .gitattributes
Simple merge

diff --cc configure.ac
Simple merge

diff --cc debian/changelog
index 1162805ca69893463859728af26d9475b00844bb,07515d4f86efb289f8b88af552915917672ceb86..b36e2506dca87f413bcde10def9b45c880c2aaf7
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,16 -1,27 +1,41 @@@
- ocaml (5.2.0-3+rpi1) trixie-staging; urgency=medium
++ocaml (5.3.0-2+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>  Sat, 07 Sep 2024 11:31:50 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Mon, 10 Feb 2025 01:24:41 +0000
++
+ ocaml (5.3.0-2) unstable; urgency=medium
+ 
+   * Enable natdynlink on hurd-amd64 (Closes: #1094334)
+ 
+  -- Stéphane Glondu <glondu@debian.org>  Mon, 27 Jan 2025 13:17:46 +0100
+ 
+ ocaml (5.3.0-1) unstable; urgency=medium
+ 
+   * Upload to unstable (Closes: #1092985)
+ 
+  -- Stéphane Glondu <glondu@debian.org>  Sun, 26 Jan 2025 17:00:54 +0100
+ 
+ ocaml (5.3.0-1~exp2) experimental; urgency=medium
+ 
+   * Run tests with OCAML_TEST_SIZE=1
+   * Enable native backend on hurd-amd64 (Closes: #1086600)
+ 
+  -- Stéphane Glondu <glondu@debian.org>  Wed, 15 Jan 2025 10:38:28 +0100
+ 
+ ocaml (5.3.0-1~exp1) experimental; urgency=medium
+ 
+   * New upstream release
+ 
+  -- Stéphane Glondu <glondu@debian.org>  Tue, 14 Jan 2025 08:02:31 +0100
  
  ocaml (5.2.0-3) unstable; urgency=medium
  

diff --cc debian/patches/series
index f9da30a7e470cad4c4dfc4dc75f423cedb26df06,946c47d6462ff72e1b760b774e95b1b2beb1d02d..58efb0b742968755ded908313f92cf179a599393
--- 1/debian/patches/series
--- 2/debian/patches/series
+++ b/debian/patches/series
@@@ -1,13 -1,7 +1,9 @@@
- 0002-Use-CCLINKFLAGS-for-linking-all-executables-and-shar.patch
- 0003-Check-for-definition-of-AT_SECURE-before-using-it.patch
- 0004-Disable-DT_TEXTREL-warnings-on-Linux-i386.patch
- 0005-Trigger-output-complete-exe-on-custom-with-an-enviro.patch
- 0006-Do-not-error-on-warnings-in-autoconf.patch
- 0007-Put-manpages-in-section-3o-instead-of-3.patch
- 0008-Filter-out-f-debug-file-prefix-map-from-ocamlc_cflag.patch
- 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
+ 0001-Put-manpages-in-section-3o-instead-of-3.patch
+ 0002-Trigger-output-complete-exe-on-custom-with-an-enviro.patch
+ 0003-Do-not-error-on-warnings-in-autoconf.patch
+ 0004-Use-CCLINKFLAGS-for-linking-all-executables-and-shar.patch
+ 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
 +use-armv6-for-raspbian.patch
 +remove-gitattributes-that-cause-problems.patch

diff --cc debian/rules
Simple merge