[Pkg-ocaml-maint-commits] [SCM] obus packaging branch, master, updated. debian/1.0.rc1-1-5-ga5188df
Stephane Glondu
steph at glondu.net
Thu Apr 29 06:36:39 UTC 2010
The following commit has been merged in the master branch:
commit 3fa3fea067de68006c1734c24184f3d2f408a44c
Author: Stephane Glondu <steph at glondu.net>
Date: Thu Apr 29 08:25:24 2010 +0200
Add 0002-Fix-build-with-lwt-2.1.0.patch
diff --git a/debian/patches/0002-Fix-build-with-lwt-2.1.0.patch b/debian/patches/0002-Fix-build-with-lwt-2.1.0.patch
new file mode 100644
index 0000000..649017b
--- /dev/null
+++ b/debian/patches/0002-Fix-build-with-lwt-2.1.0.patch
@@ -0,0 +1,36 @@
+From: Stephane Glondu <steph at glondu.net>
+Date: Thu, 29 Apr 2010 08:12:04 +0200
+Subject: [PATCH] Fix build with lwt 2.1.0
+
+Signed-off-by: Stephane Glondu <steph at glondu.net>
+---
+ _tags | 2 +-
+ myocamlbuild.ml | 1 +
+ 2 files changed, 2 insertions(+), 1 deletions(-)
+
+diff --git a/_tags b/_tags
+index b8bacb3..86d8080 100644
+--- a/_tags
++++ b/_tags
+@@ -27,7 +27,7 @@
+ <syntax/pa_monad.ml>: pkg_camlp4.quotations.r
+
+ # Common dependencies
+-<{src,src/private,tools,test,examples}/*>: pkg_lwt.unix, pkg_xmlm, pkg_react
++<{src,src/private,tools,test,examples}/*>: pkg_lwt.unix, pkg_xmlm, pkg_lwt.react
+
+ # Examples
+ <examples/*>: use_obus
+diff --git a/myocamlbuild.ml b/myocamlbuild.ml
+index d2d2640..1247e3a 100644
+--- a/myocamlbuild.ml
++++ b/myocamlbuild.ml
+@@ -88,6 +88,7 @@ let packages = [
+ "camlp4.quotations.o";
+ "camlp4.quotations.r";
+ "lwt";
++ "lwt.react";
+ "lwt.unix";
+ "lwt.syntax";
+ "str";
+--
diff --git a/debian/patches/series b/debian/patches/series
index c6c94b1..01a9bbe 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
0001-Fix-build-on-bytecode-architectures.patch
+0002-Fix-build-with-lwt-2.1.0.patch
--
obus packaging
More information about the Pkg-ocaml-maint-commits
mailing list