[Pkg-ocaml-maint-commits] [SCM] eliom packaging branch, master, updated. 2fea4151cce3938b30e11f4395b1dc0be2b7358d

[Pierre Chambart]

The following commit has been merged in the master branch:
commit 2fea4151cce3938b30e11f4395b1dc0be2b7358d
Author: Pierre Chambart <chambart at crans.org>
Date:   Mon Feb 27 15:36:02 2012 +0100

    Use ocamlduce

diff --git a/debian/control b/debian/control
index 7efe16a..cf87158 100644
--- a/debian/control
+++ b/debian/control
@@ -7,6 +7,7 @@ Uploaders:
   Pierre Chambart <chambart at crans.org>
 Build-Depends:
   ocaml-nox (>= 3.12.1-2~),
+  ocamlduce,
   ocaml-findlib,
   dh-ocaml (>= 0.9~),
   debhelper (>= 7.0.50~),
diff --git a/debian/libeliom-ocaml-dev.install.in b/debian/libeliom-ocaml-dev.install.in
index 65a70e0..736a7fe 100644
--- a/debian/libeliom-ocaml-dev.install.in
+++ b/debian/libeliom-ocaml-dev.install.in
@@ -9,4 +9,6 @@ usr/bin
 usr/share/man/man1
 DYN: @OCamlStdlibDir@/eliom/server/eliom.cmxa
 DYN: @OCamlStdlibDir@/eliom/server/eliom.a
+DYN: @OCamlStdlibDir@/eliom/server/eliom_duce.cmxa
+DYN: @OCamlStdlibDir@/eliom/server/eliom_duce.a
 DYN: @OCamlStdlibDir@/eliom/client/libeliom_client.a
diff --git a/debian/libeliom-ocaml.install.in b/debian/libeliom-ocaml.install.in
index 7249c83..dee1066 100644
--- a/debian/libeliom-ocaml.install.in
+++ b/debian/libeliom-ocaml.install.in
@@ -1,5 +1,7 @@
 @OCamlStdlibDir@/eliom/server/eliom.cma
+ at OCamlStdlibDir@/eliom/server/eliom_duce.cma
 @OCamlStdlibDir@/eliom/client/dlleliom_client.so
 @OCamlStdlibDir@/eliom/client/eliom_client.cma
 @OCamlStdlibDir@/eliom/client/eliom_client_main.cmo
 DYN: @OCamlStdlibDir@/eliom/server/eliom.cmxs
+DYN: @OCamlStdlibDir@/eliom/server/eliom_duce.cmxs
\ No newline at end of file
diff --git a/debian/rules b/debian/rules
index 921a3e0..e9b2108 100755
--- a/debian/rules
+++ b/debian/rules
@@ -10,6 +10,7 @@ MANDIR=$(DESTDIR)/usr/share/man
 
 include /usr/share/ocaml/ocamlvars.mk
 
+export OCAMLOBJINFO := ocamlduceobjinfo
 export OCAMLFIND_DESTDIR=$(DESTDIR)/$(OCAML_STDLIB_DIR)
 export OCAMLFIND_LDCONF=ignore
 
@@ -38,7 +39,6 @@ override_dh_auto_configure:
 	    --libdir $(OCAML_STDLIB_DIR) \
 	    --temproot $(DESTDIR) \
 	    --mandir /usr/share/man/ \
-	    --without-ocamlduce
 
 .PHONY: override_dh_auto_build
 override_dh_auto_build:

-- 
eliom packaging