[Pkg-ocaml-maint-commits] [SCM] ocaml-melt packaging branch, master, updated. debian/1.3.0-2-9-g959b23f
Stephane Glondu
steph at glondu.net
Sat Nov 19 12:52:32 UTC 2011
The following commit has been merged in the master branch:
commit 73acf5ede7f2798eb6eeddf0fd5d5cb15894dc58
Author: Stephane Glondu <steph at glondu.net>
Date: Sat Nov 19 13:05:28 2011 +0100
Remove all patches (merged upstream)
diff --git a/debian/patches/0001-usr-bin-melt-meltbuild.patch b/debian/patches/0001-usr-bin-melt-meltbuild.patch
deleted file mode 100644
index c1d74a4..0000000
--- a/debian/patches/0001-usr-bin-melt-meltbuild.patch
+++ /dev/null
@@ -1,299 +0,0 @@
-From: Stephane Glondu <steph at glondu.net>
-Date: Mon, 18 Oct 2010 13:47:57 +0200
-Subject: [PATCH] /usr/bin/{melt => meltbuild}
-
-To avoid conflict with the /usr/bin/melt executable installed by melt
-Debian package.
-
-Signed-off-by: Stephane Glondu <steph at glondu.net>
----
- install.ml | 4 +-
- man/melt.1 | 124 -------------------------------------------------------
- man/meltbuild.1 | 124 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
- 3 files changed, 126 insertions(+), 126 deletions(-)
- delete mode 100644 man/melt.1
- create mode 100644 man/meltbuild.1
-
-diff --git a/install.ml b/install.ml
-index 850ecc1..218e5dd 100644
---- a/install.ml
-+++ b/install.ml
-@@ -226,7 +226,7 @@ let do_meta () =
-
- let () =
- do_bin ["meltpp/main.native"; "meltpp/main.byte"] "meltpp";
-- do_bin ["melt/tool.native"; "melt/tool.byte"] "melt";
-+ do_bin ["melt/tool.native"; "melt/tool.byte"] "meltbuild";
- do_bin ["latop/latop.native"; "latop/latop.byte"] "latop";
- List.iter do_lib [
- "latex/latex.a";
-@@ -240,7 +240,7 @@ let () =
- "meltpp/meltpp_plugin.cmi"
- ];
- do_meta ();
-- do_man "man/melt.1" "melt.1";
-+ do_man "man/meltbuild.1" "meltbuild.1";
- do_man "man/meltpp.1" "meltpp.1";
- do_man "man/latop.1" "latop.1";
- if !uninstall then rm_dir !lib;
-diff --git a/man/melt.1 b/man/melt.1
-deleted file mode 100644
-index a1e794c..0000000
---- a/man/melt.1
-+++ /dev/null
-@@ -1,124 +0,0 @@
--.\" Hey, EMACS: -*- nroff -*-
--.TH MELT 1 "September 2010"
--.\" Please adjust this date whenever revising the manpage.
--.SH NAME
--melt \- compiles Melt sources into DVI, PostScript or PDF files
--.SH SYNOPSIS
--.B melt
--.RI [OPTIONS] " " [OTHER_FILES] " MAIN_FILE"
--.SH DESCRIPTION
--.PP
--\fBmelt\fP compiles Melt sources (.mlt files) into DVI, PostScript (.ps) or PDF files. It first calls the Melt preprocessor
--.BR meltpp.
--It then calls the OCaml compiler, either directly or through Ocamlbuild or Mlpost. The program is linked with the Melt and Latex libraries. The program is then executed, producing .tex files. Then
--.BR latex
--or
--.BR pdflatex
--is called to produce the document.
--
--The MAIN_FILE is the main file of your document. It is the one which will be compiled, executed, and whose produced .tex file will be compiled. OTHER_FILES will be copied into the _melt directory. They are additional files needed to compile your document, such as modules, class styles or included figures.
--
--If one OTHER_FILE has extension .mlt, it will also be pre-processed. Typically, a .mlt file has two usages. The first one is to define values usable by the main .mlt file. The second one is to call the emit function to produce .tex files that can be included in your main .tex file. This is especially useful if your main .tex file is not written in Melt.
--
--Note that if you want an OTHER_FILE to be compiled and executed, you have to use it in the MAIN_FILE so that Ocamlbuild links it. If you do not use Ocamlbuild, multi-modules documents are not supported.
--.SH OPTIONS
--.TP
--.B \-meltpp <binary>
--Specify the location and name of the Melt pre-processor binary.
--.TP
--.B \-latop <binary>
--Specify the location and name of the Latop binary.
--.TP
--.B \-mlpost <binary>
--Specify the location and name of the Mlpost wrapper binary.
--.TP
--.B \-mlpost-no-prelude
--Do not pass a \-latex option to the Mlpost wrapper. By default, the .tex file produced by your Melt document is given to Mlpost so it can compute a prelude to be used when compiling images. This option disables this behavior.
--
--The prelude is the contents of the .tex file before the document environment begins.
--.TP
--.B \-latex <binary>
--Specify the latex command to use.
--.TP
--.B \-P <path>
--Specify the location of pre-processor plugins. This option is passed to the Melt pre-processor.
--.TP
--.B \-I <path>
--Look for additional OCaml libraries in the given directory. This option is passed to the OCaml compiler.
--.TP
--.B \-L <path>
--Add a link to the path in the _melt directory. Useful if you don't want to copy the contents of the directory.
--.TP
--.B \-classic-display
--Give the \-classic\-display option to Ocamlbuild. Useful if your terminal does not handle the Ocamlbuild animation or if you want to keep a trace of the sequence of commands which are called. Has no effect if it is Mlpost that calls Ocamlbuild.
--.TP
--.B \-no-mlpost
--Do not use the Mlpost wrapper, call Ocamlbuild directly instead (or the OCaml compiler if \-no\-ocamlbuild is given too). Unspecified if your document produces Mlpost images.
--.TP
--.B \-no-ocamlbuild
--Do not use Ocamlbuild to compile your program. The OCaml compiler will be called directly. Usually only makes sense if your source code is made of only one file, and if you are using an OCaml version older than 3.10.2.
--.TP
--.B \-no-final
--Do not produce the final document, i.e. do not call latex. The MAIN_FILE will still be compiled and executed.
--.TP
--.B \-no-link
--By default, a symbolic link to the produced DVI, PS or PDF document is created in the current directory. This option disables this behavior.
--.TP
--.B \-byte
--Compile the program to bytecode instead of native code. Usually, this is actually faster: the program runs slower but is much faster to compile in bytecode. This may become the default in a future version.
--.TP
--.B \-dvi
--Produce a DVI instead of a PS file.
--.TP
--.B \-ps
--Produce a PS file. This is the default behavior.
--.TP
--.B \-pdf
--Produce a PDF instead of a PS file.
--.TP
--.B \-ps2pdf
--Produce a PS file, then convert it to PDF using ps2pdf. Useful if pdflatex won't compile your document.
--.TP
--.B \-cairo
--Use the Cairo backend of Mlpost, instead of Metapost. Implies \-pdf.
--.TP
--.B \-mps
--Use the native MPS backend of Mlpost, instead of Metapost. Implies \-pdf.
--.TP
--.B \-quiet, \-q
--Be quiet. Less messages will be printed on the terminal, if any.
--.TP
--.B \-continue
--Continue on errors.
--.TP
--.B \-fake, \-n
--Do not actually execute commands. Useful if you want to know what the Melt tool would execute to compile your document.
--.TP
--.B \-melt-dir <path>
--Change the name used for the _melt directory.
--.TP
--.B \-clean
--Remove the _melt directory and, if not \-no\-link, all symbolic links of the current directory linking into _melt. Cleaning is done before anything else.
--.TP
--.B \-version
--Print the version number of Melt.
--.TP
--.B \-\-
--Pass the remaining arguments to the generated program.
--.TP
--.B \-help, \-\-help
--Display the list of options
--.SH SEE ALSO
--.BR meltpp (1),
--.BR latop (1),
--.BR mlpost (1),
--.BR ocamlc (1),
--.BR ocamlbuild (1),
--.BR latex (1),
--.BR pdflatex (1).
--.br
--.SH AUTHOR
--Melt was written by Romain Bardou. Contributors include Vincent Aravantinos, Francois Bobot, Pierre Chambart and Arnaud Spiwack.
--.PP
--This manual page was written by Romain Bardou (but may be used by others).
--
-diff --git a/man/meltbuild.1 b/man/meltbuild.1
-new file mode 100644
-index 0000000..83a2a35
---- /dev/null
-+++ b/man/meltbuild.1
-@@ -0,0 +1,124 @@
-+.\" Hey, EMACS: -*- nroff -*-
-+.TH MELTBUILD 1 "September 2010"
-+.\" Please adjust this date whenever revising the manpage.
-+.SH NAME
-+melt \- compiles Melt sources into DVI, PostScript or PDF files
-+.SH SYNOPSIS
-+.B meltbuild
-+.RI [OPTIONS] " " [OTHER_FILES] " MAIN_FILE"
-+.SH DESCRIPTION
-+.PP
-+\fBmeltbuild\fP compiles Melt sources (.mlt files) into DVI, PostScript (.ps) or PDF files. It first calls the Melt preprocessor
-+.BR meltpp.
-+It then calls the OCaml compiler, either directly or through Ocamlbuild or Mlpost. The program is linked with the Melt and Latex libraries. The program is then executed, producing .tex files. Then
-+.BR latex
-+or
-+.BR pdflatex
-+is called to produce the document.
-+
-+The MAIN_FILE is the main file of your document. It is the one which will be compiled, executed, and whose produced .tex file will be compiled. OTHER_FILES will be copied into the _melt directory. They are additional files needed to compile your document, such as modules, class styles or included figures.
-+
-+If one OTHER_FILE has extension .mlt, it will also be pre-processed. Typically, a .mlt file has two usages. The first one is to define values usable by the main .mlt file. The second one is to call the emit function to produce .tex files that can be included in your main .tex file. This is especially useful if your main .tex file is not written in Melt.
-+
-+Note that if you want an OTHER_FILE to be compiled and executed, you have to use it in the MAIN_FILE so that Ocamlbuild links it. If you do not use Ocamlbuild, multi-modules documents are not supported.
-+.SH OPTIONS
-+.TP
-+.B \-meltpp <binary>
-+Specify the location and name of the Melt pre-processor binary.
-+.TP
-+.B \-latop <binary>
-+Specify the location and name of the Latop binary.
-+.TP
-+.B \-mlpost <binary>
-+Specify the location and name of the Mlpost wrapper binary.
-+.TP
-+.B \-mlpost-no-prelude
-+Do not pass a \-latex option to the Mlpost wrapper. By default, the .tex file produced by your Melt document is given to Mlpost so it can compute a prelude to be used when compiling images. This option disables this behavior.
-+
-+The prelude is the contents of the .tex file before the document environment begins.
-+.TP
-+.B \-latex <binary>
-+Specify the latex command to use.
-+.TP
-+.B \-P <path>
-+Specify the location of pre-processor plugins. This option is passed to the Melt pre-processor.
-+.TP
-+.B \-I <path>
-+Look for additional OCaml libraries in the given directory. This option is passed to the OCaml compiler.
-+.TP
-+.B \-L <path>
-+Add a link to the path in the _melt directory. Useful if you don't want to copy the contents of the directory.
-+.TP
-+.B \-classic-display
-+Give the \-classic\-display option to Ocamlbuild. Useful if your terminal does not handle the Ocamlbuild animation or if you want to keep a trace of the sequence of commands which are called. Has no effect if it is Mlpost that calls Ocamlbuild.
-+.TP
-+.B \-no-mlpost
-+Do not use the Mlpost wrapper, call Ocamlbuild directly instead (or the OCaml compiler if \-no\-ocamlbuild is given too). Unspecified if your document produces Mlpost images.
-+.TP
-+.B \-no-ocamlbuild
-+Do not use Ocamlbuild to compile your program. The OCaml compiler will be called directly. Usually only makes sense if your source code is made of only one file, and if you are using an OCaml version older than 3.10.2.
-+.TP
-+.B \-no-final
-+Do not produce the final document, i.e. do not call latex. The MAIN_FILE will still be compiled and executed.
-+.TP
-+.B \-no-link
-+By default, a symbolic link to the produced DVI, PS or PDF document is created in the current directory. This option disables this behavior.
-+.TP
-+.B \-byte
-+Compile the program to bytecode instead of native code. Usually, this is actually faster: the program runs slower but is much faster to compile in bytecode. This may become the default in a future version.
-+.TP
-+.B \-dvi
-+Produce a DVI instead of a PS file.
-+.TP
-+.B \-ps
-+Produce a PS file. This is the default behavior.
-+.TP
-+.B \-pdf
-+Produce a PDF instead of a PS file.
-+.TP
-+.B \-ps2pdf
-+Produce a PS file, then convert it to PDF using ps2pdf. Useful if pdflatex won't compile your document.
-+.TP
-+.B \-cairo
-+Use the Cairo backend of Mlpost, instead of Metapost. Implies \-pdf.
-+.TP
-+.B \-mps
-+Use the native MPS backend of Mlpost, instead of Metapost. Implies \-pdf.
-+.TP
-+.B \-quiet, \-q
-+Be quiet. Less messages will be printed on the terminal, if any.
-+.TP
-+.B \-continue
-+Continue on errors.
-+.TP
-+.B \-fake, \-n
-+Do not actually execute commands. Useful if you want to know what the Melt tool would execute to compile your document.
-+.TP
-+.B \-melt-dir <path>
-+Change the name used for the _melt directory.
-+.TP
-+.B \-clean
-+Remove the _melt directory and, if not \-no\-link, all symbolic links of the current directory linking into _melt. Cleaning is done before anything else.
-+.TP
-+.B \-version
-+Print the version number of Melt.
-+.TP
-+.B \-\-
-+Pass the remaining arguments to the generated program.
-+.TP
-+.B \-help, \-\-help
-+Display the list of options
-+.SH SEE ALSO
-+.BR meltpp (1),
-+.BR latop (1),
-+.BR mlpost (1),
-+.BR ocamlc (1),
-+.BR ocamlbuild (1),
-+.BR latex (1),
-+.BR pdflatex (1).
-+.br
-+.SH AUTHOR
-+Melt was written by Romain Bardou. Contributors include Vincent Aravantinos, Francois Bobot, Pierre Chambart and Arnaud Spiwack.
-+.PP
-+This manual page was written by Romain Bardou (but may be used by others).
-+
---
diff --git a/debian/patches/0002-Remove-temporary-files-in-melt-tool-as-well.patch b/debian/patches/0002-Remove-temporary-files-in-melt-tool-as-well.patch
deleted file mode 100644
index bb84c6f..0000000
--- a/debian/patches/0002-Remove-temporary-files-in-melt-tool-as-well.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-From: Stephane Glondu <steph at glondu.net>
-Date: Mon, 18 Oct 2010 14:11:29 +0200
-Subject: [PATCH] Remove temporary files in melt tool as well
-
-This is done by updating the piece of code copied from totoconf.ml in
-melt/tool.ml...
-
-Signed-off-by: Stephane Glondu <steph at glondu.net>
----
- melt/tool.ml | 26 ++++++++++++++++++++------
- 1 files changed, 20 insertions(+), 6 deletions(-)
-
-diff --git a/melt/tool.ml b/melt/tool.ml
-index c06593a..e6c223b 100644
---- a/melt/tool.ml
-+++ b/melt/tool.ml
-@@ -33,15 +33,29 @@ open Printf
- (* From Totoconf *)
- exception Exec_error of int
-
-+let try_finally f g =
-+ let result =
-+ try
-+ f ();
-+ with exn ->
-+ g ();
-+ raise exn
-+ in
-+ (g (): unit);
-+ result
-+
- let exec_line cmd args =
- let c = String.concat " " (cmd::args) in
- let tmp = Filename.temp_file "configure_exec_line" ".out" in
-- try
-- match Sys.command (c ^ " > " ^ tmp) with
-- | 0 -> input_line (open_in tmp)
-- | n -> raise (Exec_error n)
-- with End_of_file ->
-- ""
-+ try_finally
-+ (fun () ->
-+ try
-+ match Sys.command (c ^ " > " ^ tmp) with
-+ | 0 -> input_line (open_in tmp)
-+ | n -> raise (Exec_error n)
-+ with End_of_file ->
-+ "")
-+ (fun () -> Sys.remove tmp)
- (* *)
-
- let files = Queue.create ()
---
diff --git a/debian/patches/0003-Support-for-bytecode-architectures.patch b/debian/patches/0003-Support-for-bytecode-architectures.patch
deleted file mode 100644
index fe84c41..0000000
--- a/debian/patches/0003-Support-for-bytecode-architectures.patch
+++ /dev/null
@@ -1,100 +0,0 @@
-From: Stephane Glondu <steph at glondu.net>
-Date: Sun, 13 Feb 2011 17:13:26 +0100
-Subject: [PATCH] Support for bytecode architectures
-
- * Fix also detection of native dynlink.
- * In meltbuild, compile to bytecode by default, and provide -native
- option instead of -byte.
-
-Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=613058
-Signed-off-by: Stephane Glondu <steph at glondu.net>
----
- Makefile | 7 +++++++
- configure.ml | 4 +---
- man/meltbuild.1 | 4 ++--
- melt/tool.ml | 4 ++--
- 4 files changed, 12 insertions(+), 7 deletions(-)
-
-diff --git a/Makefile b/Makefile
-index 9bc24af..99ef55e 100644
---- a/Makefile
-+++ b/Makefile
-@@ -37,12 +37,19 @@ ifeq ($(TERM), dumb)
- OB := $(OBCLASSIC)
- endif
-
-+HAS_OCAMLOPT := $(shell if which ocamlopt > /dev/null; then echo yes; else echo no; fi)
-+NATDYNLINK := $(shell if [ -f `ocamlc -where`/dynlink.cmxa ]; then echo YES; else echo NO; fi)
-+
- #################################################################################
- BYTE = latex/latex.cma melt/melt.cma melt/tool.byte latop/latop.byte meltpp/main.byte
-+ifeq ($(HAS_OCAMLOPT),yes)
- NATIVE := latex/latex.cmxa melt/melt.cmxa melt/tool.native latop/latop.native
- ifeq ($(NATDYNLINK), YES)
- NATIVE := $(NATIVE) meltpp/main.native
- endif
-+else
-+NATIVE :=
-+endif
- DOC = latex/latex.docdir/index.html melt/melt.docdir/index.html
- BENCHPLUGS = bench/plugs/quot.cma
-
-diff --git a/configure.ml b/configure.ml
-index 2fdf6ea..f7df595 100644
---- a/configure.ml
-+++ b/configure.ml
-@@ -73,15 +73,13 @@ compiler version (%s)" s v ocaml_version;
- (String.uppercase name)
- in
-
-- ocaml_var "ocamlopt";
-+ if (try Sys.getenv "HAS_OCAMLOPT" with Not_found -> "no") = "yes" then ocaml_var "ocamlopt";
- ocaml_var "ocamlbuild";
- ocaml_var "ocaml";
- ocaml_var "ocamllex";
- ocaml_var "ocamlyacc";
- ocaml_var "ocamldoc";
-
-- BVar.usimple "NATDYNLINK" (Version.ge ocaml_version "3.11");
--
- let cm_dir pkg cm = SVar.make
- ~guess: (fun s ->
- let l = [
-diff --git a/man/meltbuild.1 b/man/meltbuild.1
-index 83a2a35..da89079 100644
---- a/man/meltbuild.1
-+++ b/man/meltbuild.1
-@@ -64,8 +64,8 @@ Do not produce the final document, i.e. do not call latex. The MAIN_FILE will st
- .B \-no-link
- By default, a symbolic link to the produced DVI, PS or PDF document is created in the current directory. This option disables this behavior.
- .TP
--.B \-byte
--Compile the program to bytecode instead of native code. Usually, this is actually faster: the program runs slower but is much faster to compile in bytecode. This may become the default in a future version.
-+.B \-native
-+Compile the program to native code bytecode instead of bytecode.
- .TP
- .B \-dvi
- Produce a DVI instead of a PS file.
-diff --git a/melt/tool.ml b/melt/tool.ml
-index e6c223b..c2198e3 100644
---- a/melt/tool.ml
-+++ b/melt/tool.ml
-@@ -63,7 +63,7 @@ let main_file = ref ""
-
- let mlpost = ref Melt.compiled_with_mlpost
- let ocamlbuild = ref true
--let native = ref true
-+let native = ref false
- let final = ref true
- let link = ref true
-
-@@ -142,7 +142,7 @@ Melt pre-processor";
- "-no-final", Arg.Clear final, " Do not produce the PS or the PDF";
- "-no-link", Arg.Clear link, " Do not create a symbolic link to the PS or PDF";
-
-- "-byte", Arg.Clear native, " Compile to bytecode instead of native code";
-+ "-native", Arg.Set native, " Compile to native code instead of bytecode";
-
- "-dvi", Arg.Set dvi, " Produce a DVI instead of a PS";
- "-ps", Arg.Clear pdf, " Produce a PS file (this is the default behavior)";
---
diff --git a/debian/patches/series b/debian/patches/series
index 0fe086f..e69de29 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +0,0 @@
-0001-usr-bin-melt-meltbuild.patch
-0002-Remove-temporary-files-in-melt-tool-as-well.patch
-0003-Support-for-bytecode-architectures.patch
--
ocaml-melt packaging
More information about the Pkg-ocaml-maint-commits
mailing list