Merge branch 'debpsuedomerge' into buster-working

diff --cc debian/changelog
index bad98bc820c62641cbe03ce155ff22dccd32023e,c5ce38545a842dbbb3859f271e4dfa7d3e039e6a..0f50f55b1adcf9861da4579562b903cf4392a0b7
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,11 -1,10 +1,18 @@@
+ ocaml (4.02.3-10) unstable; urgency=medium
+ 
+   * Add Provides: ocamlbuild to ocaml-nox
+   * Tell dh_installdocs to ignore README.Debian (see #868204)
+ 
+  -- Stéphane Glondu <glondu@debian.org>  Thu, 13 Jul 2017 04:40:57 +0200
+ 
 +ocaml (4.02.3-9+rpi1) stretch-staging; urgency=medium
 +
 +  [changes brought forward from 4.01.0-5+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Sat, 24 Jan 2015 10:29:46 +0000]
 +  * Add logic in debian/rules to detect raspbian and give the upstream 
 +    configure script the correct instructions.
 +
 + -- Raspbian forward porter <root@raspbian.org>  Sat, 07 Jan 2017 06:25:05 +0000
 +
  ocaml (4.02.3-9) unstable; urgency=medium
  
    * obey hardening LDFLAGS (Closes: #792502). Thanks to Török Edwin

diff --cc debian/rules
Simple merge