[Pkg-ocaml-maint-commits] [ocaml] 01/02: Only install ocaml-native-compilers.conf on native-code architectures

[Ximin Luo]

This is an automated email from the git hooks/post-receive script.

infinity0 pushed a commit to branch debian/experimental
in repository ocaml.

commit b8be831d1d46a6925b4f774e96fe1308da309df0
Author: Ximin Luo <infinity0 at debian.org>
Date:   Mon Jul 31 01:42:00 2017 +0200

    Only install ocaml-native-compilers.conf on native-code architectures
---
 debian/changelog            | 7 +++++++
 debian/ocaml-nox.install.in | 2 +-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index d974573..38cf1b7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+ocaml (4.05.0-7) UNRELEASED; urgency=medium
+
+  * Only install findlib/ocaml-native-compilers.conf on native-code arches,
+    fixing ocamlfind behaviour and FTBFS of ocamlbuild.
+
+ -- Ximin Luo <infinity0 at debian.org>  Mon, 31 Jul 2017 01:40:55 +0200
+
 ocaml (4.05.0-6) experimental; urgency=medium
 
   * Mark certain symbols as .hidden in arm64 codegen, fixing FTBFS with
diff --git a/debian/ocaml-nox.install.in b/debian/ocaml-nox.install.in
index 81788ee..0fa994d 100644
--- a/debian/ocaml-nox.install.in
+++ b/debian/ocaml-nox.install.in
@@ -18,7 +18,7 @@ OPT: usr/bin/ocamldoc.opt
      usr/bin/ocamlmktop.*
      usr/bin/ocamlobjinfo.*
      usr/bin/ocamlprof.*
-debian/ocamlfind/ocaml-native-compilers.conf usr/share/ocaml-findlib/
+OPT: debian/ocamlfind/ocaml-native-compilers.conf usr/share/ocaml-findlib/
      @OCamlStdlibDir@/objinfo_helper
      debian/native-archs @OCamlStdlibDir@
 OPT: usr/bin/ocamlopt

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ocaml-maint/packages/ocaml.git