The following commit has been merged in the experimental/master branch:
commit a1814977d637ccb7748eeeebd8b13dcebfa8d32a
Author: Stephane Glondu <st...@glondu.net>
Date:   Sat Jul 21 14:42:47 2012 +0200

    Refresh patches

diff --git a/debian/patches/0001-Pass-no-relax-to-ld-on-alpha.patch 
b/debian/patches/0001-Pass-no-relax-to-ld-on-alpha.patch
index cb52739..f9ef8a2 100644
--- a/debian/patches/0001-Pass-no-relax-to-ld-on-alpha.patch
+++ b/debian/patches/0001-Pass-no-relax-to-ld-on-alpha.patch
@@ -9,7 +9,7 @@ code (bug#338437)
  1 file changed, 3 insertions(+), 1 deletion(-)
 
 diff --git a/configure b/configure
-index 72f4240..cbb6491 100755
+index e08bbce..c95424e 100755
 --- a/configure
 +++ b/configure
 @@ -299,7 +299,8 @@ case "$bytecc,$host" in
@@ -22,7 +22,7 @@ index 72f4240..cbb6491 100755
    cc,mips-*-irix6*)
      # Add -n32 flag to ensure compatibility with native-code compiler
      bytecccompopts="-n32"
-@@ -733,6 +734,7 @@ case "$arch,$nativecc,$system,$host_type" in
+@@ -734,6 +735,7 @@ case "$arch,$nativecc,$system,$host_type" in
                         nativecccompopts="$gcc_warnings -DSHRINKED_GNUC";;
    *,*,rhapsody,*)      nativecccompopts="$gcc_warnings -DDARWIN_VERSION_6 
$dl_defs"
                         if $arch64; then partialld="ld -r -arch ppc64"; fi;;
diff --git a/debian/patches/0002-Call-ld-with-proper-flags.patch 
b/debian/patches/0002-Call-ld-with-proper-flags.patch
index 3444c14..90cae41 100644
--- a/debian/patches/0002-Call-ld-with-proper-flags.patch
+++ b/debian/patches/0002-Call-ld-with-proper-flags.patch
@@ -10,10 +10,10 @@ gcc.
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/configure b/configure
-index cbb6491..afca5b0 100755
+index c95424e..20f7977 100755
 --- a/configure
 +++ b/configure
-@@ -1615,7 +1615,7 @@ echo "DEBUGGER=$debugger" >> Makefile
+@@ -1619,7 +1619,7 @@ echo "DEBUGGER=$debugger" >> Makefile
  echo "CC_PROFILE=$cc_profile" >> Makefile
  echo "SYSTHREAD_SUPPORT=$systhread_support" >> Makefile
  echo "PARTIALLD=$partialld" >> Makefile
diff --git a/debian/patches/0003-Don-t-use-rpath.patch 
b/debian/patches/0003-Don-t-use-rpath.patch
index a8c4a57..02855e5 100644
--- a/debian/patches/0003-Don-t-use-rpath.patch
+++ b/debian/patches/0003-Don-t-use-rpath.patch
@@ -7,10 +7,10 @@ Subject: Don't use rpath
  1 file changed, 5 insertions(+)
 
 diff --git a/tools/ocamlmklib.mlp b/tools/ocamlmklib.mlp
-index f114b13..d3f359d 100644
+index b6c236e..b491fdd 100644
 --- a/tools/ocamlmklib.mlp
 +++ b/tools/ocamlmklib.mlp
-@@ -37,6 +37,11 @@ and output_c = ref ""       (* Output name for C part of 
library *)
+@@ -38,6 +38,11 @@ and output_c = ref ""       (* Output name for C part of 
library *)
  and rpath = ref []          (* rpath options *)
  and verbose = ref false
  
diff --git a/debian/patches/0004-Put-manpages-in-section-3o-instead-of-3.patch 
b/debian/patches/0004-Put-manpages-in-section-3o-instead-of-3.patch
index 70896f6..17ede18 100644
--- a/debian/patches/0004-Put-manpages-in-section-3o-instead-of-3.patch
+++ b/debian/patches/0004-Put-manpages-in-section-3o-instead-of-3.patch
@@ -7,10 +7,10 @@ Subject: Put manpages in section 3o instead of 3
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/ocamldoc/Makefile b/ocamldoc/Makefile
-index b9dd690..679973b 100644
+index 74c82d3..1ef43b3 100644
 --- a/ocamldoc/Makefile
 +++ b/ocamldoc/Makefile
-@@ -342,7 +342,7 @@ test_texi: dummy
+@@ -344,7 +344,7 @@ test_texi: dummy
  stdlib_man/Pervasives.3o: $(STDLIB_MLIS)
        $(MKDIR) stdlib_man
        $(OCAMLDOC_RUN) -man -d stdlib_man $(INCLUDES) \
diff --git 
a/debian/patches/0009-Avoid-multiple-declarations-in-generated-.c-files-in.patch
 
b/debian/patches/0007-Avoid-multiple-declarations-in-generated-.c-files-in.patch
similarity index 99%
rename from 
debian/patches/0009-Avoid-multiple-declarations-in-generated-.c-files-in.patch
rename to 
debian/patches/0007-Avoid-multiple-declarations-in-generated-.c-files-in.patch
index df1e5c7..8d857f4 100644
--- 
a/debian/patches/0009-Avoid-multiple-declarations-in-generated-.c-files-in.patch
+++ 
b/debian/patches/0007-Avoid-multiple-declarations-in-generated-.c-files-in.patch
@@ -61,7 +61,7 @@ index f40e425..bb14de6 100644
          #ifdef __cplusplus\n\
          }\n\
 diff --git a/bytecomp/symtable.ml b/bytecomp/symtable.ml
-index 60c884e..08af10f 100644
+index 7ab4bfd..3f4495e 100644
 --- a/bytecomp/symtable.ml
 +++ b/bytecomp/symtable.ml
 @@ -115,15 +115,17 @@ let output_primitive_names outchan =
diff --git 
a/debian/patches/0007-Natdynlink-works-on-powerpc-hurd-i386-and-sparc.patch 
b/debian/patches/0007-Natdynlink-works-on-powerpc-hurd-i386-and-sparc.patch
deleted file mode 100644
index 0487ef2..0000000
--- a/debian/patches/0007-Natdynlink-works-on-powerpc-hurd-i386-and-sparc.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From: Stephane Glondu <st...@glondu.net>
-Date: Thu, 21 Jun 2012 13:35:22 +0200
-Subject: Natdynlink works on powerpc, hurd-i386 and sparc
-
-Rationale: ssreflect used to work with natdynlink there with ocaml
-3.11.2 / coq 8.2...
-
-Note: on my test machine for sparc (64-bit kernel, 32-bit userland),
-$host is sparc64-unknown-linux-gnu.
-
-Bug: http://caml.inria.fr/mantis/view.php?id=5255
-Signed-off-by: Stephane Glondu <st...@glondu.net>
----
- configure |    5 +++--
- 1 file changed, 3 insertions(+), 2 deletions(-)
-
-diff --git a/configure b/configure
-index afca5b0..663eae1 100755
---- a/configure
-+++ b/configure
-@@ -630,6 +630,7 @@ if test $withsharedlibs = "yes"; then
-   case "$host" in
-     *-*-cygwin*)                  natdynlink=true;;
-     i[3456]86-*-linux*)           natdynlink=true;;
-+    i[3456]86-*-gnu*)             natdynlink=true;;
-     x86_64-*-linux*)              natdynlink=true;;
-     i[3456]86-*-darwin[89].*)     natdynlink=true;;
-     i[3456]86-*-darwin*)
-@@ -637,8 +638,8 @@ if test $withsharedlibs = "yes"; then
-         natdynlink=true
-       fi;;
-     x86_64-*-darwin*)             natdynlink=true;;
--    powerpc64-*-linux*)           natdynlink=true;;
--    sparc-*-linux*)               natdynlink=true;;
-+    powerpc*-*-linux*)            natdynlink=true;;
-+    sparc*-*-linux*)              natdynlink=true;;
-     i686-*-kfreebsd*)             natdynlink=true;;
-     x86_64-*-kfreebsd*)           natdynlink=true;;
-     i[345]86-*-freebsd*)          natdynlink=true;;
--- 
diff --git 
a/debian/patches/0008-Declare-primitive-name-table-as-const-char.patch 
b/debian/patches/0008-Declare-primitive-name-table-as-const-char.patch
deleted file mode 100644
index b8afc8f..0000000
--- a/debian/patches/0008-Declare-primitive-name-table-as-const-char.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From: Stephane Glondu <st...@glondu.net>
-Date: Thu, 21 Apr 2011 18:39:57 +0200
-Subject: Declare primitive name table as const char *
-
-This avoids lots of warnings when compiling with g++...
-
-Bug: http://caml.inria.fr/mantis/view.php?id=5131
-Signed-off-by: Stephane Glondu <st...@glondu.net>
----
- bytecomp/symtable.ml |    2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/bytecomp/symtable.ml b/bytecomp/symtable.ml
-index 872a4bb..60c884e 100644
---- a/bytecomp/symtable.ml
-+++ b/bytecomp/symtable.ml
-@@ -126,7 +126,7 @@ let output_primitive_table outchan =
-     fprintf outchan "  %s,\n" prim.(i)
-   done;
-   fprintf outchan "  (primitive) 0 };\n";
--  fprintf outchan "char * caml_names_of_builtin_cprim[] = {\n";
-+  fprintf outchan "const char * caml_names_of_builtin_cprim[] = {\n";
-   for i = 0 to Array.length prim - 1 do
-     fprintf outchan "  \"%s\",\n" prim.(i)
-   done;
--- 
diff --git 
a/debian/patches/0011-Embed-bytecode-in-C-object-when-using-custom.patch 
b/debian/patches/0008-Embed-bytecode-in-C-object-when-using-custom.patch
similarity index 100%
rename from 
debian/patches/0011-Embed-bytecode-in-C-object-when-using-custom.patch
rename to debian/patches/0008-Embed-bytecode-in-C-object-when-using-custom.patch
diff --git 
a/debian/patches/0010-Properly-initialize-executable-name-in-caml_startup_.patch
 
b/debian/patches/0010-Properly-initialize-executable-name-in-caml_startup_.patch
deleted file mode 100644
index 2eee7f7..0000000
--- 
a/debian/patches/0010-Properly-initialize-executable-name-in-caml_startup_.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From: Stephane Glondu <st...@glondu.net>
-Date: Tue, 24 May 2011 12:16:20 +0200
-Subject: Properly initialize executable name in caml_startup_code
-
-Bug: http://caml.inria.fr/mantis/view.php?id=5279
-Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=627756
-Signed-off-by: Stephane Glondu <st...@glondu.net>
----
- byterun/startup.c |   11 ++++++++++-
- 1 file changed, 10 insertions(+), 1 deletion(-)
-
-diff --git a/byterun/startup.c b/byterun/startup.c
-index 5f35e87..6d7d2a6 100644
---- a/byterun/startup.c
-+++ b/byterun/startup.c
-@@ -443,6 +443,10 @@ CAMLexport void caml_startup_code(
- {
-   value res;
-   char* cds_file;
-+  char * exe_name;
-+#ifdef __linux__
-+  static char proc_self_exe[256];
-+#endif
- 
-   caml_init_ieee_floats();
-   caml_init_custom_operations();
-@@ -455,6 +459,11 @@ CAMLexport void caml_startup_code(
-     strcpy(caml_cds_file, cds_file);
-   }
-   parse_camlrunparam();
-+  exe_name = argv[0];
-+#ifdef __linux__
-+  if (caml_executable_name(proc_self_exe, sizeof(proc_self_exe)) == 0)
-+    exe_name = proc_self_exe;
-+#endif
-   caml_external_raise = NULL;
-   /* Initialize the abstract machine */
-   caml_init_gc (minor_heap_init, heap_size_init, heap_chunk_init,
-@@ -489,7 +498,7 @@ CAMLexport void caml_startup_code(
-   caml_section_table_size = section_table_size;
-   /* Initialize system libraries */
-   caml_init_exceptions();
--  caml_sys_init("", argv);
-+  caml_sys_init(exe_name, argv);
-   /* Execute the program */
-   caml_debugger(PROGRAM_START);
-   res = caml_interprete(caml_start_code, caml_code_size);
--- 
diff --git 
a/debian/patches/0012-Fix-symbol-mangling-in-asmcomp-tests-on-i386-and-spa.patch
 
b/debian/patches/0012-Fix-symbol-mangling-in-asmcomp-tests-on-i386-and-spa.patch
deleted file mode 100644
index f975850..0000000
--- 
a/debian/patches/0012-Fix-symbol-mangling-in-asmcomp-tests-on-i386-and-spa.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From: Pino Toscano <p...@debian.org>
-Date: Tue, 27 Mar 2012 11:41:02 +0200
-Subject: Fix symbol mangling in asmcomp tests on *-i386 and sparc
-
-Based on a patch by Pino Toscano <p...@debian.org>.
-
-Bug: http://caml.inria.fr/mantis/view.php?id=5661
-Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=661716
-Signed-off-by: Stephane Glondu <st...@glondu.net>
----
- testsuite/tests/asmcomp/i386.S  |    3 ++-
- testsuite/tests/asmcomp/sparc.S |    2 +-
- 2 files changed, 3 insertions(+), 2 deletions(-)
-
-diff --git a/testsuite/tests/asmcomp/i386.S b/testsuite/tests/asmcomp/i386.S
-index fdda4de..c2510c8 100644
---- a/testsuite/tests/asmcomp/i386.S
-+++ b/testsuite/tests/asmcomp/i386.S
-@@ -15,7 +15,8 @@
- /* Linux with ELF binaries does not prefix identifiers with _.
-    Linux with a.out binaries, FreeBSD, and NextStep do. */
- 
--#ifdef SYS_linux_elf
-+#if defined(SYS_linux_elf) || defined(SYS_bsd_elf) \
-+ || defined(SYS_solaris) || defined(SYS_beos) || defined(SYS_gnu)
- #define G(x) x
- #define FUNCTION_ALIGN 16
- #else
-diff --git a/testsuite/tests/asmcomp/sparc.S b/testsuite/tests/asmcomp/sparc.S
-index 7d17548..aeacaaf 100644
---- a/testsuite/tests/asmcomp/sparc.S
-+++ b/testsuite/tests/asmcomp/sparc.S
-@@ -12,7 +12,7 @@
- 
- /* $Id: sparc.S 11156 2011-07-27 14:17:02Z doligez $ */
- 
--#ifndef SYS_solaris
-+#if defined(SYS_solaris) || defined(SYS_elf)
- #define Call_gen_code _call_gen_code
- #define Caml_c_call _caml_c_call
- #else
--- 
diff --git a/debian/patches/0013-Fix-testsuite-on-bytecode-architectures.patch 
b/debian/patches/0013-Fix-testsuite-on-bytecode-architectures.patch
deleted file mode 100644
index 0a82e30..0000000
--- a/debian/patches/0013-Fix-testsuite-on-bytecode-architectures.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From: Stephane Glondu <st...@glondu.net>
-Date: Wed, 20 Jun 2012 13:50:25 +0200
-Subject: Fix testsuite on bytecode architectures
-
-Bug: http://caml.inria.fr/mantis/view.php?id=5661
-
----
- testsuite/makefiles/Makefile.one     |    3 ++-
- testsuite/tests/lib-scanf-2/Makefile |    3 ++-
- 2 files changed, 4 insertions(+), 2 deletions(-)
-
-diff --git a/testsuite/makefiles/Makefile.one 
b/testsuite/makefiles/Makefile.one
-index 7b25216..edb6ead 100644
---- a/testsuite/makefiles/Makefile.one
-+++ b/testsuite/makefiles/Makefile.one
-@@ -20,7 +20,7 @@ ADD_CFLAGS+=$(CUSTOM_FLAG)
- 
- default: compile run
- 
--compile: $(ML_FILES) $(CMO_FILES) $(CMX_FILES) $(MAIN_MODULE).cmo 
$(MAIN_MODULE).cmx
-+compile: $(ML_FILES) $(CMO_FILES) $(MAIN_MODULE).cmo
-       @for file in $(C_FILES); do \
-         $(NATIVECC) $(NATIVECCCOMPOPTS) -c -I$(TOPDIR)/byterun $$file.c; \
-       done;
-@@ -28,6 +28,7 @@ compile: $(ML_FILES) $(CMO_FILES) $(CMX_FILES) 
$(MAIN_MODULE).cmo $(MAIN_MODULE)
-       @$(OCAMLC) $(ADD_COMPFLAGS) $(ADD_CFLAGS) -o program.byte $(O_FILES) 
$(CMA_FILES) $(CMO_FILES) $(ADD_CMO_FILES) $(MAIN_MODULE).cmo
-       @if [ -z "$(BYTECODE_ONLY)" ]; then \
-         rm -f program.native program.native.exe; \
-+        $(MAKE) $(CMX_FILES) $(MAIN_MODULE).cmx; \
-         $(OCAMLOPT) $(ADD_COMPFLAGS) -o program.native $(O_FILES) 
$(CMXA_FILES) $(CMX_FILES) $(ADD_CMX_FILES) $(MAIN_MODULE).cmx; \
-       fi
- 
-diff --git a/testsuite/tests/lib-scanf-2/Makefile 
b/testsuite/tests/lib-scanf-2/Makefile
-index 216b396..7362fad 100644
---- a/testsuite/tests/lib-scanf-2/Makefile
-+++ b/testsuite/tests/lib-scanf-2/Makefile
-@@ -2,10 +2,11 @@ BASEDIR=../..
- 
- default: compile run
- 
--compile: tscanf2_io.cmo tscanf2_io.cmx
-+compile: tscanf2_io.cmo
-       @$(OCAMLC) unix.cma tscanf2_io.cmo -o master.byte tscanf2_master.ml
-       @$(OCAMLC) tscanf2_io.cmo -o slave.byte tscanf2_slave.ml
-       @if [ -z "$(BYTECODE_ONLY)" ]; then \
-+        $(MAKE) tscanf2_io.cmx; \
-         $(OCAMLOPT) unix.cmxa tscanf2_io.cmx -o master.native 
tscanf2_master.ml; \
-         $(OCAMLOPT) tscanf2_io.cmx -o slave.native tscanf2_slave.ml; \
-       fi
--- 
diff --git a/debian/patches/0014-ocamlopt-fix-on-powerpc.patch 
b/debian/patches/0014-ocamlopt-fix-on-powerpc.patch
deleted file mode 100644
index 212ed94..0000000
--- a/debian/patches/0014-ocamlopt-fix-on-powerpc.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From: Stephane Glondu <st...@glondu.net>
-Date: Wed, 20 Jun 2012 21:58:35 +0200
-Subject: ocamlopt fix on powerpc
-
-Origin: http://caml.inria.fr/cgi-bin/viewvc.cgi?view=revision&revision=12583
----
- asmcomp/power/arch.ml |    2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/asmcomp/power/arch.ml b/asmcomp/power/arch.ml
-index 696073e..239390c 100644
---- a/asmcomp/power/arch.ml
-+++ b/asmcomp/power/arch.ml
-@@ -48,7 +48,7 @@ let size_float = 8
- 
- (* Behavior of division *)
- 
--let division_crashes_on_overflow = false
-+let division_crashes_on_overflow = true
- 
- (* Operations on addressing modes *)
- 
--- 
diff --git 
a/debian/patches/0015-Move-power.o-rule-in-asmcomp-test-after-definition-o.patch
 
b/debian/patches/0015-Move-power.o-rule-in-asmcomp-test-after-definition-o.patch
deleted file mode 100644
index e890864..0000000
--- 
a/debian/patches/0015-Move-power.o-rule-in-asmcomp-test-after-definition-o.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From: Stephane Glondu <st...@glondu.net>
-Date: Wed, 20 Jun 2012 22:00:46 +0200
-Subject: Move power.o rule in asmcomp test after definition of $(SYSTEM)
-
-Bug: http://caml.inria.fr/mantis/view.php?id=5661
-
----
- testsuite/tests/asmcomp/Makefile |    6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/testsuite/tests/asmcomp/Makefile 
b/testsuite/tests/asmcomp/Makefile
-index fb1af49..c4d1aa0 100644
---- a/testsuite/tests/asmcomp/Makefile
-+++ b/testsuite/tests/asmcomp/Makefile
-@@ -141,11 +141,11 @@ clean: defaultclean
-       @rm -f parsecmm.ml parsecmm.mli lexcmm.ml
-       @rm -f $(CASES:=.s)
- 
--power.o: power-$(SYSTEM).o
--      @cp power-$(SYSTEM).o power.o
--
- promote:
- 
- include $(BASEDIR)/makefiles/Makefile.common
- 
-+power.o: power-$(SYSTEM).o
-+      @cp power-$(SYSTEM).o power.o
-+
- arch: $(ARCH).o
--- 
diff --git a/debian/patches/0016-Fix-i18n-bug-in-thread-tests.patch 
b/debian/patches/0016-Fix-i18n-bug-in-thread-tests.patch
deleted file mode 100644
index b8e92ec..0000000
--- a/debian/patches/0016-Fix-i18n-bug-in-thread-tests.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-From: Stephane Glondu <st...@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 5cbc5c1..be80a2c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,13 +4,5 @@
 0004-Put-manpages-in-section-3o-instead-of-3.patch
 0005-Patch-config.sh-for-installation.patch
 0006-Install-ocamlbuild-as-a-link-on-either-.native-or-.b.patch
-0007-Natdynlink-works-on-powerpc-hurd-i386-and-sparc.patch
-0008-Declare-primitive-name-table-as-const-char.patch
-0009-Avoid-multiple-declarations-in-generated-.c-files-in.patch
-0010-Properly-initialize-executable-name-in-caml_startup_.patch
-0011-Embed-bytecode-in-C-object-when-using-custom.patch
-0012-Fix-symbol-mangling-in-asmcomp-tests-on-i386-and-spa.patch
-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
+0007-Avoid-multiple-declarations-in-generated-.c-files-in.patch
+0008-Embed-bytecode-in-C-object-when-using-custom.patch

-- 
OCaml packaging

_______________________________________________
Pkg-ocaml-maint-commits mailing list
Pkg-ocaml-maint-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-ocaml-maint-commits

Reply via email to