Update installation rules

diff --git a/debian/ocaml-compiler-libs.install.in b/debian/ocaml-compiler-libs.install.in
index 591bc052b95e8a6e74e8a004c12e802c43386784..eb9261389fc223ff928faebdf37ae010be117909 100644 (file)
--- a/debian/ocaml-compiler-libs.install.in
+++ b/debian/ocaml-compiler-libs.install.in
@@ -1,5 +1,8 @@
 @OCamlStdlibDir@/compiler-libs
 @OCamlStdlibDir@/topdirs.cmi
+@OCamlStdlibDir@/topdirs.cmt
+@OCamlStdlibDir@/topdirs.cmti
+@OCamlStdlibDir@/topdirs.mli
 usr/share/man/man3/Ast_helper.3o
 usr/share/man/man3/Ast_helper.Cf.3o
 usr/share/man/man3/Ast_helper.Ci.3o

diff --git a/debian/ocaml-nox.install.in b/debian/ocaml-nox.install.in
index 1435aec53814d9d59ae331e9f88adf84d5c3d7e8..0d72a63d6eeb5182ece68ef51182976496bf654c 100644 (file)
--- a/debian/ocaml-nox.install.in
+++ b/debian/ocaml-nox.install.in
@@ -56,6 +56,7 @@ OPT: @OCamlStdlibDir@/libthreadsnat.a
      usr/share/man/man3/Array.3o
      usr/share/man/man3/ArrayLabels.3o
      usr/share/man/man3/Bigarray.3o
+     usr/share/man/man3/Bigarray.Array0.3o
      usr/share/man/man3/Bigarray.Array1.3o
      usr/share/man/man3/Bigarray.Array2.3o
      usr/share/man/man3/Bigarray.Array3.3o
@@ -181,6 +182,7 @@ STD: arg.ml
 STD: arg.mli
 STD: arg.cmx
 STD: arith_flags.cmx
+STD: arith_status.cmti
 STD: arith_status.cmx
 STD: arith_status.mli
 STD: arrayLabels.ml
@@ -189,8 +191,10 @@ STD: arrayLabels.cmx
 STD: array.ml
 STD: array.mli
 STD: array.cmx
+STD: big_int.cmti
 STD: big_int.cmx
 STD: big_int.mli
+STD: bigarray.cmti
 STD: bigarray.cmx
 STD: bigarray.cmxa
 STD: bigarray.mli
@@ -237,6 +241,7 @@ STD: condition.mli
 STD: digest.ml
 STD: digest.mli
 STD: digest.cmx
+STD: dynlink.cmti
 STD: dynlink.mli
 STD: event.mli
 STD: ephemeron.ml
@@ -287,11 +292,13 @@ STD: moreLabels.ml
 STD: moreLabels.mli
 STD: moreLabels.cmx
 STD: mutex.mli
+STD: nat.cmti
 STD: nat.cmx
 STD: nat.mli
 STD: nativeint.ml
 STD: nativeint.mli
 STD: nativeint.cmx
+STD: num.cmti
 STD: num.cmx
 STD: num.mli
 STD: nums.cmxa
@@ -315,6 +322,8 @@ STD: printf.mli
 STD: printf.cmx
 STD: profiling.cmi
 STD: profiling.cmo
+STD: profiling.cmt
+STD: profiling.cmti
 STD: profiling.cmx
 STD: queue.ml
 STD: queue.mli
@@ -322,6 +331,7 @@ STD: queue.cmx
 STD: random.ml
 STD: random.mli
 STD: random.cmx
+STD: ratio.cmti
 STD: ratio.cmx
 STD: ratio.mli
 64: STD: raw_spacetime_lib.cmx
@@ -350,6 +360,7 @@ STD: std_exit.ml
 STD: stdLabels.cmx
 STD: stdLabels.ml
 STD: stdLabels.mli
+STD: str.cmti
 STD: str.cmx
 STD: str.cmxa
 STD: str.mli
@@ -371,9 +382,11 @@ STD: uchar.ml
 STD: uchar.mli
 STD: uchar.cmi
 STD: uchar.cmx
+STD: unix.cmti
 STD: unix.cmx
 STD: unix.cmxa
 STD: unix.mli
+STD: unixLabels.cmti
 STD: unixLabels.cmx
 STD: unixLabels.mli
 STD: weak.ml

diff --git a/debian/ocaml.install.in b/debian/ocaml.install.in
index 195d4e8ee8d30669283c403f41a88db8fe5ff940..bc5b2b50f681d5b7408343ea7ca9fd40cf8e1ce4 100644 (file)
--- a/debian/ocaml.install.in
+++ b/debian/ocaml.install.in
@@ -1,8 +1,10 @@
      @OCamlStdlibDir@/libgraphics.a
 STD: graphics.cmi
+STD: graphics.cmti
 STD: graphics.cmx
 STD: graphics.cmxa
 STD: graphics.mli
 STD: graphicsX11.cmi
+STD: graphicsX11.cmti
 STD: graphicsX11.cmx
 STD: graphicsX11.mli

diff --git a/debian/rules b/debian/rules
index 362d475ebb3c354626f5cde8feffb9a4c766a072..b8c199cccab8534813fa21128ac73bac7f931515 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -6,8 +6,8 @@ include /usr/share/dpkg/buildflags.mk
 
 PACKAGE := ocaml
 ALL_PACKAGES := $(shell dh_listpackages)
-OCAMLMAJOR := 4.04
-OCAMLMINOR := 0
+OCAMLMAJOR := 4.05
+OCAMLMINOR := 0+rc1
 
 # Use ccache if pkg.ocaml.ccache build-profile is active.
 # Your rebuilds will be *much quicker*.
@@ -210,8 +210,6 @@ install-stamp-arch:
 # Install OCaml
        $(MAKE) install PREFIX=$(INSTDIR)
 ifeq (,$(DEB_TEST_BUILD_PREFIX))
-# Remove empty directory
-       rmdir $(CURDIR)/debian/tmp$(OCAML_STDLIB_DIR)/ocamldoc/custom
 # Remove uninstalled files
        rm -f \
          $(INSTDIR)/share/man/man1/ocamlopt.opt.1 \