[Pkg-ocaml-maint-commits] [SCM] caml2html packaging branch, master, updated. debian/1.4.1-3-5-gddffb3e
Hendrik Tews
hendrik at askra.de
Fri May 31 14:26:35 UTC 2013
The following commit has been merged in the master branch:
commit f56afcaa5cf8ef0b6d308dd8327bb471e48b9b40
Author: Hendrik Tews <hendrik at askra.de>
Date: Thu May 30 22:08:33 2013 +0200
unapply patch, update watch
diff --git a/Makefile b/Makefile
index e31f73e..cb88035 100644
--- a/Makefile
+++ b/Makefile
@@ -57,25 +57,24 @@ version.ml: version.ml.mlx Makefile
byte: caml2html.byte
-CAML2HTML=$(word 1,$(wildcard ./caml2html ./caml2html.byte) false)
test:
rm -f caml2html_test.mli
ocamlc -i caml2html_test.ml > caml2html_test.mli
ocamlc -c caml2html_test.mli
ocamlc -c -dtypes caml2html_test.ml
- $(CAML2HTML) -o caml2html_test.html \
+ ./caml2html -o caml2html_test.html \
caml2html_test.mli caml2html_test.ml caml2html_test2.ml \
-ln -ie7 \
-ext date:date \
-ext cat:cat \
-ext "rot13:tr '[a-z]' '[n-za-m]'"
- $(CAML2HTML) -o caml2html_self_test.html \
+ ./caml2html -o caml2html_self_test.html \
tag.ml annot.mli annot.ml plugin.mli plugin.ml \
input.mli input.mll output.mli output.ml \
output_latex.mli output_latex.ml \
main.ml \
-ln
- $(CAML2HTML) -latex -o caml2html_self_test.tex \
+ ./caml2html -latex -o caml2html_self_test.tex \
tag.ml annot.mli annot.ml plugin.mli plugin.ml \
input.mli input.mll output.mli output.ml \
output_latex.mli output_latex.ml \
@@ -86,7 +85,7 @@ caml2html: $(OBJS-NAT)
$(OCAMLOPT) -o caml2html str.cmxa unix.cmxa $(OBJS-NAT)
caml2html.byte: $(OBJS)
- $(OCAMLC) -o caml2html.byte str.cma unix.cma $(OBJS)
+ $(OCAMLC) -custom -o caml2html.byte str.cma unix.cma $(OBJS)
lib: all bytelib optlib
@@ -145,7 +144,7 @@ input.ml: input.mll
P = caml2html-$(VERSION)
caml2html.html: caml2html caml2html.html.mlx
- $(CAML2HTML) -help > caml2html-help
+ ./caml2html -help > caml2html-help
camlmix -o caml2html.html caml2html.html.mlx
archive: pre opt test caml2html.html
diff --git a/caml2html.mli b/caml2html.mli
index 064d785..135e515 100644
--- a/caml2html.mli
+++ b/caml2html.mli
@@ -176,10 +176,10 @@ val ocaml :
Buffer.t ->
Input.token list -> unit
(** [ocaml buf l] formats the list of tokens [l] into some HTML code
- which should be placed in a <code\> or <pre\> region,
+ which should be placed in a <code> or <pre> region,
and adds the result the given buffer [buf].
Option [nbsp] tells if the spaces must be converted into " " or not
- (required in <code\> regions but not in <pre\>; default is false). *)
+ (required in <code> regions but not in <pre>; default is false). *)
val ocamlcode :
?annot:Annot.tag list ->
diff --git a/debian/changelog b/debian/changelog
index 1e5ce33..0d7e8a2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,13 @@
caml2html (1.4.1-4) UNRELEASED; urgency=low
+ [ Sylvain Le Gall ]
* Remove Sylvain Le Gall from uploaders
- -- Sylvain Le Gall <gildor at debian.org> Fri, 21 Sep 2012 01:07:49 +0000
+ [ Hendrik Tews ]
+ * unapply debian-changes patch in master
+ * update watch (thanks to Bart Martens)
+
+ -- Hendrik Tews <hendrik at askra.de> Thu, 30 May 2013 22:08:02 +0200
caml2html (1.4.1-3) unstable; urgency=low
diff --git a/debian/patches/debian-changes-1.4.1-1 b/debian/patches/debian-changes-1.4.1-1
index 8089269..acd0964 100644
--- a/debian/patches/debian-changes-1.4.1-1
+++ b/debian/patches/debian-changes-1.4.1-1
@@ -24,9 +24,9 @@ Forwarded: <no|not-needed|url proving that it has been forwarded>
Reviewed-By: <name and email of someone who approved the patch>
Last-Update: <YYYY-MM-DD>
---- caml2html-1.4.1.orig/Makefile
-+++ caml2html-1.4.1/Makefile
-@@ -57,24 +57,25 @@ version.ml: version.ml.mlx Makefile
+--- a/Makefile
++++ b/Makefile
+@@ -57,24 +57,25 @@
byte: caml2html.byte
@@ -55,7 +55,7 @@ Last-Update: <YYYY-MM-DD>
tag.ml annot.mli annot.ml plugin.mli plugin.ml \
input.mli input.mll output.mli output.ml \
output_latex.mli output_latex.ml \
-@@ -85,7 +86,7 @@ caml2html: $(OBJS-NAT)
+@@ -85,7 +86,7 @@
$(OCAMLOPT) -o caml2html str.cmxa unix.cmxa $(OBJS-NAT)
caml2html.byte: $(OBJS)
@@ -64,7 +64,7 @@ Last-Update: <YYYY-MM-DD>
lib: all bytelib optlib
-@@ -144,7 +145,7 @@ input.ml: input.mll
+@@ -144,7 +145,7 @@
P = caml2html-$(VERSION)
caml2html.html: caml2html caml2html.html.mlx
@@ -73,9 +73,9 @@ Last-Update: <YYYY-MM-DD>
camlmix -o caml2html.html caml2html.html.mlx
archive: pre opt test caml2html.html
---- caml2html-1.4.1.orig/caml2html.mli
-+++ caml2html-1.4.1/caml2html.mli
-@@ -176,10 +176,10 @@ val ocaml :
+--- a/caml2html.mli
++++ b/caml2html.mli
+@@ -176,10 +176,10 @@
Buffer.t ->
Input.token list -> unit
(** [ocaml buf l] formats the list of tokens [l] into some HTML code
@@ -88,9 +88,9 @@ Last-Update: <YYYY-MM-DD>
val ocamlcode :
?annot:Annot.tag list ->
---- caml2html-1.4.1.orig/output.mli
-+++ caml2html-1.4.1/output.mli
-@@ -69,24 +69,24 @@ val ocaml :
+--- a/output.mli
++++ b/output.mli
+@@ -69,24 +69,24 @@
Buffer.t ->
Input.token list -> unit
(** [ocaml buf l] formats the list of tokens [l] into some HTML code
diff --git a/debian/watch b/debian/watch
index 5d803a0..8a2eb38 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,2 +1,2 @@
version=3
-http://martin.jambon.free.fr/caml2html.html caml2html-([\d\.]*)\.tar\.gz
+http://mjambon.com/releases/caml2html/caml2html-(\d.*)\.(?:tgz|tar\.(?:gz|bz2|xz))
diff --git a/output.mli b/output.mli
index 72dbd60..7ee48a0 100644
--- a/output.mli
+++ b/output.mli
@@ -69,24 +69,24 @@ val ocaml :
Buffer.t ->
Input.token list -> unit
(** [ocaml buf l] formats the list of tokens [l] into some HTML code
- which should be placed in a <code\> or <pre\> region,
+ which should be placed in a <code> or <pre> region,
and adds the result the given buffer [buf].
Option [nbsp] tells if the spaces must be converted into " " or not
- (required in <code\> regions but not in <pre\>; default is false). *)
+ (required in <code> regions but not in <pre>; default is false). *)
val ocamlcode :
?annot:Annot.tag list ->
?keyword_colors:(string, string option * string option * string) Hashtbl.t ->
?param:param -> ?tag_open:string -> ?tag_close:string -> string -> string
(** [ocamlcode s1 s2] parses [s1] and formats the result as a HTML string
- enclosed between <code\> and </code\> unless specified otherwise. *)
+ enclosed between <code> and </code> unless specified otherwise. *)
val ocamlpre :
?annot:Annot.tag list ->
?keyword_colors:(string, string option * string option * string) Hashtbl.t ->
?param:param -> ?tag_open:string -> ?tag_close:string -> string -> string
(** [ocamlcode s1 s2] parses [s1] and formats the result as a HTML string
- enclosed between <pre\> and </pre\> unless specified otherwise. *)
+ enclosed between <pre> and </pre> unless specified otherwise. *)
(* $Id: output.mli 12 2010-06-28 18:18:41Z mjambon $ *)
--
caml2html packaging
More information about the Pkg-ocaml-maint-commits
mailing list