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

[Stephane Glondu]

The following commit has been merged in the master branch:
commit 6a1cbb85c11f524415b81d21040256833a751b68
Author: Stephane Glondu <steph at glondu.net>
Date:   Thu Mar 18 09:59:02 2010 +0100

    Fix FTBFS with bash due to buggy patch

diff --git a/debian/changelog b/debian/changelog
index 4843eac..82d7c26 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+obrowser (1.1+dfsg-4) unstable; urgency=low
+
+  * Fix FTBFS with bash due to buggy patch:
+    - remove 0006-Set-CAML_LD_LIBRARY_PATH-in-wiki-example.patch
+    - add 0006-Set-OCAMLLIB-at-the-right-time-in-wiki-example.patch
+
+ -- Stéphane Glondu <glondu at debian.org>  Thu, 18 Mar 2010 09:59:32 +0100
+
 obrowser (1.1+dfsg-3) unstable; urgency=low
 
   * Add Set-CAML_LD_LIBRARY_PATH-in-wiki-example.patch
diff --git a/debian/patches/0006-Set-CAML_LD_LIBRARY_PATH-in-wiki-example.patch b/debian/patches/0006-Set-OCAMLLIB-at-the-right-time-in-wiki-example.patch
similarity index 63%
rename from debian/patches/0006-Set-CAML_LD_LIBRARY_PATH-in-wiki-example.patch
rename to debian/patches/0006-Set-OCAMLLIB-at-the-right-time-in-wiki-example.patch
index 64c8bb9..5c71b8e 100644
--- a/debian/patches/0006-Set-CAML_LD_LIBRARY_PATH-in-wiki-example.patch
+++ b/debian/patches/0006-Set-OCAMLLIB-at-the-right-time-in-wiki-example.patch
@@ -1,14 +1,15 @@
 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
+Subject: [PATCH] Set OCAMLLIB at the right time in wiki example
 
-Fixes FTBFS on bytecode architectures.
+OCAMLLIB must not affect ocamlbuild itself. This patch 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
+index b3110ea..10234e9 100644
 --- a/examples/wiki/Makefile
 +++ b/examples/wiki/Makefile
 @@ -1,7 +1,7 @@
@@ -16,7 +17,7 @@ index b3110ea..1f602e3 100644
  
  all: vm.js
 -	@OCAMLLIB=`pwd`/../../rt/caml ocamlbuild main.byte
-+	@OCAMLLIB=`pwd`/../../rt/caml CAML_LD_LIBRARY_PATH=`ocamlc -where`/stublibs ocamlbuild main.byte
++	@ocamlbuild -ocamlc 'OCAMLLIB=$(PWD)/../../rt/caml ocamlc' main.byte
  	@uuencode main.byte stdout > main.uue
  
  vm.js: ../../vm.js
diff --git a/debian/patches/series b/debian/patches/series
index 8a8791f..3fb7f4c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,4 +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
+0006-Set-OCAMLLIB-at-the-right-time-in-wiki-example.patch

-- 
obrowser packaging