[Pkg-ocaml-maint-commits] [SCM] ocaml-r packaging branch, master, updated. upstream/0.2-3-ga885106

[Guillaume Yziquel]

The following commit has been merged in the master branch:
commit a885106cbc1803e421a89cb43e902ddd204fb7bd
Author: Guillaume Yziquel <guillaume.yziquel at citycable.ch>
Date:   Sat May 15 12:11:41 2010 +0200

    Cleaning up the .install.in files.

diff --git a/debian/libr-ocaml-dev.install.in b/debian/libr-ocaml-dev.install.in
index 4cadf6b..66faf81 100644
--- a/debian/libr-ocaml-dev.install.in
+++ b/debian/libr-ocaml-dev.install.in
@@ -1,18 +1,19 @@
 src/r.mli             @OCamlStdlibDir@/R
 src/r.cmi             @OCamlStdlibDir@/R
-OPT: src/r.o          @OCamlStdlibDir@/R
-OPT: src/r.cmx        @OCamlStdlibDir@/R
-OPT: src/*.a          @OCamlStdlibDir@/R
-OPT: src/*.cmxa       @OCamlStdlibDir@/R
-src/math/*.mli        @OCamlStdlibDir@/R
-src/math/*.cmi        @OCamlStdlibDir@/R
-OPT: src/math/*.o     @OCamlStdlibDir@/R
-OPT: src/math/*.cmx   @OCamlStdlibDir@/R
 src/rbase.mli         @OCamlStdlibDir@/R
 src/rbase.cmi         @OCamlStdlibDir@/R
-OPT: src/rbase.o      @OCamlStdlibDir@/R
-OPT: src/rbase.cmx    @OCamlStdlibDir@/R
 src/rstats.mli        @OCamlStdlibDir@/R
 src/rstats.cmi        @OCamlStdlibDir@/R
+src/math/*.mli        @OCamlStdlibDir@/R
+src/math/*.cmi        @OCamlStdlibDir@/R
+#Do not install the oCamlR.cmi file!
+OPT: src/r.o          @OCamlStdlibDir@/R
+OPT: src/rbase.o      @OCamlStdlibDir@/R
 OPT: src/rstats.o     @OCamlStdlibDir@/R
+OPT: src/r.cmx        @OCamlStdlibDir@/R
+OPT: src/rbase.cmx    @OCamlStdlibDir@/R
 OPT: src/rstats.cmx   @OCamlStdlibDir@/R
+OPT: src/math/*.o     @OCamlStdlibDir@/R
+OPT: src/math/*.cmx   @OCamlStdlibDir@/R
+OPT: src/*.a          @OCamlStdlibDir@/R
+OPT: src/*.cmxa       @OCamlStdlibDir@/R
diff --git a/debian/libr-ocaml.install.in b/debian/libr-ocaml.install.in
index 9027a61..710ade0 100644
--- a/debian/libr-ocaml.install.in
+++ b/debian/libr-ocaml.install.in
@@ -2,10 +2,10 @@ src/*.cma             @OCamlStdlibDir@/R
 src/*.so              @OCamlDllDir@
 OPT: src/*.a          @OCamlStdlibDir@/R
 OPT: src/*.cmxs       @OCamlStdlibDir@/R
+#The oCamlR files are put here, because they
+#are in charge of statically initialising the
+#R interpreter. They are without .cmi interface.
 src/oCamlR.cmo        @OCamlStdlibDir@/R
 OPT: src/oCamlR.o     @OCamlStdlibDir@/R
 OPT: src/oCamlR.cmx   @OCamlStdlibDir@/R
-#src/math/*.cma        @OCamlStdlibDir@/R
-#src/math/*.so         @OCamlDllDir@
-#OPT: src/math/*.a     @OCamlStdlibDir@/R
 src/META              @OCamlStdlibDir@/R

-- 
ocaml-r packaging