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

diff --cc debian/changelog
index 4af308f981955fa918a4d510a320022370c4d350,3480e8410f840da8705cf9cf5ab7bcc6b5168ab4..aae7abfee9b5fe9f82ff332ac6a3f23d5177c6ff
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,16 -1,8 +1,22 @@@
- ocaml (4.08.1-7+rpi1) bullseye-staging; urgency=medium
++ocaml (4.08.1-8+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>  Tue, 21 Jan 2020 05:19:11 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Wed, 05 Feb 2020 08:59:41 +0000
++
+ ocaml (4.08.1-8) unstable; urgency=medium
+ 
+   * read_main_debug_info: do not die in -custom executables
+ 
+  -- Stéphane Glondu <glondu@debian.org>  Thu, 30 Jan 2020 13:11:32 +0100
  
  ocaml (4.08.1-7) unstable; urgency=medium
  

diff --cc debian/patches/series
index 0a31f9debe5325ce034d3b3ab8be3b8f6a54a87e,091e2f65b44cd044dd133a202e9d7ba55053a9d1..be2e2de732afbd74c2af2bc4bf1bd21e9497e57a
--- 1/debian/patches/series
--- 2/debian/patches/series
+++ b/debian/patches/series
@@@ -3,5 -3,4 +3,6 @@@
  0013-Use-CCLINKFLAGS-for-linking-all-executables-and-shar.patch
  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
 +use-armv6-for-raspbian.patch
 +remove-gitattributes-that-cause-problems.patch