[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 ac5bb8c9edcfd216b0d93c755775406399f5cd09
Author: Stephane Glondu <steph at glondu.net>
Date:   Thu Apr 21 21:26:02 2011 +0200

    Missing semicolon in patch

diff --git a/debian/patches/0011-Embed-bytecode-in-C-object-when-using-custom.patch b/debian/patches/0011-Embed-bytecode-in-C-object-when-using-custom.patch
index 719fe76..e7403f8 100644
--- a/debian/patches/0011-Embed-bytecode-in-C-object-when-using-custom.patch
+++ b/debian/patches/0011-Embed-bytecode-in-C-object-when-using-custom.patch
@@ -9,11 +9,11 @@ Forwarded: not-needed
 Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=256900
 Signed-off-by: Stephane Glondu <steph at glondu.net>
 ---
- bytecomp/bytelink.ml |   33 ++++++++++++++++++++++++++++-----
- 1 files changed, 28 insertions(+), 5 deletions(-)
+ bytecomp/bytelink.ml |   31 +++++++++++++++++++++++++++----
+ 1 files changed, 27 insertions(+), 4 deletions(-)
 
 diff --git a/bytecomp/bytelink.ml b/bytecomp/bytelink.ml
-index 47903c4..09689be 100644
+index 47903c4..184079c 100644
 --- a/bytecomp/bytelink.ml
 +++ b/bytecomp/bytelink.ml
 @@ -415,7 +415,7 @@ let mlvalues_primitives = [
@@ -25,7 +25,7 @@ index 47903c4..09689be 100644
    let outchan = open_out outfile in
    begin try
      (* The bytecode *)
-@@ -457,17 +457,30 @@ CAMLextern void caml_startup_code(\n\
+@@ -457,14 +457,27 @@ CAMLextern void caml_startup_code(\n\
      (* The table of primitives *)
      Symtable.output_primitive_table outchan mlvalues_primitives;
      (* The entry point *)
@@ -54,11 +54,7 @@ index 47903c4..09689be 100644
 +    output_string outchan "\
  #ifdef __cplusplus\n\
  }\n\
--#endif\n";
-+#endif\n"
-     close_out outchan
-   with x ->
-     close_out outchan;
+ #endif\n";
 @@ -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

-- 
OCaml packaging