[Pkg-ocaml-maint-commits] [SCM] ocaml-zarith packaging branch, master, updated. debian/1.0-2-3-g37ccc53

[Mehdi Dogguy]

The following commit has been merged in the master branch:
commit 08da188bdef3166cae30116079bac5d34623878a
Author: Mehdi Dogguy <mehdi at debian.org>
Date:   Wed Oct 5 14:21:55 2011 +0200

    Do not try to build zarith.a on bytecode only architectures

diff --git a/debian/changelog b/debian/changelog
index c7fe80f..b718e39 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+ocaml-zarith (1.0-3) UNRELEASED; urgency=low
+
+  * Do not try to build zarith.a on bytecode only architectures.
+    - Update 0003-Make-it-byte-arch-aware.patch
+
+ -- Mehdi Dogguy <mehdi at debian.org>  Wed, 05 Oct 2011 14:21:16 +0200
+
 ocaml-zarith (1.0-2) experimental; urgency=low
 
   * Make ocamlopt's presence optional. This should prevent build failures
diff --git a/debian/patches/0003-Make-it-byte-arch-aware.patch b/debian/patches/0003-Make-it-byte-arch-aware.patch
index 85c5886..f6ebd84 100644
--- a/debian/patches/0003-Make-it-byte-arch-aware.patch
+++ b/debian/patches/0003-Make-it-byte-arch-aware.patch
@@ -7,7 +7,7 @@ Subject: [PATCH] Make it byte-arch aware
  1 files changed, 13 insertions(+), 3 deletions(-)
 
 diff --git a/project.mak b/project.mak
-index 2e3e9f7..f6417d1 100644
+index 2e3e9f7..5ad2847 100644
 --- a/project.mak
 +++ b/project.mak
 @@ -22,13 +22,23 @@ MLISRC = z.mli q.mli big_int_Z.mli
@@ -16,9 +16,9 @@ index 2e3e9f7..f6417d1 100644
  CMIOBJ = $(MLISRC:%.mli=%.cmi)
 -TOINSTALL = zarith.a zarith.cma zarith.cmxa zarith.cmxs libzarith.a $(MLISRC) $(CMIOBJ)
 -
-+TOINSTALL = zarith.a zarith.cma libzarith.a $(MLISRC) $(CMIOBJ)
++TOINSTALL = zarith.cma libzarith.a $(MLISRC) $(CMIOBJ)
 +ifneq (,$(wildcard /usr/bin/$(OCAMLOPT)))
-+TOINSTALL += zarith.cmxa
++TOINSTALL += zarith.a zarith.cmxa
 +ifneq (,$(wildcard $(shell $(OCAMLC) -where)/dynlink.cmxa))
 +TOINSTALL += zarith.cmxs
 +endif
diff --git a/debian/patches/0004-Disable-charset-when-calling-ocamldoc.patch b/debian/patches/0004-Disable-charset-when-calling-ocamldoc.patch
index bdcc3b1..c1c14ce 100644
--- a/debian/patches/0004-Disable-charset-when-calling-ocamldoc.patch
+++ b/debian/patches/0004-Disable-charset-when-calling-ocamldoc.patch
@@ -9,7 +9,7 @@ Debian yet. We should drop this patch as soon as it enters in.
  1 files changed, 1 insertions(+), 1 deletions(-)
 
 diff --git a/project.mak b/project.mak
-index f6417d1..ecaded5 100644
+index 5ad2847..d416c06 100644
 --- a/project.mak
 +++ b/project.mak
 @@ -66,7 +66,7 @@ bitest: zarith.cmxa  bitest.cmx

-- 
ocaml-zarith packaging