[Pkg-ocaml-maint-commits] [SCM] caml2html packaging branch, master, updated. debian/1.4.1-1

Sylvain Le Gall gildor at debian.org
Thu Dec 2 23:53:01 UTC 2010


The following commit has been merged in the master branch:
commit 65132193624cc410963fa76aeb765e04e5d145cb
Author: Sylvain Le Gall <gildor at debian.org>
Date:   Fri Dec 3 00:24:44 2010 +0100

    Initial packaging

diff --git a/Makefile b/Makefile
index cb88035..e31f73e 100644
--- a/Makefile
+++ b/Makefile
@@ -57,24 +57,25 @@ 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 \
@@ -85,7 +86,7 @@ caml2html: $(OBJS-NAT)
 	$(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 @@ 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/debian/caml2html.1 b/debian/caml2html.1
new file mode 100644
index 0000000..ac86ca2
--- /dev/null
+++ b/debian/caml2html.1
@@ -0,0 +1,145 @@
+.TH CAML2HTML 1 "November 9, 2010" "Caml2html User Manual"
+.SH NAME
+.PP
+caml2html - colorizes a set of OCaml source files.
+.SH SYNOPSIS
+.PP
+caml2html [options] file*
+.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[].
+.SH OPTIONS
+.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
+.TP
+.B -body
+output only document's body, for inclusion into an existing
+document (see also -make-css and -make-latex-defs)
+.RS
+.RE
+.TP
+.B -ln
+add line number at the beginning of each line
+.RS
+.RE
+.TP
+.B -hc
+comments are treated as raw HTML or LaTeX code (no newlines inside
+of tags)
+.RS
+.RE
+.TP
+.B -t
+add a title to the HTML page
+.RS
+.RE
+.TP
+.B -nf
+do not add footnotes to the HTML page
+.RS
+.RE
+.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
+.TP
+.B -notab
+do not replace tabs by spaces
+.RS
+.RE
+.TP
+.B -tab 
+replace tab by n spaces (default = 8)
+.RS
+.RE
+.TP
+.B -d 
+generate files in directory dir, rather than in current directory
+.RS
+.RE
+.TP
+.B -o 
+output file
+.RS
+.RE
+.TP
+.B -v
+print version number to stdout and exit
+.RS
+.RE
+.TP
+.B -make-css 
+create CSS file with default color definitions and exit
+.RS
+.RE
+.TP
+.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
+output LaTeX code instead of HTML.
+.RS
+.RE
+.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
+.TP
+.B -help|--help
+Display this list of options
+.RS
+.RE
+.SH AUTHORS
+Sylvain Le Gall.
+
diff --git a/debian/caml2html.install.in b/debian/caml2html.install.in
new file mode 100644
index 0000000..a936eec
--- /dev/null
+++ b/debian/caml2html.install.in
@@ -0,0 +1 @@
+usr/bin/caml2html
diff --git a/debian/caml2html.manpages b/debian/caml2html.manpages
new file mode 100644
index 0000000..37fe323
--- /dev/null
+++ b/debian/caml2html.manpages
@@ -0,0 +1 @@
+debian/caml2html.1
diff --git a/debian/caml2html.mkd b/debian/caml2html.mkd
new file mode 100644
index 0000000..80e1f36
--- /dev/null
+++ b/debian/caml2html.mkd
@@ -0,0 +1,100 @@
+% CAML2HTML(1) Caml2html User Manual
+% Sylvain Le Gall 
+% November 9, 2010
+
+# NAME
+
+caml2html - colorizes a set of OCaml source files.
+
+# SYNOPSIS
+
+caml2html [options] file\*
+
+# DESCRIPTION
+
+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. 
+
+To obtain a .annot file, compile your OCaml source files with `ocamlc -dtypes` or 
+`ocamlopt -dtypes`.
+
+# OPTIONS
+
+-annotfilter {innermost|outermost}
+:   choose whether innermost or outermost type annotations
+    should be used (default: innermost)
+
+-charset <charset>
+:   specify charset to use (default: iso-8859-1)
+
+-css 
+:   use CSS named style.css for styling
+
+-cssurl <URL>
+:   use the given URL as CSS for styling
+
+-inhead 
+:   use default styling and place it in the head section
+    of the document (default when applicable)
+
+-inline 
+:   use inline styling (HTML only, default fallback
+    if -inhead is not applicable)
+
+-body 
+:   output only document's body, for inclusion into an 
+    existing document (see also -make-css and -make-latex-defs)
+
+-ln 
+:   add line number at the beginning of each line
+
+-hc 
+:   comments are treated as raw HTML or LaTeX code
+    (no newlines inside of tags)
+
+-t 
+:   add a title to the HTML page
+
+-nf 
+:   do not add footnotes to the HTML page
+
+-ie7 
+:   drop support for type annotations on Internet Explorer 6 and older
+
+-noannot 
+:   do not insert type annotations as read from .annot files 
+    (HTML output only)
+
+-notab 
+:   do not replace tabs by spaces
+
+-tab <integer>
+:   replace tab by n spaces (default = 8)
+
+-d <directory>
+:   generate files in directory dir, rather than in current directory
+
+-o <filename>
+:   output file
+
+-v 
+:   print version number to stdout and exit
+
+-make-css <filename>
+:   create CSS file with default color definitions and exit
+
+-ext <NAME:CMD>
+:   use the given external command CMD to handle comments that start
+    with (\*NAME. NAME must be a lowercase identifier.
+
+-latex 
+:   output LaTeX code instead of HTML.
+
+-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.
+
+-help|\--help
+:   Display this list of options
diff --git a/debian/changelog b/debian/changelog
new file mode 100644
index 0000000..814d89b
--- /dev/null
+++ b/debian/changelog
@@ -0,0 +1,5 @@
+caml2html (1.4.1-1) unstable; urgency=low
+
+  * Initial release. (Closes: #605741)
+
+ -- Sylvain Le Gall <gildor at debian.org>  Thu, 02 Dec 2010 23:58:52 +0100
diff --git a/debian/compat b/debian/compat
new file mode 100644
index 0000000..7f8f011
--- /dev/null
+++ b/debian/compat
@@ -0,0 +1 @@
+7
diff --git a/debian/control b/debian/control
new file mode 100644
index 0000000..20d5d17
--- /dev/null
+++ b/debian/control
@@ -0,0 +1,50 @@
+Source: caml2html
+Section: ocaml
+Priority: optional
+Maintainer: Debian OCaml Maintainers <debian-ocaml-maint at lists.debian.org>
+Uploaders:
+  Sylvain Le Gall <gildor at debian.org>
+Build-Depends:
+  ocaml-nox (>= 3.11.1-3~),
+  ocaml-findlib,
+  dh-ocaml (>= 0.9~),
+  debhelper (>= 7.0.50~)
+Standards-Version: 3.9.1
+Homepage: http://martin.jambon.free.fr/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
+ 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.
+
+Package: libcaml2html-ocaml-dev
+Architecture: any
+Depends: ${ocaml:Depends}, ${misc:Depends}
+Provides: ${ocaml:Provides}
+Recommends: ocaml-findlib
+Description: HTML and LaTeX colored syntax from OCaml source 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.
+
+Package: libcaml2html-ocaml
+Architecture: any
+Depends: ${ocaml:Depends}, ${misc:Depends}
+Provides: ${ocaml:Provides}
+Recommends: ocaml-findlib
+Description: HTML and LaTeX colored syntax from OCaml source 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 shared runtime library.
diff --git a/debian/copyright b/debian/copyright
new file mode 100644
index 0000000..d5b97ab
--- /dev/null
+++ b/debian/copyright
@@ -0,0 +1,16 @@
+Format-Specification: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?op=file&rev=135
+Name: caml2html
+Maintainer: Sylvain Le Gall <gildor at debian.org>
+
+Files: *
+Copyright: (c) 2008 Martin Jambon
+           (c) 2002 Sébastien Ailleret
+License: GPL-2
+
+ See '/usr/share/common-licenses/GPL-2' for the full text.
+
+Files: debian/*
+Copyright: (C) 2010 Sylvain Le Gall <gildor at debian.org>
+License: GPL-3+
+
+ See '/usr/share/common-licenses/GPL-3' for the full text.
diff --git a/debian/gbp.conf b/debian/gbp.conf
new file mode 100644
index 0000000..cec628c
--- /dev/null
+++ b/debian/gbp.conf
@@ -0,0 +1,2 @@
+[DEFAULT]
+pristine-tar = True
diff --git a/debian/libcaml2html-ocaml-dev.install.in b/debian/libcaml2html-ocaml-dev.install.in
new file mode 100644
index 0000000..187edcc
--- /dev/null
+++ b/debian/libcaml2html-ocaml-dev.install.in
@@ -0,0 +1,4 @@
+ at OCamlStdlibDir@/caml2html/*.mli
+ at OCamlStdlibDir@/caml2html/*.cmi
+OPT: @OCamlStdlibDir@/caml2html/*.cmxa
+OPT: @OCamlStdlibDir@/caml2html/*.a
diff --git a/debian/libcaml2html-ocaml.install.in b/debian/libcaml2html-ocaml.install.in
new file mode 100644
index 0000000..3b860bc
--- /dev/null
+++ b/debian/libcaml2html-ocaml.install.in
@@ -0,0 +1,2 @@
+ at OCamlStdlibDir@/caml2html/META
+ at OCamlStdlibDir@/caml2html/*.cma
diff --git a/debian/patches/debian-changes-1.4.1-1 b/debian/patches/debian-changes-1.4.1-1
new file mode 100644
index 0000000..eb6a429
--- /dev/null
+++ b/debian/patches/debian-changes-1.4.1-1
@@ -0,0 +1,75 @@
+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 <gildor at 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>
+
+--- caml2html-1.4.1.orig/Makefile
++++ caml2html-1.4.1/Makefile
+@@ -57,24 +57,25 @@ 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 \
+@@ -85,7 +86,7 @@ caml2html: $(OBJS-NAT)
+ 	$(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 @@ 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/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..fd0c9f0
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+debian-changes-1.4.1-1
diff --git a/debian/rules b/debian/rules
new file mode 100755
index 0000000..afe6104
--- /dev/null
+++ b/debian/rules
@@ -0,0 +1,43 @@
+#!/usr/bin/make -f
+# -*- makefile -*-
+
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
+
+DESTDIR=$(CURDIR)/debian/tmp
+
+include /usr/share/ocaml/ocamlvars.mk
+
+OCAMLFIND_DESTDIR=$(DESTDIR)/$(OCAML_STDLIB_DIR)
+export OCAMLFIND_DESTDIR
+OCAMLFIND_LDCONF=ignore
+export OCAMLFIND_LDCONF
+
+%:
+	dh --with ocaml $@
+
+.PHONY: override_dh_auto_build
+override_dh_auto_build:
+	$(MAKE) byte
+ifeq ($(OCAML_HAVE_OCAMLOPT),yes)
+	$(MAKE) lib
+else
+	$(MAKE) bytelib
+endif 
+
+.PHONY: override_dh_auto_install
+override_dh_auto_install:
+	mkdir -p '$(OCAMLFIND_DESTDIR)'
+	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 $@
diff --git a/debian/source/format b/debian/source/format
new file mode 100644
index 0000000..163aaf8
--- /dev/null
+++ b/debian/source/format
@@ -0,0 +1 @@
+3.0 (quilt)
diff --git a/debian/watch b/debian/watch
new file mode 100644
index 0000000..5d803a0
--- /dev/null
+++ b/debian/watch
@@ -0,0 +1,2 @@
+version=3
+http://martin.jambon.free.fr/caml2html.html caml2html-([\d\.]*)\.tar\.gz

-- 
caml2html packaging



More information about the Pkg-ocaml-maint-commits mailing list