work in progress...

diff --git a/debian/TODO.Debian b/debian/TODO.Debian
index 8438b304ec5354640645961c24f710243e342244..c219c61dadc1c0b0a5f3997a264bf4883e453736 100644 (file)
--- a/debian/TODO.Debian
+++ b/debian/TODO.Debian
@@ -1,14 +1,16 @@
 TODO list for ocaml 3.10.0 (and beyond ...)
 
+- ocamlbuild is not installed
+
 - lintian warnings
 
-  lintian /home/srv/debian/pkg-ocaml-maint/packages/ocaml/build-area/ocaml_3.10.0-2_i386.changes
+  lintian /home/srv/debian/pkg-ocaml-maint/packages/ocaml/build-area/ocaml_3.10.0-3_i386.changes
+
   W: ocaml-nox: binary-without-manpage usr/bin/ocamlbuild.byte
   W: ocaml-nox: binary-without-manpage usr/bin/ocamlbuild.native
   W: ocaml-nox: script-not-executable ./usr/lib/ocaml/3.10.0/camlheader
   W: ocaml-mode: binary-without-manpage usr/bin/ocamltags
   E: ocaml-compiler-libs: copyright-should-refer-to-common-license-file-for-gpl
-  W: ocaml-base-nox: binary-without-manpage usr/bin/ocaml-md5sums
   W: ocaml: binary-without-manpage usr/bin/labltk
   W: ocaml: binary-without-manpage usr/bin/ocamlbrowser
 

diff --git a/debian/changelog b/debian/changelog
index 7c2dff9e084f3c7e7ba474c647378e8d3e65d5c8..af5a7e55096bed7421d0db5ade47d039b26fbab5 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,15 @@
 ocaml (3.10.0-3) UNRELEASED; urgency=low
 
+  * debian/patches/00list
+    - enabled install_ocamlbuild patch, which was disabled by mistake
   * debian/rules
     - pass -libdir to configure (now that it is supported upstream) in
       addition to sed-ing generated config Makefiles; otherwise ocamlrun won't
       get the correct libdir setting
+  * debian/ocaml-md5sums/ocaml-md5sums.1
+    - written ocaml-md5sums manpage
 
- -- Stefano Zacchiroli <zack@debian.org>  Sat, 16 Jun 2007 15:48:10 +0100
+ -- Stefano Zacchiroli <zack@debian.org>  Sat, 16 Jun 2007 16:41:03 +0100
 
 ocaml (3.10.0-2) experimental; urgency=low
 

diff --git a/debian/ocaml-base-nox.manpages b/debian/ocaml-base-nox.manpages
new file mode 100644 (file)
index 0000000..5b3ed5e
--- /dev/null
+++ b/debian/ocaml-base-nox.manpages
@@ -0,0 +1 @@
+debian/ocaml-md5sums/ocaml-md5sums.1

diff --git a/debian/ocaml-md5sums/configure.in b/debian/ocaml-md5sums/configure.in
index addfa605d0f9da0b47fb931800355822cf6a3c4a..bf760c8199e1ef660b63b1443df882d7c73ccdc9 100644 (file)
--- a/debian/ocaml-md5sums/configure.in
+++ b/debian/ocaml-md5sums/configure.in
@@ -1,4 +1,5 @@
 #!/bin/sh
+VERSION="#OcamlABI#"
 DEFAULT="/var/lib/ocaml/#OcamlABI#/md5sums"
 if [ -z "$1" ]; then
   echo "No dir provided, using default: $DEFAULT"
@@ -8,5 +9,7 @@ else
   MD5SUMS_DIR="$1"
 fi
 echo -n "Creating ocaml-md5sums.ml ... "
-sed "s:@MD5SUMS_DIR@:$MD5SUMS_DIR:" < ocaml-md5sums.ml.in > ocaml-md5sums.ml
+sed -e "s:@MD5SUMS_DIR@:$MD5SUMS_DIR:" \
+  -e "s:@VERSION@:$VERSION:" \
+  < ocaml-md5sums.ml.in > ocaml-md5sums.ml
 echo "done."

diff --git a/debian/ocaml-md5sums/ocaml-md5sums.1 b/debian/ocaml-md5sums/ocaml-md5sums.1
new file mode 100644 (file)
index 0000000..3174eb5
--- /dev/null
+++ b/debian/ocaml-md5sums/ocaml-md5sums.1
@@ -0,0 +1,48 @@
+.TH OCAML-MD5SUMS "1" "June 2007" "ocaml-md5sums 3.10.0" "User Commands"
+.SH NAME
+ocaml-md5sums \- use and maintain system-wide OCaml md5sums registry
+.SH SYNOPSIS
+.B ocaml-md5sums compute
+\fB\-\-package\fR <name>
+[\fIoption\ ...\fR] \fIfile ...\fR
+.br
+.B ocaml-md5sums dep
+[\fIoption\ ...\fR] \fIfile ...\fR
+.br
+.B ocaml-md5sums update
+[\fIoption\ ...\fR]
+.SH DESCRIPTION
+ocaml-md5sums is an administrative tool for maintaining the system-wide
+registry of md5sums of OCaml modules. For each OCaml object registered, the
+registry contains information about which modules (compilation unit) are
+contained and their md5sums.
+.SH OPTIONS
+.HP
+\fB\-\-package\fR set package name for development dependency
+.HP
+\fB\-\-runtime\fR set package name for runtime dependency
+.HP
+\fB\-\-version\fR set package version for dependencies
+.HP
+\fB\-\-dump\-info\fR dump ocamlobjinfo to file
+.HP
+\fB\-\-load\-info\fR restore ocamlobjinfo from file
+.HP
+\fB\-v\fR increase verbosity
+.HP
+\fB\-\-my\-version\fR print ocaml\-md5sum version and exit
+.TP
+\fB\-help\fR
+Display this list of options
+.TP
+\fB\-\-help\fR
+Display this list of options
+.SH "SEE ALSO"
+.BR ocamlc(1),
+.BR ocaml(1).
+.SH AUTHOR
+ocaml-md5sums is Copyright Stefano Zacchiroli and is distributed under the
+terms of the GNU General Public License.
+.PP
+This manual page was written by Stefano Zacchiroli <zack@debian.org>,
+for the Debian project (but may be used by others).

diff --git a/debian/ocaml-md5sums/ocaml-md5sums.ml.in b/debian/ocaml-md5sums/ocaml-md5sums.ml.in
index c81a5348129ecfd23d6fa18ec3e65af08688f64f..b10a7ca22e9d15610238405eeb794e3aed0d2db3 100644 (file)
--- a/debian/ocaml-md5sums/ocaml-md5sums.ml.in
+++ b/debian/ocaml-md5sums/ocaml-md5sums.ml.in
@@ -24,6 +24,7 @@ open Printf
 
 (** {2 Constants} *)
 
+let my_version = "@VERSION@"
 let md5sums_dir = "@MD5SUMS_DIR@"
 let md5sums_index = "MD5SUMS"
 let md5sums_ext = ".md5sums"
@@ -58,7 +59,7 @@ let load_info_from = ref ""
 let action = ref None
 
 let usage_msg =
-  "Use and maintain system wide ocaml md5sums registry\n"
+  "Use and maintain system-wide ocaml md5sums registry\n"
   ^ "Usage:\n"
   ^ " ocaml-md5sum compute --package <name> [option ...] file ...\n"
   ^ " ocaml-md5sum dep     [option ...] file ...\n"
@@ -76,6 +77,8 @@ let cmdline_spec = [
   "--load-info", Arg.Set_string load_info_from,
     "restore ocamlobjinfo from file";
   "-v", Arg.Unit (fun () -> incr verbosity), "increase verbosity";
+  "--my-version", Arg.Unit (fun () -> print_endline my_version ; exit 0),
+    "print ocaml-md5sum version and exit";
 ]
 let die_usage () =
   Arg.usage cmdline_spec usage_msg;