[Pkg-ocaml-maint-commits] [SCM] mlpost packaging branch, master, updated. debian/0.7.4-1-14-g5cc3eb4

[Stephane Glondu]

The following commit has been merged in the master branch:
commit 52376b864637da70c9ac9eaa97a08244a9a39a9f
Author: Stephane Glondu <steph at glondu.net>
Date:   Sat May 22 22:30:25 2010 +0200

    Add 0004-myocamlmacroparser-use-.byte-instead-of-.native.patch

diff --git a/debian/patches/0004-myocamlmacroparser-use-.byte-instead-of-.native.patch b/debian/patches/0004-myocamlmacroparser-use-.byte-instead-of-.native.patch
new file mode 100644
index 0000000..b00352c
--- /dev/null
+++ b/debian/patches/0004-myocamlmacroparser-use-.byte-instead-of-.native.patch
@@ -0,0 +1,32 @@
+From: Stephane Glondu <steph at glondu.net>
+Date: Sat, 22 May 2010 22:29:34 +0200
+Subject: [PATCH] myocamlmacroparser: use .byte instead of .native
+
+Signed-off-by: Stephane Glondu <steph at glondu.net>
+---
+ myocamlbuild.ml.in |    4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/myocamlbuild.ml.in b/myocamlbuild.ml.in
+index e0f659c..f60cfaf 100644
+--- a/myocamlbuild.ml.in
++++ b/myocamlbuild.ml.in
+@@ -47,7 +47,7 @@ let syntaxes () =
+      "bitstring", cmd, cmd in
+   let s = string_flatten (gen_def_string ()) in
+   let compile_cmd = "@CAMLP4O@ Camlp4MacroParser.cmo " ^ s in
+-  let doc_cmd = "./myocamlmacroparser.native " ^ s in
++  let doc_cmd = "./myocamlmacroparser.byte " ^ s in
+   let mymacroparser_entry = "mymacroparser",compile_cmd, doc_cmd in
+   let macro_entry = "macro", compile_cmd, compile_cmd in
+   [ bitstring_entry ; mymacroparser_entry ; macro_entry ]
+@@ -101,7 +101,7 @@ let _ = dispatch begin function
+            Cmd(Sh "rm -rf doc && cp -r mlpost.docdir doc && cp -r img doc"));
+       flag ["ocaml"; "compile"; "use_ocamldoc"] & S[A"-I"; A "+ocamldoc"];
+       dep ["ocaml";"doc"] ["customdoc/img.cmo"];
+-      dep ["ocaml"; "syntax_mymacroparser"] ["myocamlmacroparser.native"];
++      dep ["ocaml"; "syntax_mymacroparser"] ["myocamlmacroparser.byte"];
+       flag ["ocaml";"doc"] &
+         S([A"-hide" ; A "Mlpost"; A"-g"; A "customdoc/img.cmo"]
+             @ (if "@LABLGTK2@" = "yes"
+-- 
diff --git a/debian/patches/series b/debian/patches/series
index 0c18bcd..5bdea51 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 0001-Do-not-remove-ocamlbuild.Makefile.patch
 0002-Create-man-dir-before-installing-into-it.patch
 0003-Fix-hyphen-escapes-in-manpage.patch
+0004-myocamlmacroparser-use-.byte-instead-of-.native.patch

-- 
mlpost packaging