[Pkg-ocaml-maint-commits] [SCM] why packaging branch, master, updated. debian/2.23+dfsg-1-10-g3de1ee2

[Mehdi Dogguy]

The following commit has been merged in the master branch:
commit cafd511a37291972d2025e392a645de7c5f5fba1
Author: Mehdi Dogguy <mehdi at debian.org>
Date:   Sun Jan 24 21:08:37 2010 +0100

    Use tools make_float_model.ocamlbest instead of opt version

diff --git a/debian/changelog b/debian/changelog
index 8ce222e..184842b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -12,6 +12,8 @@ why (2.23+dfsg-1) unstable; urgency=low
     + Add 0001-Do-not-run-tests-on-non-existant-files.patch
   * Fix some spelling errors
     + Add 0003-Fix-spelling-errors.patch
+  * Fix FTBFS on bytecode architectures
+    + Add 0004-Use-tools-make_float_model.ocamlbest-instead-of-opt-.patch
   * Fix debhelper-but-no-misc-depends
   * Fix out-of-date-standards-version
   * Set filter-pristine-tar to True in debian/gbp.conf
diff --git a/debian/patches/0004-Use-tools-make_float_model.ocamlbest-instead-of-opt-.patch b/debian/patches/0004-Use-tools-make_float_model.ocamlbest-instead-of-opt-.patch
new file mode 100644
index 0000000..02a908e
--- /dev/null
+++ b/debian/patches/0004-Use-tools-make_float_model.ocamlbest-instead-of-opt-.patch
@@ -0,0 +1,32 @@
+From: Mehdi Dogguy <mehdi at debian.org>
+Date: Sun, 24 Jan 2010 21:05:55 +0100
+Subject: [PATCH] Use tools/make_float_model.ocamlbest instead of opt version
+
+---
+ Makefile.in |   11 +++++++----
+ 1 files changed, 7 insertions(+), 4 deletions(-)
+
+diff --git a/Makefile.in b/Makefile.in
+index 1ff1a91..5b749ac 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -653,11 +653,14 @@ bin/cadlog.opt: src/version.cmx c/cversion.cmx tools/cadlog.cmx
+ tools/make_float_model.opt: tools/make_float_model.cmx
+ 	$(OCAMLOPT) -o $@ $^
+ 
+-lib/why/double_model.why lib/why/double_strict.why: tools/make_float_model.opt
+-	tools/make_float_model.opt double 53 -1074
++tools/make_float_model.byte: tools/make_float_model.cmo
++	$(OCAMLC) -o $@ $^
+ 
+-lib/why/single_model.why lib/why/single_strict.why: tools/make_float_model.opt
+-	tools/make_float_model.opt single 24 -149
++lib/why/double_model.why lib/why/double_strict.why: tools/make_float_model.$(OCAMLBEST)
++	tools/make_float_model.$(OCAMLBEST) double 53 -1074
++
++lib/why/single_model.why lib/why/single_strict.why: tools/make_float_model.$(OCAMLBEST)
++	tools/make_float_model.$(OCAMLBEST) single 24 -149
+ 
+ 
+ static:: $(STATICBINARY)
+-- 
diff --git a/debian/patches/series b/debian/patches/series
index a96cf46..a9eec75 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 0001-Do-not-run-tests-on-non-existant-files.patch
 0002-Enable-Apron-support.patch
 0003-Fix-spelling-errors.patch
+0004-Use-tools-make_float_model.ocamlbest-instead-of-opt-.patch

-- 
why packaging