[Pkg-ocaml-maint-commits] [SCM] mlpost packaging branch, master, updated. upstream/0.5-3-gd7c7e11

[Stephane Glondu]

The following commit has been merged in the master branch:
commit d7c7e11ca8dd056b725897bfa6651cc9d3f17ad2
Author: Stephane Glondu <steph at glondu.net>
Date:   Tue Feb 3 00:47:25 2009 +0100

    Add a patch to make the examples work with Debian

diff --git a/debian/patches/0001-Add-include-for-mlpost-directory-in-ocaml-calls.patch b/debian/patches/0001-Add-include-for-mlpost-directory-in-ocaml-calls.patch
index 6ca9d00..f857ce7 100644
--- a/debian/patches/0001-Add-include-for-mlpost-directory-in-ocaml-calls.patch
+++ b/debian/patches/0001-Add-include-for-mlpost-directory-in-ocaml-calls.patch
@@ -1,4 +1,4 @@
-From d084884e5d8e0dc67c2aa1e424f1207bcc6a98bf Mon Sep 17 00:00:00 2001
+From f551934882420ae1bfc0996efc2dba460a995849 Mon Sep 17 00:00:00 2001
 From: Stephane Glondu <steph at glondu.net>
 Date: Mon, 2 Feb 2009 23:44:27 +0100
 Subject: [PATCH] Add include for mlpost directory in ocaml calls
diff --git a/debian/patches/0002-Fix-Makefile.in.patch b/debian/patches/0002-Fix-Makefile.in.patch
index 195d226..5cbd4c1 100644
--- a/debian/patches/0002-Fix-Makefile.in.patch
+++ b/debian/patches/0002-Fix-Makefile.in.patch
@@ -1,4 +1,4 @@
-From 47ce71a9fc21178c8a9579f2c323621ca7413e76 Mon Sep 17 00:00:00 2001
+From 8b4b850ada3bbc5982ded52272581d832bcc8d7f Mon Sep 17 00:00:00 2001
 From: Stephane Glondu <steph at glondu.net>
 Date: Mon, 2 Feb 2009 22:37:15 +0100
 Subject: [PATCH] Fix Makefile.in
diff --git a/debian/patches/0003-Make-the-examples-work-with-Debian.patch b/debian/patches/0003-Make-the-examples-work-with-Debian.patch
new file mode 100644
index 0000000..0b7c8ee
--- /dev/null
+++ b/debian/patches/0003-Make-the-examples-work-with-Debian.patch
@@ -0,0 +1,54 @@
+From ae3e3da53b99a98d5ad66a60b9d58cf36ed06e52 Mon Sep 17 00:00:00 2001
+From: Stephane Glondu <steph at glondu.net>
+Date: Tue, 3 Feb 2009 00:43:36 +0100
+Subject: [PATCH] Make the examples work with Debian
+
+---
+ examples/Makefile |    6 ++++--
+ examples/README   |    6 +++++-
+ 2 files changed, 9 insertions(+), 3 deletions(-)
+
+diff --git a/examples/Makefile b/examples/Makefile
+index 3301dd0..6f1d339 100644
+--- a/examples/Makefile
++++ b/examples/Makefile
+@@ -25,7 +25,9 @@ LABELOUTFILES := $(LABELPNGFILES:.png=.1)
+ 
+ HTMLFILES := boxes.ml.html paths.ml.html misc.ml.html tree.ml.html label.ml.html
+ 
+-all: $(HTMLFILES) $(BOXPNGFILES) $(PATHPNGFILES) $(MISCPNGFILES) $(TREEPNGFILES) $(LABELPNGFILES) 
++all: $(BOXPNGFILES) $(PATHPNGFILES) $(MISCPNGFILES) $(TREEPNGFILES) $(LABELPNGFILES) 
++
++html: $(HTMLFILES)
+ 
+ %.ml.html : %.ml parse
+ 	caml2html -hc -ext "parse:./parse" $*.ml
+@@ -48,7 +50,7 @@ $(LABELOUTFILES): label.dummy
+ 
+ 
+ %.dummy: %.ml
+-	../tool.opt -ccopt "-I ../ unix.cma" -v $^
++	mlpost -ccopt "unix.cma" -v $^
+ 	touch $@
+ 
+ parse.ml: parse.mll
+diff --git a/examples/README b/examples/README
+index b10d391..5f7ef9c 100644
+--- a/examples/README
++++ b/examples/README
+@@ -1,7 +1,11 @@
+-* You need the latest version of caml2html:
++* To compile the examples, you need to install tex-chess
++
++* To generate HTML files with examples, you need the latest version of
++  caml2html (not in Debian):
+     svn checkout svn://svn.forge.ocamlcore.org/svnroot/caml2html
+   To compile that, you also need camlmix, either by godi, or
+     http://martin.jambon.free.fr/camlmix/
++  You can then issue `make html'
+ 
+ * using (*html, you can put html into the target file
+ 
+-- 
+1.5.6.5
+
diff --git a/debian/patches/series b/debian/patches/series
index 5dae0d6..d9d4458 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 0001-Add-include-for-mlpost-directory-in-ocaml-calls.patch
 0002-Fix-Makefile.in.patch
+0003-Make-the-examples-work-with-Debian.patch

-- 
mlpost packaging