[Pkg-ocaml-maint-commits] [SCM] cairo-ocaml packaging branch, master, updated. debian/1%1.2.0-1-1-gcf25a43

[Stephane Glondu]

The following commit has been merged in the master branch:
commit cf25a43bccef2039415edaec1f94f091ba6f1d7c
Author: Stephane Glondu <steph at glondu.net>
Date:   Tue Aug 2 21:37:31 2011 +0200

    Fix FTBFS on bytecode architectures

diff --git a/debian/changelog b/debian/changelog
index 79dbe2b..b1e2f53 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+cairo-ocaml (1:1.2.0-2) unstable; urgency=low
+
+  * Fix FTBFS on bytecode architectures
+
+ -- Stéphane Glondu <glondu at debian.org>  Tue, 02 Aug 2011 21:37:59 +0200
+
 cairo-ocaml (1:1.2.0-1) unstable; urgency=low
 
   * New upstream release
diff --git a/debian/patches/0003-Fix-FTBFS-on-bytecode-architectures.patch b/debian/patches/0003-Fix-FTBFS-on-bytecode-architectures.patch
new file mode 100644
index 0000000..8882ce0
--- /dev/null
+++ b/debian/patches/0003-Fix-FTBFS-on-bytecode-architectures.patch
@@ -0,0 +1,39 @@
+From: Stephane Glondu <steph at glondu.net>
+Date: Tue, 2 Aug 2011 21:35:59 +0200
+Subject: Fix FTBFS on bytecode architectures
+
+The new ocaml.m4 defines OCAMLOPT to "no" (instead of not defining
+it); adapt src/Makefile accordingly.
+
+Signed-off-by: Stephane Glondu <steph at glondu.net>
+---
+ src/Makefile |    8 ++++++--
+ 1 files changed, 6 insertions(+), 2 deletions(-)
+
+diff --git a/src/Makefile b/src/Makefile
+index c9c64b7..bc223c7 100644
+--- a/src/Makefile
++++ b/src/Makefile
+@@ -14,7 +14,11 @@ ifdef LIBPANGOCAIRO_CFLAGS
+ TARGETS += pangocairo
+ endif
+ 
+-all : $(TARGETS) $(if $(OCAMLOPT),opt)
++ifneq ($(OCAMLOPT),no)
++OPT_TARGET = opt
++endif
++
++all : $(TARGETS) $(OPT_TARGET)
+ opt : $(addsuffix .opt,$(TARGETS))
+ 
+ cairo     : cairo.cma  libmlcairo.a
+@@ -89,7 +93,7 @@ $(call mloptobjs,$(pangocairo_SRC))  : INCFLAGS=-I $(LABLGTKDIR)
+ install: all
+ 	mkdir -p $(DESTDIR)$(INSTALLDIR) $(DESTDIR)$(OCAMLLIB)/stublibs
+ 	install -m 644 *.mli *.cmi *.cma lib*.a $(DESTDIR)$(INSTALLDIR)
+-ifdef OCAMLOPT
++ifneq ($(OCAMLOPT),no)
+ 	install -m644 *.cmxa *.a *.cmx $(DESTDIR)$(INSTALLDIR)
+ endif
+ 	install -m 755 dll*.so $(DESTDIR)$(INSTALLDIR)
+-- 
diff --git a/debian/patches/series b/debian/patches/series
index 180482f..865b7ec 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 0001-Add-missing-libraries-used-by-the-stubs-to-CAIRO_LIB.patch
 0002-Fix-Makefile-to-avoid-recompiling-files-in-usr.patch
+0003-Fix-FTBFS-on-bytecode-architectures.patch

-- 
cairo-ocaml packaging