[Pkg-ocaml-maint-commits] [SCM] ocaml-r packaging branch, master, updated. upstream/0.1-18-g4049ee1

[Guillaume Yziquel]

The following commit has been merged in the master branch:
commit 4049ee1908950740bba05a54245c0611363d978d
Author: Guillaume Yziquel <guillaume.yziquel at citycable.ch>
Date:   Tue Oct 27 14:22:53 2009 +0100

    Removing Rdevices from src/Makefile.

diff --git a/debian/patches/new-build-system.diff b/debian/patches/new-build-system.diff
index 2497d84..4e1e124 100644
--- a/debian/patches/new-build-system.diff
+++ b/debian/patches/new-build-system.diff
@@ -1,8 +1,6 @@
 From: Guillaume Yziquel <guillaume.yziquel at citycable.ch>
 Subject: [PATCH] Replacing build system by a more direct one.
 
-Index: ocaml-r-0.1/src/Makefile
-===================================================================
 --- a/src/Makefile
 +++ b/src/Makefile
 @@ -69,21 +69,35 @@
@@ -24,10 +22,10 @@ Index: ocaml-r-0.1/src/Makefile
 -$(LIBMATH_BYTE): $(LIBMATH_CMIFILES) $(LIBMATH_CMOFILES) $(LIBMATH_COBJ_FILES)
 -	$(OCAMLMKLIB) -custom -o `basename $@ .cma` $(LINKFLAGS_MATH_BYTE) \
 -	$(LIBMATH_COBJ_FILES) $(LIBMATH_CMOFILES)
-+r.cma: dllr_base_stubs.so dllr_data_stubs.so rdevices.cmo rdevices.cmi r.cmo r.cmi
++r.cma: dllr_base_stubs.so dllr_data_stubs.so r.cmo r.cmi
 +	ocamlc -a -dllpath /usr/lib/R/lib -dllib dllr_base_stubs.so -dllib dllr_data_stubs.so -dllib libR.so -o r.cma rdevices.cmo r.cmo
 +
-+r.cmxa: dllr_base_stubs.so dllr_data_stubs.so rdevices.cmx rdevices.cmi r.cmx r.cmi
++r.cmxa: dllr_base_stubs.so dllr_data_stubs.so r.cmx r.cmi
 +	ocamlopt -a -ccopt -L/usr/lib/R/lib -cclib -lr_base_stubs -cclib -lr_data_stubs -cclib -lR -o r.cmxa rdevices.cmx r.cmx
 +
 +rmath.cma: dllr_math_stubs.so rmath.cmo rmath.cmi

-- 
ocaml-r packaging