[Pkg-ocaml-maint-commits] [SCM] OCaml packaging branch, master, updated. debian/3.12.0-4-5-g0e481e0

[Stephane Glondu]

The following commit has been merged in the master branch:
commit bab4fd1e2379316f7c1f0224a114b4ad6ce2172f
Author: Stephane Glondu <steph at glondu.net>
Date:   Thu Apr 21 18:50:57 2011 +0200

    Reorder patches (non-upstreamable patch last)

diff --git a/debian/patches/0009-Natdynlink-works-on-powerpc-and-hurd-i386.patch b/debian/patches/0008-Natdynlink-works-on-powerpc-and-hurd-i386.patch
similarity index 100%
rename from debian/patches/0009-Natdynlink-works-on-powerpc-and-hurd-i386.patch
rename to debian/patches/0008-Natdynlink-works-on-powerpc-and-hurd-i386.patch
diff --git a/debian/patches/0010-Declare-primitive-name-table-as-const-char.patch b/debian/patches/0009-Declare-primitive-name-table-as-const-char.patch
similarity index 100%
rename from debian/patches/0010-Declare-primitive-name-table-as-const-char.patch
rename to debian/patches/0009-Declare-primitive-name-table-as-const-char.patch
diff --git a/debian/patches/0011-Avoid-multiple-declarations-in-generated-.c-files-in.patch b/debian/patches/0010-Avoid-multiple-declarations-in-generated-.c-files-in.patch
similarity index 94%
rename from debian/patches/0011-Avoid-multiple-declarations-in-generated-.c-files-in.patch
rename to debian/patches/0010-Avoid-multiple-declarations-in-generated-.c-files-in.patch
index 7c45949..5543fcb 100644
--- a/debian/patches/0011-Avoid-multiple-declarations-in-generated-.c-files-in.patch
+++ b/debian/patches/0010-Avoid-multiple-declarations-in-generated-.c-files-in.patch
@@ -18,7 +18,7 @@ Signed-off-by: Stephane Glondu <steph at glondu.net>
  3 files changed, 21 insertions(+), 6 deletions(-)
 
 diff --git a/bytecomp/bytelink.ml b/bytecomp/bytelink.ml
-index e74a67d..09689be 100644
+index 4a6426d..47903c4 100644
 --- a/bytecomp/bytelink.ml
 +++ b/bytecomp/bytelink.ml
 @@ -400,6 +400,19 @@ let output_cds_file outfile =
@@ -40,7 +40,7 @@ index e74a67d..09689be 100644
 +
  (* Output a bytecode executable as a C file *)
  
- let link_bytecode_as_c tolink outfile with_main =
+ let link_bytecode_as_c tolink outfile =
 @@ -442,7 +455,7 @@ CAMLextern void caml_startup_code(\n\
        (Marshal.to_string sections []);
      output_string outchan "\n};\n\n";
@@ -48,9 +48,9 @@ index e74a67d..09689be 100644
 -    Symtable.output_primitive_table outchan;
 +    Symtable.output_primitive_table outchan mlvalues_primitives;
      (* The entry point *)
-     if with_main then begin
-       output_string outchan "\n\
-@@ -539,7 +552,7 @@ let link objfiles output_name =
+     output_string outchan "\n\
+ void caml_startup(char ** argv)\n\
+@@ -516,7 +529,7 @@ let link objfiles output_name =
          #else\n\
          typedef long value;\n\
          #endif\n";
diff --git a/debian/patches/0008-Embed-bytecode-in-C-object-when-using-custom.patch b/debian/patches/0011-Embed-bytecode-in-C-object-when-using-custom.patch
similarity index 90%
rename from debian/patches/0008-Embed-bytecode-in-C-object-when-using-custom.patch
rename to debian/patches/0011-Embed-bytecode-in-C-object-when-using-custom.patch
index 9286f2c..719fe76 100644
--- a/debian/patches/0008-Embed-bytecode-in-C-object-when-using-custom.patch
+++ b/debian/patches/0011-Embed-bytecode-in-C-object-when-using-custom.patch
@@ -13,10 +13,10 @@ Signed-off-by: Stephane Glondu <steph at glondu.net>
  1 files changed, 28 insertions(+), 5 deletions(-)
 
 diff --git a/bytecomp/bytelink.ml b/bytecomp/bytelink.ml
-index 4a6426d..e74a67d 100644
+index 47903c4..09689be 100644
 --- a/bytecomp/bytelink.ml
 +++ b/bytecomp/bytelink.ml
-@@ -402,7 +402,7 @@ let output_cds_file outfile =
+@@ -415,7 +415,7 @@ let mlvalues_primitives = [
  
  (* Output a bytecode executable as a C file *)
  
@@ -25,9 +25,9 @@ index 4a6426d..e74a67d 100644
    let outchan = open_out outfile in
    begin try
      (* The bytecode *)
-@@ -444,17 +444,30 @@ CAMLextern void caml_startup_code(\n\
+@@ -457,17 +457,30 @@ CAMLextern void caml_startup_code(\n\
      (* The table of primitives *)
-     Symtable.output_primitive_table outchan;
+     Symtable.output_primitive_table outchan mlvalues_primitives;
      (* The entry point *)
 -    output_string outchan "\n\
 +    if with_main then begin
@@ -59,7 +59,7 @@ index 4a6426d..e74a67d 100644
      close_out outchan
    with x ->
      close_out outchan;
-@@ -501,6 +514,16 @@ let link objfiles output_name =
+@@ -514,6 +527,16 @@ let link objfiles output_name =
    Clflags.dllibs := !lib_dllibs @ !Clflags.dllibs; (* put user's DLLs first *)
    if not !Clflags.custom_runtime then
      link_bytecode tolink output_name true
@@ -76,7 +76,7 @@ index 4a6426d..e74a67d 100644
    else if not !Clflags.output_c_object then begin
      let bytecode_name = Filename.temp_file "camlcode" "" in
      let prim_name = Filename.temp_file "camlprim" ".c" in
-@@ -539,7 +562,7 @@ let link objfiles output_name =
+@@ -552,7 +575,7 @@ let link objfiles output_name =
      if Sys.file_exists c_file then raise(Error(File_exists c_file));
      let temps = ref [] in
      try
diff --git a/debian/patches/series b/debian/patches/series
index 57c6cf8..9205388 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -5,7 +5,7 @@
 0005-Patch-config.sh-for-installation.patch
 0006-Install-ocamlbuild-as-a-link-on-either-.native-or-.b.patch
 0007-Fix-ocamlopt-w.r.t.-binutils-2.21.patch
-0008-Embed-bytecode-in-C-object-when-using-custom.patch
-0009-Natdynlink-works-on-powerpc-and-hurd-i386.patch
-0010-Declare-primitive-name-table-as-const-char.patch
-0011-Avoid-multiple-declarations-in-generated-.c-files-in.patch
+0008-Natdynlink-works-on-powerpc-and-hurd-i386.patch
+0009-Declare-primitive-name-table-as-const-char.patch
+0010-Avoid-multiple-declarations-in-generated-.c-files-in.patch
+0011-Embed-bytecode-in-C-object-when-using-custom.patch

-- 
OCaml packaging