The following commit has been merged in the master branch:
commit ddffb3ee86a47bccfacae6097af297cd633b58c6
Author: Hendrik Tews <hend...@askra.de>
Date:   Fri May 31 16:16:00 2013 +0200

    update and improve packaging

diff --git a/debian/caml2html.1 b/debian/caml2html.1
index ac86ca2..6131454 100644
--- a/debian/caml2html.1
+++ b/debian/caml2html.1
@@ -1,145 +1,218 @@
-.TH CAML2HTML 1 "November 9, 2010" "Caml2html User Manual"
+.\" groff -man -Tascii caml2html.1
+.\" ==========================================================================
+.\" ============= Synopsis ===================================================
+.\" ==========================================================================
+.TH CAML2HTML 1 "May 2013" CAML2HTML "User Manuals"
 .SH NAME
-.PP
-caml2html - colorizes a set of OCaml source files.
+caml2html \- pretty print OCaml in html and latex
 .SH SYNOPSIS
-.PP
-caml2html [options] file*
+.B caml2html \fR[\fIOptions...\fR] \fIfiles\fR...
+.\" ==========================================================================
+.\" ============= Description ================================================
+.\" ==========================================================================
 .SH DESCRIPTION
-.PP
-Caml2html colorizes a set of OCaml source files (.ml, \&.mli,
-\&.mll, \&.mly, \&...).
-Type annotations will be shown when the mouse pointer passes over
-an expression if the corresponding \&.annot file is available.
-.PP
-To obtain a \&.annot file, compile your OCaml source files with
-\f[B]ocamlc\ -dtypes\f[] or \f[B]ocamlopt\ -dtypes\f[].
+.B caml2html
+pretty prints 
+.B OCaml 
+source code as html or LaTex files. The pretty printing uses
+colors and adds tool\(hytips with type annotations if the
+corresponding .annot file is present.
+.\"
+.\" ==========================================================================
+.P
+Without
+.I file
+arguments,
+.B caml2html
+reads from standard input. By default it writes to standard output.
+.\"
+.\" ==========================================================================
+.\" ================ Options =================================================
+.\" ==========================================================================
+.\"
 .SH OPTIONS
+.\" ===================== -annotfilter =======================================
 .TP
-.B -annotfilter {innermost|outermost}
-choose whether innermost or outermost type annotations should be
-used (default: innermost)
-.RS
-.RE
-.TP
-.B -charset 
-specify charset to use (default: iso\[en]8859\[en]1)
-.RS
-.RE
-.TP
-.B -css
-use CSS named style.css for styling
-.RS
-.RE
-.TP
-.B -cssurl 
-use the given URL as CSS for styling
-.RS
-.RE
-.TP
-.B -inhead
-use default styling and place it in the head section of the
-document (default when applicable)
-.RS
-.RE
-.TP
-.B -inline
-use inline styling (HTML only, default fallback if -inhead is not
-applicable)
-.RS
-.RE
+.B "\-annotfilter {innermost|outermost}"
+choose whether innermost or outermost type annotations
+should be used (default: innermost)
+.\" ===================== -noannot  ==========================================
 .TP
-.B -body
-output only document's body, for inclusion into an existing
-document (see also -make-css and -make-latex-defs)
-.RS
-.RE
+.B "\-noannot"
+do not insert type annotations as read from .annot files (HTML output only)
+.\" ===================== -ln  ===============================================
 .TP
-.B -ln
+.B "\-ln"
 add line number at the beginning of each line
-.RS
-.RE
+.\" ===================== -hc  ===============================================
 .TP
-.B -hc
-comments are treated as raw HTML or LaTeX code (no newlines inside
-of tags)
-.RS
-.RE
+.B "\-hc"
+comments are treated as raw HTML or LaTeX code (no newlines inside of tags)
+.\" ===================== -t  ================================================
 .TP
-.B -t
+.B "\-t"
 add a title to the HTML page
-.RS
-.RE
+.\" ===================== -body  =============================================
 .TP
-.B -nf
-do not add footnotes to the HTML page
-.RS
-.RE
+.B "\-body"
+output only document's body, for inclusion into an 
+existing document (see also \-make\-css and \-make\-latex\-defs)
+.\" ===================== -nf  ===============================================
 .TP
-.B -ie7
+.B "\-nf"
+do not add footnotes to the HTML page
+.\" ===================== -inhead  ===========================================
+.TP
+.B "\-inhead"
+use default styling and place it in the <head> section
+of the document (default when applicable)
+.\" ===================== -charset <charset> =================================
+.TP
+.B "\-charset <charset>"
+specify charset to use (default: iso\-8859\-1)
+.\" ===================== -css  ==============================================
+.TP
+.B "\-css"
+use separate CSS style file
+.I style.css
+.\" ===================== -cssurl <URL> ======================================
+.TP
+.B "\-cssurl <URL>"
+use
+.I URL
+as CSS
+.\" ===================== -inline  ===========================================
+.TP
+.B "\-inline"
+use inline styling (HTML only, default fallback
+if \-inhead is not applicable)
+.\" ===================== \-ie7  ==============================================
+.TP
+.B "\-ie7"
 drop support for type annotations on Internet Explorer 6 and older
-.RS
-.RE
-.TP
-.B -noannot
-do not insert type annotations as read from \&.annot files (HTML
-output only)
-.RS
-.RE
+.\" ===================== -notab  ============================================
 .TP
-.B -notab
+.B "\-notab"
 do not replace tabs by spaces
-.RS
-.RE
+.\" ===================== -tab <integer> =====================================
 .TP
-.B -tab 
+.B "\-tab <integer>"
 replace tab by n spaces (default = 8)
-.RS
-.RE
+.\" ===================== -d <directory> =====================================
 .TP
-.B -d 
+.B "\-d <directory>"
 generate files in directory dir, rather than in current directory
-.RS
-.RE
+.\" ===================== -o <filename> ======================================
 .TP
-.B -o 
+.B "\-o <filename>"
 output file
-.RS
-.RE
+.\" ===================== -make-css <filename> ===============================
 .TP
-.B -v
-print version number to stdout and exit
-.RS
-.RE
-.TP
-.B -make-css 
+.B "\-make\-css <filename>"
 create CSS file with default color definitions and exit
-.RS
-.RE
+.\" ===================== -ext <NAME:CMD> ====================================
 .TP
-.B -ext <NAME:CMD>
+.B "\-ext <NAME:CMD>"
 use the given external command CMD to handle comments that start
-with (*NAME.
-NAME must be a lowercase identifier.
-.RS
-.RE
-.TP
-.B -latex
+with 
+.I (*NAME\fR.
+.I NAME
+must be a lowercase identifier. See 
+.B EXAMPLES
+below.
+.\" ===================== -latex  ============================================
+.TP
+.B "\-latex"
 output LaTeX code instead of HTML.
-.RS
-.RE
+.\" ===================== -make-latex-defs <filename> ========================
 .TP
-.B -make-latex-defs 
-create a file containing the default LaTeX color definitions and
-matching highlighting commands, and exit.
-is not included.
-.RS
-.RE
+.B "\-make\-latex\-defs <filename>"
+create a file containing the default LaTeX color definitions
+and matching highlighting commands, and exit.
+\\usepackage{alltt,color} is not included.
+.\" ===================== -v  ================================================
 .TP
-.B -help|--help
-Display this list of options
-.RS
-.RE
-.SH AUTHORS
-Sylvain Le Gall.
+.B "\-v"
+print version number to stdout and exit
+.\" ===================== -help  Display this list of options ================
+.TP
+.B "\-help | \-\-help"
+Display options and exit.
+.\"
+.\" ==========================================================================
+.\" ================ Examples ================================================
+.\" ==========================================================================
+.\"
+.SH EXAMPLES
+.\"
+Process many files into a single file:
+.P
+.RS
+caml2html \-o result.html *.mli *.ml
+.RE
+.P
+Process many files, and create one HTML page for each file:
+.P
+.RS
+caml2html *.ml
+.RE
+.P
+You can use HTML in the comments of the source file, for
+instance, to insert hyperlinks:
+.P
+.RS
+(* This is file1.ml.
+   <a href="#file2.ml">This is a link to file2.ml</a>. *)
+.RE
+.P
+Note, that one HTML tag cannot span over several lines, and that
+the ordinary characters <, > and & must be written as &lt;, &gt; and
+&amp;.
+.\"
+.\" ==========================================================================
+.P
+.B Custom comment handlers
+To implement an include directive for comments, use 
+.P
+.RS
+caml2html \-ext "include: xargs cat" example.ml
+.RE
+.P
+Then 
+.P
+.RS
+ (*include i.html *)
+ let f x = 2 * x + 1
+.RE
+.P
+produces
+.P
+.RS
+ ... contens of i.html ...
+ let f x = 2 * x + 1
+.RE
+.P
+as result.
+.\"
+.\" ==========================================================================
+.\" ================ SEE ALSO ================================================
+.\" ==========================================================================
+.\"
+.SH SEE ALSO
+.TP
+The \fBcaml2html\fR web page,
+\fIhttp://mjambon.com/caml2html.html\fR
+.TP
+Some more examples are on
+.I /usr/share/doc/caml2html/caml2html.html
+.\"
+.\" ==========================================================================
+.\" ================ Author ==================================================
+.\" ==========================================================================
+.\"
+.SH AUTHOR
+This manual page was written by Sylvain Le Gall
+<gil...@debian.org> and Hendrik Tews <hend...@askra.de>,
+specifically for the Debian project (and may be used by others).
+
 
diff --git a/debian/caml2html.docs b/debian/caml2html.docs
index 810c811..cc4cd56 100644
--- a/debian/caml2html.docs
+++ b/debian/caml2html.docs
@@ -1,2 +1,2 @@
 caml2html.html
-README
+README.md
diff --git a/debian/caml2html.mkd b/debian/caml2html.mkd
index 80e1f36..e8f9c5f 100644
--- a/debian/caml2html.mkd
+++ b/debian/caml2html.mkd
@@ -1,3 +1,5 @@
+% this is the old pandoc source for the man page, it is not used any more
+% compile with pandoc -s -w man $^ -o $@
 % CAML2HTML(1) Caml2html User Manual
 % Sylvain Le Gall 
 % November 9, 2010
diff --git a/debian/changelog b/debian/changelog
index 0d7e8a2..8df0fae 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-caml2html (1.4.1-4) UNRELEASED; urgency=low
+caml2html (1.4.3-1) unstable; urgency=low
 
   [ Sylvain Le Gall ]
   * Remove Sylvain Le Gall from uploaders
@@ -6,8 +6,17 @@ caml2html (1.4.1-4) UNRELEASED; urgency=low
   [ Hendrik Tews ]
   * unapply debian-changes patch in master
   * update watch (thanks to Bart Martens)
-
- -- Hendrik Tews <hend...@askra.de>  Thu, 30 May 2013 22:08:02 +0200
+  * bump debhelper compat and standards version
+  * update homepage
+  * add myself as uploader
+  * update dependencies, change to architecture any and native compilation
+  * update rules, *install files
+  * update copyright
+  * remove dubious debian-changes patch, 
+    save part for ocamldoc fix in new patch fix-ocamldoc-html-tags
+  * improve man page
+
+ -- Hendrik Tews <hend...@askra.de>  Fri, 31 May 2013 16:22:48 +0200
 
 caml2html (1.4.1-3) unstable; urgency=low
 
diff --git a/debian/compat b/debian/compat
index 7f8f011..ec63514 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-7
+9
diff --git a/debian/control b/debian/control
index 0e8cbdd..ec5d0a8 100644
--- a/debian/control
+++ b/debian/control
@@ -2,45 +2,64 @@ Source: caml2html
 Section: ocaml
 Priority: optional
 Maintainer: Debian OCaml Maintainers <debian-ocaml-ma...@lists.debian.org>
+Uploaders:
+ Hendrik Tews <hend...@askra.de>
 Build-Depends:
+  debhelper (>= 9),
+  dh-ocaml (>= 0.9~),
   ocaml-nox (>= 3.11.1-3~),
+  ocaml-best-compilers,
+  camlp4,
   ocaml-findlib,
-  dh-ocaml (>= 0.9~),
-  debhelper (>= 7.0.50~),
+  libfindlib-ocaml-dev,
+  libocamlnet-ocaml-dev,
+  libmikmatch-ocaml-dev,
   camlmix
-Standards-Version: 3.9.2
-Homepage: http://martin.jambon.free.fr/caml2html.html
+Standards-Version: 3.9.4
+Homepage: http://mjambon.com/caml2html.html
 Vcs-Git: git://git.debian.org/git/pkg-ocaml-maint/packages/caml2html.git
 Vcs-Browser: http://git.debian.org/?p=pkg-ocaml-maint/packages/caml2html.git
 
 Package: caml2html
-Architecture: all
-Depends: ${ocaml:Depends}, ${misc:Depends}
-Description: HTML and LaTeX colored syntax from OCaml source files
+Architecture: any
+Depends:
+ ${ocaml:Depends}, 
+ ${shlibs:Depends},
+ ${misc:Depends}
+Description: HTML and LaTeX colored syntax from OCaml source files - executable
  Caml2html provides a command-line executable which converts a set of
  OCaml source files into a HTML or LaTeX document with colored syntax. A
  library is also provided for building web-page generators that would color
  OCaml code appropriately.
+ .
+ This package contains the caml2html executable.
 
 Package: libcaml2html-ocaml-dev
 Architecture: any
-Depends: ${ocaml:Depends}, ${misc:Depends}
+Depends:
+ ${ocaml:Depends}, 
+ ${shlibs:Depends},
+ ${misc:Depends}
 Provides: ${ocaml:Provides}
 Recommends: ocaml-findlib
-Description: HTML and LaTeX colored syntax from OCaml source files
+Description: HTML and LaTeX colored syntax from OCaml source files - dev files
  Caml2html provides a command-line executable which converts a set of
  OCaml source files into a HTML or LaTeX document with colored syntax. A
  library is also provided for building web-page generators that would color
  OCaml code appropriately.
  .
- This package contains the library.
+ This package contains the development files for programming with the
+ library.
 
 Package: libcaml2html-ocaml
 Architecture: any
-Depends: ${ocaml:Depends}, ${misc:Depends}
+Depends:
+ ${ocaml:Depends}, 
+ ${shlibs:Depends},
+ ${misc:Depends}
 Provides: ${ocaml:Provides}
 Recommends: ocaml-findlib
-Description: HTML and LaTeX colored syntax from OCaml source files
+Description: HTML and LaTeX colored syntax from OCaml source files - plugins
  Caml2html provides a command-line executable which converts a set of
  OCaml source files into a HTML or LaTeX document with colored syntax. A
  library is also provided for building web-page generators that would color
diff --git a/debian/copyright b/debian/copyright
index efd95f5..66b4f87 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,16 +1,47 @@
-Format-Specification: 
http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?op=file&rev=135
-Name: caml2html
-Maintainer: Sylvain Le Gall <gil...@debian.org>
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: Caml2html
+Upstream-Contact: Martin Jambon <mar...@mjambon.com> 
+Source: http://mjambon.com/caml2html.html
 
 Files: *
-Copyright: (c) 2004-2010 Martin Jambon
-           (c) 2002-2004 S├ębastien Ailleret
+Copyright: 2004-2010 Martin Jambon
+           2002-2004 S├ębastien Ailleret
 License: GPL-2
-
- See '/usr/share/common-licenses/GPL-2' for the full text.
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+ .
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License for more details.
+ .
+ You should have received a copy of the GNU General Public License along
+ with this program; if not, write to the Free Software Foundation, Inc.,
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ .
+ On Debian systems, the full text of the GNU General Public
+ License version 3 can be found in the file
+ `/usr/share/common-licenses/GPL-2'.
 
 Files: debian/*
-Copyright: (C) 2010 Sylvain Le Gall <gil...@debian.org>
+Copyright: 2010 Sylvain Le Gall <gil...@debian.org>
+           2013 Hendrik Tews <hend...@askra.de>
 License: GPL-3+
-
- See '/usr/share/common-licenses/GPL-3' for the full text.
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or (at
+ your option) any later version.
+ .
+ This program is distributed in the hope that it will be useful, but
+ WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ General Public License for more details.
+ .
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
+ .
+ On Debian systems, the full text of the GNU General Public
+ License version 3 can be found in the file
+ `/usr/share/common-licenses/GPL-3'.
diff --git a/debian/libcaml2html-ocaml-dev.install.in 
b/debian/libcaml2html-ocaml-dev.install.in
index 187edcc..cb62969 100644
--- a/debian/libcaml2html-ocaml-dev.install.in
+++ b/debian/libcaml2html-ocaml-dev.install.in
@@ -1,4 +1,4 @@
-@OCamlStdlibDir@/caml2html/*.mli
-@OCamlStdlibDir@/caml2html/*.cmi
+@OCamlStdlibDir@/caml2html/*.ml*
+@OCamlStdlibDir@/caml2html/*.cm[ix]
 OPT: @OCamlStdlibDir@/caml2html/*.cmxa
 OPT: @OCamlStdlibDir@/caml2html/*.a
diff --git a/debian/patches/debian-changes-1.4.1-1 
b/debian/patches/debian-changes-1.4.1-1
deleted file mode 100644
index acd0964..0000000
--- a/debian/patches/debian-changes-1.4.1-1
+++ /dev/null
@@ -1,121 +0,0 @@
-Description: Upstream changes introduced in version 1.4.1-1
- This patch has been created by dpkg-source during the package build.
- Here's the last changelog entry, hopefully it gives details on why
- those changes were made:
- .
- caml2html (1.4.1-1) unstable; urgency=low
- .
-   * Initial release. (Closes: #605741)
- .
- The person named in the Author field signed this changelog entry.
-Author: Sylvain Le Gall <gil...@debian.org>
-Bug-Debian: http://bugs.debian.org/605741
-
----
-The information above should follow the Patch Tagging Guidelines, please
-checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
-are templates for supplementary fields that you might want to add:
-
-Origin: <vendor|upstream|other>, <url of original patch>
-Bug: <url in upstream bugtracker>
-Bug-Debian: http://bugs.debian.org/<bugnumber>
-Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber>
-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>
-
---- a/Makefile
-+++ b/Makefile
-@@ -57,24 +57,25 @@
- 
- 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 \
-@@ -85,7 +86,7 @@
-       $(OCAMLOPT) -o caml2html str.cmxa unix.cmxa $(OBJS-NAT)
- 
- caml2html.byte: $(OBJS)
--      $(OCAMLC) -custom -o caml2html.byte str.cma unix.cma $(OBJS)
-+      $(OCAMLC) -o caml2html.byte str.cma unix.cma $(OBJS)
- 
- lib: all bytelib optlib
- 
-@@ -144,7 +145,7 @@
- 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
---- 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
--  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 ->
---- 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
--  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: output.mli 12 2010-06-28 18:18:41Z mjambon $ *)
- 
diff --git a/debian/patches/fix-ocamldoc-html-tags.patch 
b/debian/patches/fix-ocamldoc-html-tags.patch
new file mode 100644
index 0000000..1bb207e
--- /dev/null
+++ b/debian/patches/fix-ocamldoc-html-tags.patch
@@ -0,0 +1,33 @@
+Description: fix html tags inside ocamldoc comments
+Author: Hendrik Tews <hend...@askra.de>
+--- 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
+-  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$ *)
+ 
diff --git a/debian/patches/series b/debian/patches/series
index fd0c9f0..5cd1fb1 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1 @@
-debian-changes-1.4.1-1
+fix-ocamldoc-html-tags.patch
diff --git a/debian/rules b/debian/rules
index afe6104..ade475a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,6 +3,7 @@
 
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
+#export DH_OPTIONS=-v
 
 DESTDIR=$(CURDIR)/debian/tmp
 
@@ -14,16 +15,19 @@ OCAMLFIND_LDCONF=ignore
 export OCAMLFIND_LDCONF
 
 %:
-       dh --with ocaml $@
+       dh $@ --with ocaml
 
 .PHONY: override_dh_auto_build
 override_dh_auto_build:
-       $(MAKE) byte
 ifeq ($(OCAML_HAVE_OCAMLOPT),yes)
-       $(MAKE) lib
+       $(MAKE) OCAMLOPT=ocamlopt.opt OCAMLC=ocamlc.opt opt bytelib
 else
-       $(MAKE) bytelib
-endif 
+       $(MAKE) byte bytelib
+       mv caml2html.byte caml2html
+endif
+       ./caml2html -help > caml2html-help
+       camlmix -o caml2html.html caml2html.html.mlx
+
 
 .PHONY: override_dh_auto_install
 override_dh_auto_install:
@@ -31,13 +35,7 @@ override_dh_auto_install:
        mkdir -p '$(DESTDIR)/usr/bin'
        make install 'BINDIR=$(DESTDIR)/usr/bin'
 
+
 .PHONY: override_dh_install
 override_dh_install:
        dh_install --fail-missing
-
-.PHONY: override_dh_auto_clean
-override_dh_auto_clean:
-       $(MAKE) tidy
-
-debian/caml2html.1: debian/caml2html.mkd
-       pandoc -s -w man $^ -o $@

-- 
caml2html packaging

_______________________________________________
Pkg-ocaml-maint-commits mailing list
Pkg-ocaml-maint-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-ocaml-maint-commits

Reply via email to