[Pkg-ocaml-maint-commits] [SCM] alt-ergo packaging branch, master, updated. debian/0.91-1-1-g2575a14

[Mehdi Dogguy]

The following commit has been merged in the master branch:
commit 2575a14778b5d3f555d0a65fca40154d7e34ae59
Author: Mehdi Dogguy <mehdi at debian.org>
Date:   Tue Jun 1 22:26:36 2010 +0200

    Fix build on bytecode architecures: "test" target should depend on "best" alternative, and not "opt".

diff --git a/debian/changelog b/debian/changelog
index 80a7600..a80fb91 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+alt-ergo (0.91-2) unstable; urgency=low
+
+  * Fix build on bytecode architecures: "test" target should depend on
+    "best" alternative, and not "opt".
+
+ -- Mehdi Dogguy <mehdi at debian.org>  Tue, 01 Jun 2010 22:25:38 +0200
+
 alt-ergo (0.91-1) unstable; urgency=low
 
   * New upstream release.
diff --git a/debian/patches/0002-Do-not-run-the-test-if-test.mlw-is-absent-and-use-be.patch b/debian/patches/0002-Do-not-run-the-test-if-test.mlw-is-absent-and-use-be.patch
new file mode 100644
index 0000000..a2da2be
--- /dev/null
+++ b/debian/patches/0002-Do-not-run-the-test-if-test.mlw-is-absent-and-use-be.patch
@@ -0,0 +1,24 @@
+From: Mehdi Dogguy <mehdi at debian.org>
+Date: Tue, 1 Jun 2010 21:08:31 +0200
+Subject: [PATCH] Do not run the test if test.mlw is absent and use best target (not opt)
+
+---
+ Makefile.in |    4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/Makefile.in b/Makefile.in
+index f19ee42..d1e9eca 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -124,8 +124,8 @@ run: $(MAINCMX)
+ 	strip $@
+ 	tar -czvf alt-ergo.tgz run smt_prelude.mlw
+ 
+-test: $(OPT)
+-	./$(OPT) test.mlw
++test: $(NAME).$(OCAMLBEST)
++	[ ! -f test.mlw ] || ./$^ test.mlw
+ 
+ testbyte:$(BYTE)
+ 	tests/test.sh $(BYTE) -glouton
+-- 
diff --git a/debian/patches/0002-Do-not-run-the-test-if-test.mlw-is-absent.patch b/debian/patches/0002-Do-not-run-the-test-if-test.mlw-is-absent.patch
deleted file mode 100644
index 9c6d40f..0000000
--- a/debian/patches/0002-Do-not-run-the-test-if-test.mlw-is-absent.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From: Mehdi Dogguy <mehdi at debian.org>
-Date: Tue, 1 Jun 2010 21:08:31 +0200
-Subject: [PATCH] Do not run the test if test.mlw is absent
-
----
- Makefile.in |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/Makefile.in b/Makefile.in
-index f19ee42..d43b908 100644
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -125,7 +125,7 @@ run: $(MAINCMX)
- 	tar -czvf alt-ergo.tgz run smt_prelude.mlw
- 
- test: $(OPT)
--	./$(OPT) test.mlw
-+	[ ! -f test.mlw ] || ./$(OPT) test.mlw
- 
- testbyte:$(BYTE)
- 	tests/test.sh $(BYTE) -glouton
--- 
diff --git a/debian/patches/series b/debian/patches/series
index 6235b65..179c211 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,3 @@
 0001-No-need-to-activate-debug-flag.patch
-0002-Do-not-run-the-test-if-test.mlw-is-absent.patch
+0002-Do-not-run-the-test-if-test.mlw-is-absent-and-use-be.patch
 0003-Fix-a-typo.patch

-- 
alt-ergo packaging