Merge version 4.08.1-5+rpi1 and 4.08.1-6 to produce 4.08.1-6+rpi1

diff --cc debian/changelog
index f2dec88dbba2b2ccfcb691a84a36f7f35e4ee624,9ae344ae6f7ebdbe11f97cfc61024ec6859cd369..ecb76238ad391705168fa8c0424feca04dd1aed4
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,16 -1,10 +1,24 @@@
- ocaml (4.08.1-5+rpi1) bullseye-staging; urgency=medium
++ocaml (4.08.1-6+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>  Sat, 07 Dec 2019 05:28:33 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Sat, 11 Jan 2020 03:28:12 +0000
++
+ ocaml (4.08.1-6) unstable; urgency=medium
+ 
+   * Fix generation of ocaml-man (Closes: #947197)
+   * Add Rules-Requires-Root: no
+   * Provide libseq-ocaml{,-dev}
+ 
+  -- Stéphane Glondu <glondu@debian.org>  Sun, 29 Dec 2019 10:28:39 +0100
  
  ocaml (4.08.1-5) unstable; urgency=medium
  

diff --cc debian/rules
Simple merge