[Pkg-ocaml-maint-commits] [SCM] obrowser packaging branch, master, updated. debian/1.1+dfsg-2-1-g8a7d67f

[Stephane Glondu]

The following commit has been merged in the master branch:
commit 8a7d67f0bd03033dd36541730a3d4432188c4956
Author: Stephane Glondu <steph at glondu.net>
Date:   Tue Feb 16 13:28:13 2010 +0100

    Add Set-CAML_LD_LIBRARY_PATH-in-wiki-example.patch

diff --git a/debian/changelog b/debian/changelog
index 8ffd06f..4843eac 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+obrowser (1.1+dfsg-3) unstable; urgency=low
+
+  * Add Set-CAML_LD_LIBRARY_PATH-in-wiki-example.patch
+    (fixes FTBFS on bytecode architectures)
+
+ -- Stéphane Glondu <glondu at debian.org>  Tue, 16 Feb 2010 13:28:43 +0100
+
 obrowser (1.1+dfsg-2) unstable; urgency=low
 
   * Fix FTBFS when building without arch:all packages
diff --git a/debian/patches/0006-Set-CAML_LD_LIBRARY_PATH-in-wiki-example.patch b/debian/patches/0006-Set-CAML_LD_LIBRARY_PATH-in-wiki-example.patch
new file mode 100644
index 0000000..64c8bb9
--- /dev/null
+++ b/debian/patches/0006-Set-CAML_LD_LIBRARY_PATH-in-wiki-example.patch
@@ -0,0 +1,23 @@
+From: Stephane Glondu <steph at glondu.net>
+Date: Tue, 16 Feb 2010 13:26:55 +0100
+Subject: [PATCH] Set CAML_LD_LIBRARY_PATH in wiki example
+
+Fixes FTBFS on bytecode architectures.
+---
+ examples/wiki/Makefile |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/examples/wiki/Makefile b/examples/wiki/Makefile
+index b3110ea..1f602e3 100644
+--- a/examples/wiki/Makefile
++++ b/examples/wiki/Makefile
+@@ -1,7 +1,7 @@
+ .PHONY=all clean
+ 
+ all: vm.js
+-	@OCAMLLIB=`pwd`/../../rt/caml ocamlbuild main.byte
++	@OCAMLLIB=`pwd`/../../rt/caml CAML_LD_LIBRARY_PATH=`ocamlc -where`/stublibs ocamlbuild main.byte
+ 	@uuencode main.byte stdout > main.uue
+ 
+ vm.js: ../../vm.js
+-- 
diff --git a/debian/patches/series b/debian/patches/series
index 5a3f68e..8a8791f 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,3 +3,4 @@
 0003-Install-interfaces-in-text-format.patch
 0004-More-cleaning.patch
 0005-Do-not-compile-the-scribble-server.patch
+0006-Set-CAML_LD_LIBRARY_PATH-in-wiki-example.patch

-- 
obrowser packaging