[Pkg-ocaml-maint-commits] [SCM] mlpost packaging branch, master, updated. upstream/0.5-14-g0cd7568
Stephane Glondu
steph at glondu.net
Sun Feb 8 12:43:53 UTC 2009
The following commit has been merged in the master branch:
commit 00e87fab16d5912c75ca61cb7dcaa619c36e5a2e
Author: Stephane Glondu <steph at glondu.net>
Date: Sun Feb 8 12:06:20 2009 +0100
Remove obsolete patches
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
deleted file mode 100644
index f857ce7..0000000
--- a/debian/patches/0001-Add-include-for-mlpost-directory-in-ocaml-calls.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-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
-
----
- tool.mll | 4 ++--
- 1 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/tool.mll b/tool.mll
-index c007516..c637b02 100644
---- a/tool.mll
-+++ b/tool.mll
-@@ -163,9 +163,9 @@ rule scan = parse
- Sys.remove mlf2
- end else
- if !native then
-- ocamlopt [|"mlpost.cmxa"; !ccopt; mlf; !execopt|]
-+ ocamlopt [|"-I"; "+mlpost"; "mlpost.cmxa"; !ccopt; mlf; !execopt|]
- else
-- ocaml [|"mlpost.cma"; !ccopt; mlf; !execopt|];
-+ ocaml [|"-I"; "+mlpost"; "mlpost.cma"; !ccopt; mlf; !execopt|];
-
- Sys.remove mlf;
- if !xpdf then begin
---
-1.5.6.5
-
diff --git a/debian/patches/0002-Fix-Makefile.in.patch b/debian/patches/0002-Fix-Makefile.in.patch
deleted file mode 100644
index 5cbd4c1..0000000
--- a/debian/patches/0002-Fix-Makefile.in.patch
+++ /dev/null
@@ -1,85 +0,0 @@
-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
-
----
- Makefile.in | 15 ---------------
- 1 files changed, 0 insertions(+), 15 deletions(-)
-
-diff --git a/Makefile.in b/Makefile.in
-index 1b9cf10..9979572 100644
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -106,51 +106,39 @@ tool.opt: $(TOOLCMX)
- tests: $(CMXA) tests.ml
- $(OCAMLOPT) -o tests.exe $(CMXA) tests.ml
- ./tests.exe
-- make -C test tests
- gv test/tests.ps
-
- testbox: $(CMXA) testbox.ml
- $(OCAMLOPT) -o testbox.exe $(CMXA) testbox.ml
- ./testbox.exe
-- make -C test testbox
- gv test/testbox.ps
-
- tests.pdf: $(CMXA) tests.ml
- $(OCAMLOPT) -o tests.exe $(CMXA) tests.ml
- ./tests.exe
-- make -C test tests.pdf
- xpdf test/tests.pdf
-
-
- tests.byte: $(CMA) tests.ml
- ocaml $(CMA) tests.ml
-- make -C test tests
- gv test/tests.ps
-
- handbook: $(CMXA) handbookgraphs.ml
- $(OCAMLOPT) -o handbook.exe $(CMXA) handbookgraphs.ml
- ./handbook.exe
-- make -C test manual
-- make -C test/manual mpost
- gv test/testmanual.ps
-
- handbook.byte: $(CMA) handbookgraphs.ml
- ocaml $(CMA) handbookgraphs.ml
-- make -C test manual
-- make -C test/manual mpost
- gv test/testmanual.ps
-
- other: $(CMXA) othergraphs.ml
- $(OCAMLOPT) -o othergraphs.exe $(CMXA) othergraphs.ml
- ./othergraphs.exe
-- make -C test other
-- make -C test/othergraphs mpost
- gv test/othergraphs.ps
-
- other.byte: $(CMA) othergraphs.ml
- ocaml $(CMA) othergraphs.ml
-- make -C test other
-- make -C test/othergraphs mpost
- gv test/othergraphs.ps
-
- .PHONY: check-examples
-@@ -232,7 +220,6 @@ export-doc:
- ocamldoc -html -hide Mlpost -d $(WWW)/doc mlpost.mli
-
- export-www: www/version.prehtml
-- make -C www
-
- www/version.prehtml: Makefile
- echo "<#def version>$(VERSION)</#def>" > www/version.prehtml
-@@ -322,8 +309,6 @@ clean::
- rm -f $(GENERATED) parser.output
- rm -f $(NAME).cma $(NAME).cmxa $(NAME).a
- rm -f *.aux *.log $(NAME).tex $(NAME).dvi $(NAME).ps
-- make -C test clean
-- make -C www clean
- rm -f *.opt test.dvi test.ps *.exe
-
- dist-clean distclean:: clean
---
-1.5.6.5
-
diff --git a/debian/patches/0003-Make-the-examples-work-with-Debian.patch b/debian/patches/0003-Make-the-examples-work-with-Debian.patch
deleted file mode 100644
index 0b7c8ee..0000000
--- a/debian/patches/0003-Make-the-examples-work-with-Debian.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-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
deleted file mode 100644
index d9d4458..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1,3 +0,0 @@
-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
More information about the Pkg-ocaml-maint-commits
mailing list