[Pkg-ocaml-maint-commits] [SCM] OCaml packaging branch, experimental/master, updated. debian/4.00.0__dev15+12379-1-19-g8329789

[Stephane Glondu]

The following commit has been merged in the experimental/master branch:
commit ab09dcb65edffeaba0e8bdc3c1d5a473ac373804
Author: Stephane Glondu <steph at glondu.net>
Date:   Wed Jun 13 13:30:28 2012 +0200

    Use compiler-libs as installed by upstream
    
    As a side effect, add a dependency ocaml-interp -> ocaml-compiler-libs
    since toplevel library has been moved there.

diff --git a/debian/control b/debian/control
index 746a6ff..dfe44f7 100644
--- a/debian/control
+++ b/debian/control
@@ -232,6 +232,7 @@ Description: Sources for Objective Caml
 Package: ocaml-interp
 Architecture: any
 Depends:
+ ocaml-compiler-libs (= ${binary:Version}),
  ${ocaml:Depends},
  ${shlibs:Depends},
  ${misc:Depends}
diff --git a/debian/ocaml-base-nox.install.in b/debian/ocaml-base-nox.install.in
index 1f88353..07ed3ff 100644
--- a/debian/ocaml-base-nox.install.in
+++ b/debian/ocaml-base-nox.install.in
@@ -61,9 +61,6 @@ DYN: @OCamlStdlibDir@/nums.cmxs
      @OCamlStdlibDir@/stringLabels.cmi
      @OCamlStdlibDir@/sys.cmi
      @OCamlStdlibDir@/weak.cmi
-     @OCamlStdlibDir@/toploop.cmi
-     @OCamlStdlibDir@/topdirs.cmi
-     @OCamlStdlibDir@/topmain.cmi
      @OCamlStdlibDir@/unix.cmi
      @OCamlStdlibDir@/unixLabels.cmi
      @OCamlStdlibDir@/str.cmi
diff --git a/debian/ocaml-compiler-libs.install.in b/debian/ocaml-compiler-libs.install.in
index 132c9de..0b5345d 100644
--- a/debian/ocaml-compiler-libs.install.in
+++ b/debian/ocaml-compiler-libs.install.in
@@ -1,3 +1 @@
-parsing/* @OCamlStdlibDir@/compiler-libs/parsing
-typing/* @OCamlStdlibDir@/compiler-libs/typing
-utils/* @OCamlStdlibDir@/compiler-libs/utils
+ at OCamlStdlibDir@/compiler-libs
diff --git a/debian/ocaml-nox.install.in b/debian/ocaml-nox.install.in
index 09fae8a..8bfabd9 100644
--- a/debian/ocaml-nox.install.in
+++ b/debian/ocaml-nox.install.in
@@ -17,7 +17,6 @@ OPT: usr/bin/ocamlbuild.native
 OPT: usr/bin/ocamlopt
 OPT: usr/bin/ocamloptp
      @OCamlStdlibDir@/stdlib.cma
-     @OCamlStdlibDir@/toplevellib.cma
      @OCamlStdlibDir@/dynlink.cma
 DYN: @OCamlStdlibDir@/dynlink.cmx
 DYN: @OCamlStdlibDir@/dynlink.cmxa
@@ -242,8 +241,6 @@ STD: obj.cmx
 STD: oo.ml
 STD: oo.mli
 STD: oo.cmx
-STD: outcometree.cmi
-STD: outcometree.mli
 STD: parsing.ml
 STD: parsing.mli
 STD: parsing.cmx
@@ -303,7 +300,6 @@ STD: sys.mli
 STD: sys.cmx
 STD: thread.mli
 STD: threadUnix.mli
-STD: topstart.cmo
 STD: unix.cmx
 STD: unix.cmxa
 STD: unix.mli

-- 
OCaml packaging