[Pkg-ocaml-maint-commits] [SCM] mlpost packaging branch, master, updated. debian/0.7.1-1-1-g4e454d0

[Stephane Glondu]

The following commit has been merged in the master branch:
commit 4e454d0c51d46fe824cd798b702d4fe71939069a
Author: Stephane Glondu <steph at glondu.net>
Date:   Thu Aug 13 13:39:40 2009 +0200

    Add a patch to fix FTBFS on bytecode architectures

diff --git a/debian/changelog b/debian/changelog
index 4a04e36..8e1abfe 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+mlpost (0.7.1-2) unstable; urgency=low
+
+  * Add a patch to fix FTBFS on bytecode architectures
+
+ -- Stephane Glondu <steph at glondu.net>  Thu, 13 Aug 2009 13:39:54 +0200
+
 mlpost (0.7.1-1) unstable; urgency=low
 
   * New upstream release:
diff --git a/debian/patches/0002-Fix-build-when-ocamlopt-is-missing.patch b/debian/patches/0002-Fix-build-when-ocamlopt-is-missing.patch
new file mode 100644
index 0000000..2a27ce7
--- /dev/null
+++ b/debian/patches/0002-Fix-build-when-ocamlopt-is-missing.patch
@@ -0,0 +1,46 @@
+From: Stephane Glondu <steph at glondu.net>
+Date: Thu, 13 Aug 2009 13:38:08 +0200
+Subject: [PATCH] Fix build when ocamlopt is missing
+
+ * call ocamlbuild with -byte-plugin on bytecode platforms
+ * fix install-byte rule
+
+Forwarded upstream.
+
+Signed-off-by: Stephane Glondu <steph at glondu.net>
+---
+ ocamlbuild.Makefile.in |    6 ++++--
+ 1 files changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/ocamlbuild.Makefile.in b/ocamlbuild.Makefile.in
+index 771e140..58db088 100644
+--- a/ocamlbuild.Makefile.in
++++ b/ocamlbuild.Makefile.in
+@@ -46,6 +46,7 @@ ifeq "$(OCAMLBEST)" "opt"
+ TOOL= tool.native
+ else
+ TOOL= tool.byte
++OBOPTS += -byte-plugin
+ endif
+ 
+ ifeq "$(TERM)" "dumb"
+@@ -56,7 +57,8 @@ endif
+ 
+ DTYPES = -tag dtypes
+ 
+-OCAMLBUILD := ocamlbuild -no-links $(DTYPES) -tag cairo_ at CAIRO@ $(OCAMLBUILD_DISPLAY)
++OCAMLBUILD := ocamlbuild $(OBOPTS) -no-links $(DTYPES) -tag cairo_ at CAIRO@ $(OCAMLBUILD_DISPLAY)
++
+ BUILD := _build/
+ 
+ CMA := mlpost.cma
+@@ -203,7 +205,7 @@ install-byte:
+ 	mkdir -p $(LIBDIR)
+ 	cp -f $(BUILD)mlpost.cmo $(BUILD)mlpost.cmi META $(BUILD)$(CMA) "$(LIBDIR)"
+ 	mkdir -p $(BINDIR)
+-	cp -f tool.byte $(BINDIR)/mlpost
++	cp -f $(BUILD)tool.byte $(BINDIR)/mlpost
+ 	cp -f mlpost.1 $(MANDIR)/man1
+ 
+ install-opt:
+-- 
diff --git a/debian/patches/series b/debian/patches/series
index 9dde1ca..b29efb1 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 0001-Fix-manpage-double-UTF8-encoding.patch
+0002-Fix-build-when-ocamlopt-is-missing.patch

-- 
mlpost packaging