Remove {dumpobj,objinfo}.dpatch, and put manpages in debian/man

Rationale: those two patches have a tight, artificial, dependency,
meaning potential extra work when updating them. As a side effect, the
additional tools are no longer referenced from the manpages of main
OCaml tools, but it is worth simplifying the packaging.

diff --git a/debian/man/ocamldumpobj.1 b/debian/man/ocamldumpobj.1
new file mode 100644 (file)
index 0000000..0670947
--- /dev/null
+++ b/debian/man/ocamldumpobj.1
@@ -0,0 +1,20 @@
+.TH OCAMLDUMPOBJ 1 "January 4, 2006"
+.SH NAME
+ocamldumpobj \- disassembler for OCaml executable and .cmo object files
+.
+.SH SYNOPSIS
+.B ocamldumpobj
+.RI file\ ...
+.
+.SH DESCRIPTION
+Disassembler for executable and .cmo object files compiled by OCaml.
+.
+.SH SEE ALSO
+.BR ocamlc (1),
+.BR ocamlopt (1),
+.BR ocamlobjinfo (1).
+.br
+.
+.SH AUTHOR
+This manual page was written by Samuel Mimram <smimram@debian.org>,
+for the Debian GNU/Linux system (but may be used by others).

diff --git a/debian/man/ocamlobjinfo.1 b/debian/man/ocamlobjinfo.1
new file mode 100644 (file)
index 0000000..18f344b
--- /dev/null
+++ b/debian/man/ocamlobjinfo.1
@@ -0,0 +1,40 @@
+.TH OCAML-SOAP 1 "October 26, 2002"
+.SH NAME
+ocamlobjinfo \- dump an OCaml compilation unit description
+.SH SYNOPSIS
+.B ocamlobjinfo
+.RI file\ ...
+.SH DESCRIPTION
+Dump information contained in OCaml compilation units.
+Currently it works on .cmi, .cmo and .cma files.
+.sp 2
+.B ocamlobjinfo
+is able to show information regarding:
+.br
+.IP
+module names
+.sp 2
+unit name
+.sp 2
+declared primitives
+.sp 2
+imported interfaces
+.sp 2
+md5sums of imported interfaces
+.sp 2
+forced custom mode
+.sp 2
+extra C libraries needed
+.sp 2
+extra C flags needed
+.sp 2
+use of unsafe features
+.PP
+depending on its invocation on .cmi, .cmo or .cma arguments.
+.SH SEE ALSO
+.BR ocamlc (1),
+.BR ocamlopt (1)
+.br
+.SH AUTHOR
+This manual page was written by Stefano Zacchiroli <zack@debian.org>,
+for the Debian GNU/Linux system (but may be used by others).

diff --git a/debian/ocaml-nox.install.in b/debian/ocaml-nox.install.in
index 222e5d1749793905df3f69df220731112aea5da8..103e1ea319ed723f9b44fd554d2634c74ca5d938 100644 (file)
--- a/debian/ocaml-nox.install.in
+++ b/debian/ocaml-nox.install.in
@@ -358,12 +358,10 @@ OPT: usr/share/man/man1/ocamlopt.1
      usr/share/man/man1/ocamlc.1
      usr/share/man/man1/ocamldep.1
      usr/share/man/man1/ocamlcp.1
-     usr/share/man/man1/ocamldumpobj.1
      usr/share/man/man1/ocamlmklib.1
      usr/share/man/man1/ocamlmktop.1
      usr/share/man/man1/ocamldoc.1
      usr/share/man/man1/ocamlyacc.1
      usr/share/man/man1/ocamlbuild.1
-     usr/share/man/man1/ocamlobjinfo.1
      usr/share/man/man1/ocamldebug.1
      usr/share/man/man1/ocamllex.1

diff --git a/debian/ocaml-nox.manpages b/debian/ocaml-nox.manpages
new file mode 100644 (file)
index 0000000..3ea6722
--- /dev/null
+++ b/debian/ocaml-nox.manpages
@@ -0,0 +1,2 @@
+debian/man/ocamldumpobj.1
+debian/man/ocamlobjinfo.1

diff --git a/debian/patches/00list b/debian/patches/00list
index e73b5290ad5ef722aafdf80d67a27a8751124fdd..6f9371a6014a5e4527743557de914fe309e62d03 100644 (file)
--- a/debian/patches/00list
+++ b/debian/patches/00list
@@ -1,5 +1,3 @@
-objinfo.dpatch
-dumpobj.dpatch
 man-ocamlmklib.dpatch
 alpha_ld_no-relax.dpatch
 call_ld_with_proper_flags.dpatch

diff --git a/debian/patches/dumpobj.dpatch b/debian/patches/dumpobj.dpatch
deleted file mode 100755 (executable)
index 05a9266..0000000
--- a/debian/patches/dumpobj.dpatch
+++ /dev/null
@@ -1,68 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## dumpobj.dpatch by Samuel Mimram <smimram@debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Ship ocamldumpobj and add a manpage for it.
-
-@DPATCH@
-diff -urNad ocaml~/man/ocamlc.m ocaml/man/ocamlc.m
---- ocaml~/man/ocamlc.m        2008-11-29 11:31:16.000000000 +0100
-+++ ocaml/man/ocamlc.m 2008-11-29 11:31:16.000000000 +0100
-@@ -579,7 +579,8 @@
- Display a short usage summary and exit.
- 
- .SH SEE ALSO
--.BR ocamlopt (1), \ ocamlrun (1), \ ocaml (1), \ ocamlobjinfo (1).
-+.BR ocamlopt (1), \ ocamlrun (1), \ ocaml (1),
-+.BR ocamlobjinfo (1), \ ocamldumpobj (1).
- .br
- .IR "The Objective Caml user's manual" ,
- chapter "Batch compilation".
-diff -urNad ocaml~/man/ocamldumpobj.m ocaml/man/ocamldumpobj.m
---- ocaml~/man/ocamldumpobj.m  1970-01-01 01:00:00.000000000 +0100
-+++ ocaml/man/ocamldumpobj.m   2008-11-29 11:31:16.000000000 +0100
-@@ -0,0 +1,20 @@
-+.TH OCAMLDUMPOBJ 1 "January 4, 2006"
-+.SH NAME
-+ocamldumpobj \- disassembler for OCaml executable and .cmo object files
-+.
-+.SH SYNOPSIS
-+.B ocamldumpobj
-+.RI file\ ...
-+.
-+.SH DESCRIPTION
-+Disassembler for executable and .cmo object files compiled by OCaml.
-+.
-+.SH SEE ALSO
-+.BR ocamlc (1),
-+.BR ocamlopt (1),
-+.BR ocamlobjinfo (1).
-+.br
-+.
-+.SH AUTHOR
-+This manual page was written by Samuel Mimram <smimram@debian.org>,
-+for the Debian GNU/Linux system (but may be used by others).
-diff -urNad ocaml~/man/ocamlopt.m ocaml/man/ocamlopt.m
---- ocaml~/man/ocamlopt.m      2008-11-29 11:31:16.000000000 +0100
-+++ ocaml/man/ocamlopt.m       2008-11-29 11:31:16.000000000 +0100
-@@ -604,7 +604,8 @@
- 
- .SH SEE ALSO
- .BR ocamlc (1),
--.BR ocamlobjinfo (1).
-+.BR ocamlobjinfo (1),
-+.BR ocamldumpobj (1).
- .br
- .IR "The Objective Caml user's manual" ,
- chapter "Native-code compilation".
-diff -urNad ocaml~/tools/Makefile.shared ocaml/tools/Makefile.shared
---- ocaml~/tools/Makefile.shared       2008-11-29 11:31:16.000000000 +0100
-+++ ocaml/tools/Makefile.shared        2008-11-29 11:31:16.000000000 +0100
-@@ -73,6 +73,7 @@
-       cp ocamlcp $(BINDIR)/ocamlcp$(EXE)
-       cp profiling.cmi profiling.cmo $(LIBDIR)
-       cp objinfo $(BINDIR)/ocamlobjinfo$(EXE)
-+      cp dumpobj $(BINDIR)/ocamldumpobj$(EXE)
- 
- clean::
-       rm -f ocamlprof ocamlcp

diff --git a/debian/patches/objinfo.dpatch b/debian/patches/objinfo.dpatch
deleted file mode 100755 (executable)
index c64bd77..0000000
--- a/debian/patches/objinfo.dpatch
+++ /dev/null
@@ -1,109 +0,0 @@
-#! /bin/sh -e 
-## ocamlobjinfo.dpatch by <luther@debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: ship ocamlobjinfo and add a manpage for it.
-
-if [ $# -ne 1 ]; then
-    echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
-    exit 1
-fi
-case "$1" in
-    -patch) patch -f --no-backup-if-mismatch -p1 < $0;;
-    -unpatch) patch -f --no-backup-if-mismatch -R -p1 < $0;;   
-    *)
-       echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
-       exit 1;;
-esac
-
-exit 0
-@DPATCH@
-diff -urNad ocaml~/man/ocamlc.m ocaml/man/ocamlc.m
---- ocaml~/man/ocamlc.m        2008-11-29 11:16:39.000000000 +0100
-+++ ocaml/man/ocamlc.m 2008-11-29 11:31:06.000000000 +0100
-@@ -579,7 +579,7 @@
- Display a short usage summary and exit.
- 
- .SH SEE ALSO
--.BR ocamlopt (1), \ ocamlrun (1), \ ocaml (1).
-+.BR ocamlopt (1), \ ocamlrun (1), \ ocaml (1), \ ocamlobjinfo (1).
- .br
- .IR "The Objective Caml user's manual" ,
- chapter "Batch compilation".
-diff -urNad ocaml~/man/ocamlobjinfo.m ocaml/man/ocamlobjinfo.m
---- ocaml~/man/ocamlobjinfo.m  1970-01-01 01:00:00.000000000 +0100
-+++ ocaml/man/ocamlobjinfo.m   2008-11-29 11:31:10.000000000 +0100
-@@ -0,0 +1,40 @@
-+.TH OCAML-SOAP 1 "October 26, 2002"
-+.SH NAME
-+ocamlobjinfo \- dump an OCaml compilation unit description
-+.SH SYNOPSIS
-+.B ocamlobjinfo
-+.RI file\ ...
-+.SH DESCRIPTION
-+Dump information contained in OCaml compilation units.
-+Currently it works on .cmi, .cmo and .cma files.
-+.sp 2
-+.B ocamlobjinfo
-+is able to show information regarding:
-+.br
-+.IP
-+module names
-+.sp 2
-+unit name
-+.sp 2
-+declared primitives
-+.sp 2
-+imported interfaces
-+.sp 2
-+md5sums of imported interfaces
-+.sp 2
-+forced custom mode
-+.sp 2
-+extra C libraries needed
-+.sp 2
-+extra C flags needed
-+.sp 2
-+use of unsafe features
-+.PP
-+depending on its invocation on .cmi, .cmo or .cma arguments.
-+.SH SEE ALSO
-+.BR ocamlc (1),
-+.BR ocamlopt (1)
-+.br
-+.SH AUTHOR
-+This manual page was written by Stefano Zacchiroli <zack@debian.org>,
-+for the Debian GNU/Linux system (but may be used by others).
-diff -urNad ocaml~/man/ocamlopt.m ocaml/man/ocamlopt.m
---- ocaml~/man/ocamlopt.m      2008-11-29 11:16:39.000000000 +0100
-+++ ocaml/man/ocamlopt.m       2008-11-29 11:31:10.000000000 +0100
-@@ -603,7 +603,8 @@
- SPARC processors.
- 
- .SH SEE ALSO
--.BR ocamlc (1).
-+.BR ocamlc (1),
-+.BR ocamlobjinfo (1).
- .br
- .IR "The Objective Caml user's manual" ,
- chapter "Native-code compilation".
-diff -urNad ocaml~/tools/Makefile.shared ocaml/tools/Makefile.shared
---- ocaml~/tools/Makefile.shared       2007-11-22 23:14:43.000000000 +0100
-+++ ocaml/tools/Makefile.shared        2008-11-29 11:31:10.000000000 +0100
-@@ -24,7 +24,7 @@
- LINKFLAGS=$(INCLUDES)
- 
- all: ocamldep ocamlprof ocamlcp ocamlmktop ocamlmklib scrapelabels addlabels \
--     dumpobj
-+     dumpobj objinfo
- .PHONY: all
- 
- opt.opt: ocamldep.opt
-@@ -72,6 +72,7 @@
-       cp ocamlprof $(BINDIR)/ocamlprof$(EXE)
-       cp ocamlcp $(BINDIR)/ocamlcp$(EXE)
-       cp profiling.cmi profiling.cmo $(LIBDIR)
-+      cp objinfo $(BINDIR)/ocamlobjinfo$(EXE)
- 
- clean::
-       rm -f ocamlprof ocamlcp