Makefile

-VERSION = 1.4.3
+VERSION = 1.4.4
 export VERSION
 
 ifndef PREFIX
@@ -8,7 +8,7 @@ ifndef BINDIR
   BINDIR = $(PREFIX)/bin
 endif
 ifndef OCAMLC
-  OCAMLC = ocamlc -w A
+  OCAMLC = ocamlc
 endif
 ifndef OCAMLOPT
   OCAMLOPT = ocamlopt
@@ -20,24 +20,30 @@ ifndef OCAMLDEP
   OCAMLDEP = ocamldep
 endif
 
+ifeq "$(shell $(OCAMLC) -config |grep os_type)" "os_type: Win32"
+EXE=caml2html.exe
+else
+EXE=caml2html
+endif
+
 MODULES = hashtbl2 version annot tag plugin input output output_latex main
 
 OBJS = $(patsubst %, %.cmo, $(MODULES))
 OBJS-NAT = $(patsubst %, %.cmx, $(MODULES))
 
 .PHONY: default
-default: caml2html test
+default: $(EXE) test
 
 ### GODI targets ###
 .PHONY: all opt install
 all: byte bytelib
-opt: caml2html optlib
+opt: $(EXE) optlib
 install:
-	install -m 0755 caml2html $(BINDIR) || \
-		install -m 0755 caml2html.byte $(BINDIR)/caml2html
+	install -m 0755 $(EXE) $(BINDIR) || \
+		install -m 0755 caml2html.byte $(BINDIR)/$(EXE)
 	test -f caml2html.cma -o -f caml2html.cmxa && $(MAKE) libinstall
 uninstall:
-	rm -f $(BINDIR)/caml2html
+	rm -f $(BINDIR)/$(EXE)
 	$(MAKE) libuninstall || true
 ### end of GODI targets ###
 
@@ -62,27 +68,27 @@ test:
 	ocamlc -i caml2html_test.ml > caml2html_test.mli
 	ocamlc -c caml2html_test.mli
 	ocamlc -c -dtypes caml2html_test.ml
-	./caml2html -o caml2html_test.html \
+	./$(EXE) -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 \
+	./$(EXE) -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 \
+	./$(EXE) -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 \
 		main.ml \
 		-ln
 
-caml2html: $(OBJS-NAT)
-	$(OCAMLOPT) -o caml2html str.cmxa unix.cmxa $(OBJS-NAT)
+$(EXE): $(OBJS-NAT)
+	$(OCAMLOPT) -o $(EXE) str.cmxa unix.cmxa $(OBJS-NAT)
 
 caml2html.byte: $(OBJS)
 	$(OCAMLC) -custom -o caml2html.byte str.cma unix.cma $(OBJS)
@@ -105,7 +111,7 @@ optlib: $(OBJS-NAT) caml2html.cmi caml2html.cmx
 
 # remove everything that we don't want to include into the archive
 tidy:
-	rm -f caml2html caml2html.byte \
+	rm -f $(EXE) caml2html.byte \
 		*.cm[ixoa] *.cmxa *.a *.obj *.o *~ *.annot \
 		*.ml.html caml2html_test.html caml2html_self_test.html \
 		caml2html_self_test.tex
@@ -143,8 +149,8 @@ input.ml: input.mll
 ################ Only for developers
 P = caml2html-$(VERSION)
 
-caml2html.html: caml2html caml2html.html.mlx
-	./caml2html -help > caml2html-help
+caml2html.html: caml2html.byte caml2html.html.mlx
+	./caml2html.byte -help > caml2html-help
 	camlmix -o caml2html.html caml2html.html.mlx
 
 archive: pre opt test caml2html.html

debian/caml2html.doc-base

-Document: caml2html-howto
-Title: How to use caml2html
-Section: Programming/OCaml
-
-Format: HTML
-Index: /usr/share/doc/caml2html/caml2html.html
-Files: /usr/share/doc/caml2html/caml2html.html

debian/caml2html.docs

-caml2html.html
 README.md

debian/changelog

+caml2html (1.4.4-1) unstable; urgency=medium
+
+  * Team upload
+  * New upstream release
+  * Update Homepage and debian/watch
+  * Remove camlp4 and lib{ocamlnet,mikmatch}-ocaml-dev from Build-Depends
+  * Update Vcs-*
+  * Remove Hendrik from Uploaders
+  * Bump Standards-Version to 4.4.0
+  * Bump debhelper compat level to 12
+
+ -- Stéphane Glondu <glondu@debian.org>  Mon, 12 Aug 2019 02:40:09 +0200
+
 caml2html (1.4.3-2) unstable; urgency=medium
 
   * Team upload

debian/compat

-9
+12

debian/control

@@ -2,21 +2,16 @@ Source: caml2html
 Section: ocaml
 Priority: optional
 Maintainer: Debian OCaml Maintainers <debian-ocaml-maint@lists.debian.org>
-Uploaders:
- Hendrik Tews <hendrik@askra.de>
 Build-Depends:
-  debhelper (>= 9),
+  debhelper (>= 12),
   dh-ocaml (>= 0.9~),
   ocaml-nox (>= 3.11.1-3~),
   ocaml-best-compilers,
-  camlp4,
   ocaml-findlib,
   libfindlib-ocaml-dev,
-  libocamlnet-ocaml-dev,
-  libmikmatch-ocaml-dev,
   camlmix
-Standards-Version: 3.9.4
-Homepage: http://mjambon.com/caml2html.html
+Standards-Version: 4.4.0
+Homepage: https://github.com/mjambon/caml2html
 Vcs-Git: https://salsa.debian.org/ocaml-team/caml2html.git
 Vcs-Browser: https://salsa.debian.org/ocaml-team/caml2html
 

debian/copyright

-Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: Caml2html
 Upstream-Contact: Martin Jambon <martin@mjambon.com>
 Source: http://mjambon.com/caml2html.html

debian/patches/0001-fix-html-tags-inside-ocamldoc-comments.patch

-From: Hendrik Tews <hendrik@askra.de>
-Date: Sat, 22 Jul 2017 00:42:15 +0200
-Subject: fix html tags inside ocamldoc comments
-
----
- output.mli | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/output.mli b/output.mli
-index 174fe1c..4771776 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 "&nbsp;" 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$ *)
- 

debian/patches/0002-Fix-FTBFS-with-OCaml-4.05.patch

-From: Stephane Glondu <steph@glondu.net>
-Date: Sat, 22 Jul 2017 00:46:11 +0200
-Subject: Fix FTBFS with OCaml 4.05
-
----
- caml2html_test.ml | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/caml2html_test.ml b/caml2html_test.ml
-index 86db0d7..7aa0ec1 100644
---- a/caml2html_test.ml
-+++ b/caml2html_test.ml
-@@ -39,7 +39,7 @@ struct
-   let n = 0X12 + truncate 1.2E-1_2
-   let the_Truth =
-     let ignore4 a b c d = false in
--    not (ignore4 1._0_None 1.0E10E10)
-+    not (ignore4 1._0_ None 1.0E10 E10)
- end
- 
- let hel'Lo = "\"Hello \

debian/patches/series

-0001-fix-html-tags-inside-ocamldoc-comments.patch
-0002-Fix-FTBFS-with-OCaml-4.05.patch

debian/rules

@@ -26,7 +26,8 @@ else
 	mv caml2html.byte caml2html
 endif
 	./caml2html -help > caml2html-help
-	camlmix -o caml2html.html caml2html.html.mlx
+# needs mikmatch, which needs camlp4, see https://bugs.debian.org/933722
+#	camlmix -o caml2html.html caml2html.html.mlx
 
 
 .PHONY: override_dh_auto_install
@@ -36,6 +37,5 @@ override_dh_auto_install:
 	make install 'BINDIR=$(DESTDIR)/usr/bin'
 
 
-.PHONY: override_dh_install
-override_dh_install:
-	dh_install --fail-missing
+override_dh_missing:
+	dh_missing --fail-missing

debian/watch

 version=3
-http://mjambon.com/releases/caml2html/caml2html-(\d.*)\.(?:tgz|tar\.(?:gz|bz2|xz))
+https://github.com/mjambon/caml2html/releases .*/archive/v(.*)\.tar\.gz