Merge version 4.13.1-3+rpi1 and 4.13.1-4 to produce 4.13.1-4+rpi1

diff --cc configure.ac
Simple merge

diff --cc debian/changelog
index 2d12083d1719e9f6c25df9042e40d3a32d9312b2,6c07d89b7f54e1e4341de3cde0abb0e3a5c84778..b56ab77fc098db6bec912e2c37d8a5cf9a071e30
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,16 -1,8 +1,22 @@@
- ocaml (4.13.1-3+rpi1) bookworm-staging; urgency=medium
++ocaml (4.13.1-4+rpi1) bookworm-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 Michael Green <plugwash@raspbian.org>  Thu, 03 Feb 2022 18:25:38 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Tue, 28 Feb 2023 01:33:26 +0000
++
+ ocaml (4.13.1-4) unstable; urgency=medium
+ 
+   * Avoid build path ending up in binaries (Closes: #1030785)
+ 
+  -- Stéphane Glondu <glondu@debian.org>  Sun, 12 Feb 2023 11:46:40 +0100
  
  ocaml (4.13.1-3) unstable; urgency=medium
  

diff --cc debian/patches/series
index 9c41ac121c6d739b6ccc8d4bc96a209afbce592b,56079e3be2ba753957f3783e1d22e4139be115f5..8ca7c1e3e214d1d83046d6baaacd642ee53a3cd9
--- 1/debian/patches/series
--- 2/debian/patches/series
+++ b/debian/patches/series
@@@ -5,5 -5,4 +5,6 @@@
  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
 +use-armv6-for-raspbian.patch
 +remove-gitattributes-that-cause-problems.patch

diff --cc debian/rules
Simple merge