[Pkg-ocaml-maint-commits] [SCM] OCaml packaging branch, experimental/master, updated. debian/4.00.0_beta2-2-2-g908fe5f

[Stephane Glondu]

The following commit has been merged in the experimental/master branch:
commit 908fe5f4e25fedb103a74a9e1f44252df9c2948e
Author: Stephane Glondu <steph at glondu.net>
Date:   Sat Jul 21 13:43:50 2012 +0200

    Fix i18n bug in thread tests

diff --git a/debian/patches/0016-Fix-i18n-bug-in-thread-tests.patch b/debian/patches/0016-Fix-i18n-bug-in-thread-tests.patch
new file mode 100644
index 0000000..b8e92ec
--- /dev/null
+++ b/debian/patches/0016-Fix-i18n-bug-in-thread-tests.patch
@@ -0,0 +1,59 @@
+From: Stephane Glondu <steph at glondu.net>
+Date: Sat, 21 Jul 2012 13:42:31 +0200
+Subject: Fix i18n bug in thread tests
+
+Suggested by Damien Doligez.
+
+Bug: http://caml.inria.fr/mantis/view.php?id=5648
+---
+ testsuite/tests/lib-threads/test1.checker    |    2 +-
+ testsuite/tests/lib-threads/test4.checker    |    2 +-
+ testsuite/tests/lib-threads/test5.checker    |    2 +-
+ testsuite/tests/lib-threads/test6.checker    |    2 +-
+ testsuite/tests/lib-threads/testA.checker    |    2 +-
+ testsuite/tests/lib-threads/testexit.checker |    2 +-
+ 6 files changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/testsuite/tests/lib-threads/test1.checker b/testsuite/tests/lib-threads/test1.checker
+index cbfe7ce..1d10457 100644
+--- a/testsuite/tests/lib-threads/test1.checker
++++ b/testsuite/tests/lib-threads/test1.checker
+@@ -1 +1 @@
+-sort test1.result | diff -q test1.reference -
++LC_ALL=C sort test1.result | diff -q test1.reference -
+diff --git a/testsuite/tests/lib-threads/test4.checker b/testsuite/tests/lib-threads/test4.checker
+index ae27a0d..b8661a9 100644
+--- a/testsuite/tests/lib-threads/test4.checker
++++ b/testsuite/tests/lib-threads/test4.checker
+@@ -1 +1 @@
+-sort -u test4.result | diff -q test4.reference -
++LC_ALL=C sort -u test4.result | diff -q test4.reference -
+diff --git a/testsuite/tests/lib-threads/test5.checker b/testsuite/tests/lib-threads/test5.checker
+index 030fcc9..e991875 100644
+--- a/testsuite/tests/lib-threads/test5.checker
++++ b/testsuite/tests/lib-threads/test5.checker
+@@ -1 +1 @@
+-sort -u test5.result | diff -q test5.reference -
++LC_ALL=C sort -u test5.result | diff -q test5.reference -
+diff --git a/testsuite/tests/lib-threads/test6.checker b/testsuite/tests/lib-threads/test6.checker
+index 40ab24f..d2e9930 100644
+--- a/testsuite/tests/lib-threads/test6.checker
++++ b/testsuite/tests/lib-threads/test6.checker
+@@ -1 +1 @@
+-sort -u test6.result | diff -q test6.reference -
++LC_ALL=C sort -u test6.result | diff -q test6.reference -
+diff --git a/testsuite/tests/lib-threads/testA.checker b/testsuite/tests/lib-threads/testA.checker
+index 4c30940..9f5d00a 100644
+--- a/testsuite/tests/lib-threads/testA.checker
++++ b/testsuite/tests/lib-threads/testA.checker
+@@ -1 +1 @@
+-sort testA.result | diff -q testA.reference -
++LC_ALL=C sort testA.result | diff -q testA.reference -
+diff --git a/testsuite/tests/lib-threads/testexit.checker b/testsuite/tests/lib-threads/testexit.checker
+index 5834e5d..c1182d6 100644
+--- a/testsuite/tests/lib-threads/testexit.checker
++++ b/testsuite/tests/lib-threads/testexit.checker
+@@ -1 +1 @@
+-sort testexit.result | diff -q testexit.reference -
++LC_ALL=C sort testexit.result | diff -q testexit.reference -
+-- 
diff --git a/debian/patches/series b/debian/patches/series
index 15eabd4..5cbc5c1 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -13,3 +13,4 @@
 0013-Fix-testsuite-on-bytecode-architectures.patch
 0014-ocamlopt-fix-on-powerpc.patch
 0015-Move-power.o-rule-in-asmcomp-test-after-definition-o.patch
+0016-Fix-i18n-bug-in-thread-tests.patch

-- 
OCaml packaging