Merge version 4.08.1-8+rpi1 and 4.08.1-10 to produce 4.08.1-10+rpi1

diff --cc configure.ac
Simple merge

diff --cc debian/changelog
index aae7abfee9b5fe9f82ff332ac6a3f23d5177c6ff,00bf937c25eb3af37683e7c440fdc7712701ce52..63eb07f972f6e49fac1ad937b28766b2e2ef16f5
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,16 -1,22 +1,36 @@@
- ocaml (4.08.1-8+rpi1) bullseye-staging; urgency=medium
++ocaml (4.08.1-10+rpi1) bullseye-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>  Wed, 05 Feb 2020 08:59:41 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Thu, 13 Aug 2020 14:48:40 +0000
++
+ ocaml (4.08.1-10) unstable; urgency=medium
+ 
+   * Disable DT_TEXTREL warnings on i386
+   * Unconditionally disable testpreempt test
+ 
+  -- Stéphane Glondu <glondu@debian.org>  Thu, 30 Jul 2020 14:45:47 +0200
+ 
+ ocaml (4.08.1-9) unstable; urgency=medium
+ 
+   [ Stéphane Glondu ]
+   * Fix FTBFS with gcc-10 (Closes: #957623)
+   * Bump debhelper compat level to 13
+   * Bump Standards-Version to 4.5.0
+ 
+   [ Ralf Treinen ]
+   * Replace suggestion of tuareg-mode, which is now a transitional package,
+     by elpa-tuareg.
+ 
+  -- Stéphane Glondu <glondu@debian.org>  Fri, 24 Jul 2020 16:51:04 +0200
  
  ocaml (4.08.1-8) unstable; urgency=medium
  

diff --cc debian/patches/series
index be2e2de732afbd74c2af2bc4bf1bd21e9497e57a,c66a94db21ff78a288b550592612d22f8ec8ad7b..e2480aaf946279f995ad1feb6ac8c480f67e5b41
--- 1/debian/patches/series
--- 2/debian/patches/series
+++ b/debian/patches/series
@@@ -4,5 -4,5 +4,7 @@@
  0005-Check-for-definition-of-AT_SECURE-before-using-it.patch
  0008-Reimplement-custom-without-hacks.patch
  0006-read_main_debug_info-do-not-die-in-custom-executable.patch
+ 0007-Avoid-duplicate-definitions-of-common-global-variabl.patch
+ 0008-Disable-DT_TEXTREL-warnings-on-Linux-i386.patch
 +use-armv6-for-raspbian.patch
 +remove-gitattributes-that-cause-problems.patch

diff --cc debian/rules
Simple merge