Merge branch 'debian/experimental' into debian/sid

diff --cc debian/changelog
index ab49b138bf396386ac310035af9d378015ffea26,286abce86544d4318cf46fd94225659e5ff15ee6..db65c79b20796f4a95c02d9b4e7bb8ed38c83847
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,54 +1,60 @@@
+ ocaml (4.08.1-1) experimental; urgency=medium
+ 
+   * New upstream release
+   * Statically link -lbfd to avoid a tight dependency with libbinutils
+   * Put VERSION in ocaml-base-nox
+   * Add Breaks/Replaces: ocaml-base to ocaml-base-nox (Closes: #933792)
+   * Disable testpreempt test on kfreebsd for now
+   * Add back Debian-specific -custom behaviour
+ 
+  -- Stéphane Glondu <glondu@debian.org>  Mon, 30 Sep 2019 16:40:45 +0200
+ 
+ ocaml (4.08.0-3) experimental; urgency=medium
+ 
+   * Disable native compiler on powerpc and x32
+   * Tune testpreempt test to make it work on kfreebsd
+ 
+  -- Stéphane Glondu <glondu@debian.org>  Tue, 30 Jul 2019 13:27:15 +0200
+ 
+ ocaml (4.08.0-2) experimental; urgency=medium
+ 
+   * Build with BUILD_PATH_PREFIX_MAP set, to improve reproducibility
+   * Use CCLINKFLAGS for linking all executables and shared libraries, to
+     pass hardening flags
+   * Properly disable almabench test on slow architectures (should fix
+     FTBFS on them)
+   * Check for definition of AT_SECURE before using it (should fix FTBFS on
+     kfreebsd-*)
+   * Add x32 to native architecture (should fix FTBFS)
+   * Add support for Debian's armhf in configure.ac (should fix FTBFS)
+   * Add more Lintian overrides
+   * Fix spelling errors reported by Lintian
+   * Bump Standards-Version to 4.4.0
+   * Remove Samuel from Uploaders
+ 
+  -- Stéphane Glondu <glondu@debian.org>  Wed, 24 Jul 2019 10:53:51 +0200
+ 
+ ocaml (4.08.0-1) experimental; urgency=medium
+ 
+   [ Stéphane Glondu ]
+   * New upstream release
+     - many Debian-specific patches have been dropped
+     - drop ocaml-mode binary package
+     - add ocaml-man binary package
+     - update debian/copyright
+   * Bump debhelper compat to 12
+ 
+   [ Nicolas Boulenguez ]
+   * Fix broken doc symlinks (Closes: #877267)
+ 
+  -- Stéphane Glondu <glondu@debian.org>  Thu, 11 Jul 2019 14:19:49 +0200
+ 
 +ocaml (4.05.0-12) unstable; urgency=medium
 +
 +  * Provide libnum-ocaml{,-dev}
 +
 + -- Stéphane Glondu <glondu@debian.org>  Tue, 06 Aug 2019 09:27:23 +0200
 +
  ocaml (4.05.0-11) unstable; urgency=medium
  
    [ Ralf Treinen ]

diff --cc debian/control
index efa09bd3b7e901da203ddacafc35824dc75ce516,114f9a8df32db07fe9e9bcafa6d8e71c6b59c2bc..9e2d2768d46fba241ea95464da3837efdca2935b
--- 1/debian/control
--- 2/debian/control
+++ b/debian/control
@@@ -32,10 -29,9 +29,10 @@@ Depends
   ${misc:Depends},
   ${shlibs:Depends},
  Provides:
 + libnum-ocaml,
   ${ocaml:Provides}
- Replaces: ocaml-interp (<< 3.11.1-3)
- Breaks: ocaml-interp (<< 3.11.1-3)
+ Replaces: ocaml-interp (<< 3.11.1-3), ocaml-base (<< 4.08)
+ Breaks: ocaml-interp (<< 3.11.1-3), ocaml-base (<< 4.08)
  Description: Runtime system for OCaml bytecode executables (no X)
   Objective Caml (OCaml) is an implementation of the ML language, based on
   the Caml Light dialect extended with a complete class-based object system
@@@ -76,14 -72,15 +73,15 @@@ Depends
   gcc,
   binutils
  Provides:
 + libnum-ocaml-dev,
   ${ocaml:Provides},
   ocaml-best-compilers (= ${binary:Version}),
 - ${F:NativeProvides},
 - libnums-ocaml-dev
 + ${F:NativeProvides}
  Suggests:
   ocaml-doc,
-  tuareg-mode | ocaml-mode
+  tuareg-mode
  Recommends:
+  ocaml-man,
   file
  Replaces: ocaml-interp (<< 3.11.1-3), ocaml-native-compilers (<< 4.04.0-1)
  Breaks: