From dc2d712a432a0356eb705c88cd93b754b9a16340 Mon Sep 17 00:00:00 2001 From: Ximin Luo Date: Wed, 28 Sep 2016 23:07:38 +0200 Subject: [PATCH] Update install files and drop ocamlbuild Upstream has split ocamlbuild into a separate package [1] and we will need to package it separately. :( [1] https://github.com/ocaml/ocamlbuild/ --- debian/ocaml-base-nox.docs | 2 +- debian/ocaml-compiler-libs.install.in | 5 +++++ debian/ocaml-nox.install.in | 28 +++++++++++++++++++++++---- 3 files changed, 30 insertions(+), 5 deletions(-) diff --git a/debian/ocaml-base-nox.docs b/debian/ocaml-base-nox.docs index e845566c..52e22424 100644 --- a/debian/ocaml-base-nox.docs +++ b/debian/ocaml-base-nox.docs @@ -1 +1 @@ -README +README.adoc diff --git a/debian/ocaml-compiler-libs.install.in b/debian/ocaml-compiler-libs.install.in index c4a9ac20..9682e90a 100644 --- a/debian/ocaml-compiler-libs.install.in +++ b/debian/ocaml-compiler-libs.install.in @@ -4,6 +4,7 @@ usr/share/man/man3/Ast_helper.3o usr/share/man/man3/Ast_helper.Cf.3o usr/share/man/man3/Ast_helper.Ci.3o usr/share/man/man3/Ast_helper.Cl.3o +usr/share/man/man3/Ast_helper.Const.3o usr/share/man/man3/Ast_helper.Csig.3o usr/share/man/man3/Ast_helper.Cstr.3o usr/share/man/man3/Ast_helper.Ctf.3o @@ -24,8 +25,12 @@ usr/share/man/man3/Ast_helper.Typ.3o usr/share/man/man3/Ast_helper.Type.3o usr/share/man/man3/Ast_helper.Val.3o usr/share/man/man3/Ast_helper.Vb.3o +usr/share/man/man3/Ast_invariants.3o +usr/share/man/man3/Ast_iterator.3o usr/share/man/man3/Ast_mapper.3o usr/share/man/man3/Asttypes.3o +usr/share/man/man3/Attr_helper.3o +usr/share/man/man3/Builtin_attributes.3o usr/share/man/man3/Lexer.3o usr/share/man/man3/Location.3o usr/share/man/man3/Longident.3o diff --git a/debian/ocaml-nox.install.in b/debian/ocaml-nox.install.in index b58c5031..3f0bb22e 100644 --- a/debian/ocaml-nox.install.in +++ b/debian/ocaml-nox.install.in @@ -1,5 +1,3 @@ - usr/bin/ocamlbuild - usr/bin/ocamlbuild.byte usr/bin/ocamlc usr/bin/ocamlcp usr/bin/ocamldebug @@ -13,7 +11,6 @@ usr/bin/ocamlobjinfo @OCamlStdlibDir@/objinfo_helper debian/native-archs @OCamlStdlibDir@ -OPT: usr/bin/ocamlbuild.native OPT: usr/bin/ocamlopt OPT: usr/bin/ocamloptp @OCamlStdlibDir@/stdlib.cma @@ -27,7 +24,6 @@ DYN: @OCamlStdlibDir@/dynlink.a @OCamlStdlibDir@/Makefile.config @OCamlStdlibDir@/expunge @OCamlStdlibDir@/extract_crc - @OCamlStdlibDir@/ocamlbuild @OCamlStdlibDir@/ocamldoc @OCamlStdlibDir@/threads @OCamlStdlibDir@/vmthreads @@ -65,6 +61,20 @@ OPT: @OCamlStdlibDir@/libthreadsnat.a usr/share/man/man3/Complex.3o usr/share/man/man3/Digest.3o usr/share/man/man3/Docstrings.3o + usr/share/man/man3/Ephemeron.3o + usr/share/man/man3/Ephemeron.GenHashTable.3o + usr/share/man/man3/Ephemeron.GenHashTable.MakeSeeded.3o + usr/share/man/man3/Ephemeron.K1.3o + usr/share/man/man3/Ephemeron.K1.Make.3o + usr/share/man/man3/Ephemeron.K1.MakeSeeded.3o + usr/share/man/man3/Ephemeron.K2.3o + usr/share/man/man3/Ephemeron.K2.Make.3o + usr/share/man/man3/Ephemeron.K2.MakeSeeded.3o + usr/share/man/man3/Ephemeron.Kn.3o + usr/share/man/man3/Ephemeron.Kn.Make.3o + usr/share/man/man3/Ephemeron.Kn.MakeSeeded.3o + usr/share/man/man3/Ephemeron.S.3o + usr/share/man/man3/Ephemeron.SeededS.3o usr/share/man/man3/Filename.3o usr/share/man/man3/Format.3o usr/share/man/man3/Gc.3o @@ -106,6 +116,7 @@ OPT: @OCamlStdlibDir@/libthreadsnat.a usr/share/man/man3/Nativeint.3o usr/share/man/man3/Num.3o usr/share/man/man3/Obj.3o + usr/share/man/man3/Obj.Ephemeron.3o usr/share/man/man3/Oo.3o usr/share/man/man3/Parsing.3o usr/share/man/man3/Pervasives.3o @@ -134,6 +145,7 @@ OPT: @OCamlStdlibDir@/libthreadsnat.a usr/share/man/man3/String.3o usr/share/man/man3/StringLabels.3o usr/share/man/man3/Sys.3o + usr/share/man/man3/Uchar.3o usr/share/man/man3/Unix.3o usr/share/man/man3/Unix.LargeFile.3o usr/share/man/man3/Weak.3o @@ -212,6 +224,10 @@ STD: digest.mli STD: digest.cmx STD: dynlink.mli STD: event.mli +STD: ephemeron.ml +STD: ephemeron.mli +STD: ephemeron.cmi +STD: ephemeron.cmx STD: filename.ml STD: filename.mli STD: filename.cmx @@ -329,6 +345,10 @@ STD: sys.mli STD: sys.cmx STD: thread.mli STD: threadUnix.mli +STD: uchar.ml +STD: uchar.mli +STD: uchar.cmi +STD: uchar.cmx STD: unix.cmx STD: unix.cmxa STD: unix.mli -- 2.30.2