[Pkg-ocaml-maint-commits] [SCM] ocsigen packaging branch, master, updated. debian/1.3.3-3-7-g048914e

[Nicolas Dandrimont]

The following commit has been merged in the master branch:
commit 6dd6050dff2bbbd139c8737176b2ddf7818ac0e7
Author: Nicolas Dandrimont <Nicolas.Dandrimont at crans.org>
Date:   Wed May 18 14:32:29 2011 +0200

    Do not install lwt_obrowser (installed by obrowser)

diff --git a/debian/libocsigen-ocaml-dev.install.in b/debian/libocsigen-ocaml-dev.install.in
index b4faa23..86f4a1f 100644
--- a/debian/libocsigen-ocaml-dev.install.in
+++ b/debian/libocsigen-ocaml-dev.install.in
@@ -35,8 +35,6 @@
 @OCamlStdlibDir@/ocsigen/framepp.mli
 @OCamlStdlibDir@/ocsigen/http_headers.cmi
 @OCamlStdlibDir@/ocsigen/http_headers.mli
- at OCamlStdlibDir@/ocsigen/lwt_obrowser.cmi
- at OCamlStdlibDir@/ocsigen/lwt_obrowser.mli
 @OCamlStdlibDir@/ocsigen/ocsigen.cma
 @OCamlStdlibDir@/ocsigen/ocsigen_LocalFiles.cmi
 @OCamlStdlibDir@/ocsigen/ocsigen_LocalFiles.mli
diff --git a/debian/patches/0001-Disable-install-of-lwt_obrowser.patch b/debian/patches/0001-Disable-install-of-lwt_obrowser.patch
new file mode 100644
index 0000000..79938e4
--- /dev/null
+++ b/debian/patches/0001-Disable-install-of-lwt_obrowser.patch
@@ -0,0 +1,30 @@
+From: Nicolas Dandrimont <Nicolas.Dandrimont at crans.org>
+Date: Wed, 18 May 2011 14:40:27 +0200
+Subject: Disable install of lwt_obrowser
+
+---
+ Makefile |    3 +--
+ 1 files changed, 1 insertions(+), 2 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index 3d7772a..6e3f321 100644
+--- a/Makefile
++++ b/Makefile
+@@ -191,7 +191,7 @@ endif
+ STATICSTUBS = server/lib$(OCSIGENNAME).a
+ 
+ PLUGINSTOINSTALL=$(PLUGINSTOINSTALLBYTE) $(PLUGINSTOINSTALLX)
+-TOINSTALL=$(TOINSTALLBYTE) $(TOINSTALLX) $(CMITOINSTALL) $(PLUGINSCMITOINSTALL) $(PLUGINSTOINSTALL) $(STATICSTUBS) eliom/pa_eliom_obrowser.cmo eliom/obrowser/_build/eliom_obrowser_client.cma eliom/obrowser/_build/eliom_obrowser_client.cmi eliom/obrowser/_build/lwt_obrowser.cmi eliom/obrowser/eliom_obrowser.js
++TOINSTALL=$(TOINSTALLBYTE) $(TOINSTALLX) $(CMITOINSTALL) $(PLUGINSCMITOINSTALL) $(PLUGINSTOINSTALL) $(STATICSTUBS) eliom/pa_eliom_obrowser.cmo eliom/obrowser/_build/eliom_obrowser_client.cma eliom/obrowser/_build/eliom_obrowser_client.cmi eliom/obrowser/eliom_obrowser.js
+ EXAMPLES=$(EXAMPLESBYTE) $(EXAMPLESOPT) $(EXAMPLESCMI)
+ 
+ REPS=$(TARGETSBYTE:.byte=)
+@@ -288,7 +288,6 @@ files/META.ocsigen: files/META.in VERSION
+ 	-ln -sf ../eliom/eliom.cma extensions
+ 	-ln -sf ../eliom/eliom_duce.cma extensions
+ 	-ln -sf ../eliom/obrowser/_builde/eliom_obrowser_client.cma extensions
+-	-ln -sf ../eliom/obrowser/_build/lwt_obrowser.cmo extensions
+ 	-ln -sf ../xmlp4/ohl-xhtml/xhtml.cma extensions
+ 	-ln -sf ../xmlp4/xhtmlpretty.cma extensions
+ 	-ln -sf ../xmlp4/xhtmlsyntax.cma extensions
+-- 
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..6a3af06
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+0001-Disable-install-of-lwt_obrowser.patch

-- 
ocsigen packaging