From e5319fbe86159e8026dfacc7b1cb4933dbefe307 Mon Sep 17 00:00:00 2001 From: Stephane Glondu Date: Sun, 15 Feb 2009 23:30:41 +0100 Subject: [PATCH] Remove man-ocamlmklib.dpatch, and put manpage in debian/man --- debian/man/ocamlmklib.1 | 127 ++++++++++++++++++++++ debian/ocaml-nox.install.in | 1 - debian/ocaml-nox.manpages | 1 + debian/patches/00list | 1 - debian/patches/man-ocamlmklib.dpatch | 151 --------------------------- 5 files changed, 128 insertions(+), 153 deletions(-) create mode 100644 debian/man/ocamlmklib.1 delete mode 100755 debian/patches/man-ocamlmklib.dpatch diff --git a/debian/man/ocamlmklib.1 b/debian/man/ocamlmklib.1 new file mode 100644 index 00000000..c57bf5ee --- /dev/null +++ b/debian/man/ocamlmklib.1 @@ -0,0 +1,127 @@ +.\" Hey, EMACS: -*- nroff -*- +.TH OCAMLMKLIB 1 "August 19, 2004" +.SH NAME +ocamlmklib \- generate libraries with mixed C / Caml code. +.SH SYNOPSIS +.B ocalmklib +.RI [ options ] " files" +.SH DESCRIPTION +The +.B ocamlmklib +command facilitates the construction of libraries containing both Caml code and C code, and usable both in static linking and dynamic linking modes. +.SH OPTIONS +.TP +.B \-h, \-\-help +Show summary of options. +.TP +.BI \-cclib\ lib +C library passed to ocamlc +.B \-a +or +.BR ocamlopt (1) +.B \-a +only. +.TP +.BI \-ccopt\ opt +C option passed to +.BR ocamlc (1) +.B \-a +or +.BR ocamlopt (1) +.B \-a +only. +.TP +.B \-custom +Disable dynamic loading. +.TP +.BI \-dllpath\ dir +Add +.I dir +to the run-time search path for DLLs. +.TP +.BI \-I\ dir +Add +.I dir +to the path searched for Caml object files. +.TP +.B \-failsafe +Fall back to static linking if DLL construction failed. +.TP +.BI \-ldopt\ opt +C option passed to the shared linker only. +.TP +.B \-linkall +Build Caml archive with link-all behavior. +.TP +.BI \-l lib +Specify a dependent C library. +.TP +.BI \-L dir +Add +.I dir +to the path searched for C libraries. +.TP +.BI \-ocamlc\ cmd +Use +.I cmd +in place of +.BR ocamlc (1). +.TP +.BI \-ocamlopt\ cmd +Use +.I cmd +in place of +.BR ocamlopt (1). +.TP +.BI \-o\ name +Generated Caml library is named +.IR name .cma +or +.IR name .cmxa. +.TP +.BI \-oc\ name +Generated C library is named +.RI dll name .so +or +.RI lib name .a. +.TP +.BI \-rpath\ dir +Same as +.B \-dllpath +.IR dir . +.TP +.BI \-R dir +Same as +.BR \-rpath . +.TP +.B \-verbose +Print commands before executing them. +.TP +\fB\-Wl\fR, \fB\-rpath \fIdir +Same as +.B \-dllpath +.IR dir . +.TP +\fB\-Wl\fR, \fB\-rpath\ \-Wl \fIdir +Same as +.B \-dllpath +.IR dir . +.TP +\fB\-Wl\fR, \fB\-R\fIdir +Same as +.B \-dllpath +.IR dir . +.TP +.BI \-F dir +Specify a framework directory (MacOSX). +.TP +.BI \-framework\ name +Use framework +.I name +(MacOSX). +.SH SEE ALSO +.BR ocamlc (1), +.BR ocamlopt (1). +.SH AUTHOR +This manual page was written by Samuel Mimram , +for the Debian project (but may be used by others). diff --git a/debian/ocaml-nox.install.in b/debian/ocaml-nox.install.in index 103e1ea3..d2fb4627 100644 --- a/debian/ocaml-nox.install.in +++ b/debian/ocaml-nox.install.in @@ -358,7 +358,6 @@ 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/ocamlmklib.1 usr/share/man/man1/ocamlmktop.1 usr/share/man/man1/ocamldoc.1 usr/share/man/man1/ocamlyacc.1 diff --git a/debian/ocaml-nox.manpages b/debian/ocaml-nox.manpages index 3ea67228..5ed39617 100644 --- a/debian/ocaml-nox.manpages +++ b/debian/ocaml-nox.manpages @@ -1,2 +1,3 @@ +debian/man/ocamlmklib.1 debian/man/ocamldumpobj.1 debian/man/ocamlobjinfo.1 diff --git a/debian/patches/00list b/debian/patches/00list index 6f9371a6..3c086553 100644 --- a/debian/patches/00list +++ b/debian/patches/00list @@ -1,4 +1,3 @@ -man-ocamlmklib.dpatch alpha_ld_no-relax.dpatch call_ld_with_proper_flags.dpatch no_rpath.dpatch diff --git a/debian/patches/man-ocamlmklib.dpatch b/debian/patches/man-ocamlmklib.dpatch deleted file mode 100755 index 3e6704c3..00000000 --- a/debian/patches/man-ocamlmklib.dpatch +++ /dev/null @@ -1,151 +0,0 @@ -#! /bin/sh -e -## man-ocamlmklib.dpatch by Samuel Mimram -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: MAnpage for ocamlmklib - -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/ocamlmklib.m ocaml/man/ocamlmklib.m ---- ocaml~/man/ocamlmklib.m 1970-01-01 01:00:00.000000000 +0100 -+++ ocaml/man/ocamlmklib.m 2008-11-29 11:31:28.000000000 +0100 -@@ -0,0 +1,127 @@ -+.\" Hey, EMACS: -*- nroff -*- -+.TH OCAMLMKLIB 1 "August 19, 2004" -+.SH NAME -+ocamlmklib \- generate libraries with mixed C / Caml code. -+.SH SYNOPSIS -+.B ocalmklib -+.RI [ options ] " files" -+.SH DESCRIPTION -+The -+.B ocamlmklib -+command facilitates the construction of libraries containing both Caml code and C code, and usable both in static linking and dynamic linking modes. -+.SH OPTIONS -+.TP -+.B \-h, \-\-help -+Show summary of options. -+.TP -+.BI \-cclib\ lib -+C library passed to ocamlc -+.B \-a -+or -+.BR ocamlopt (1) -+.B \-a -+only. -+.TP -+.BI \-ccopt\ opt -+C option passed to -+.BR ocamlc (1) -+.B \-a -+or -+.BR ocamlopt (1) -+.B \-a -+only. -+.TP -+.B \-custom -+Disable dynamic loading. -+.TP -+.BI \-dllpath\ dir -+Add -+.I dir -+to the run-time search path for DLLs. -+.TP -+.BI \-I\ dir -+Add -+.I dir -+to the path searched for Caml object files. -+.TP -+.B \-failsafe -+Fall back to static linking if DLL construction failed. -+.TP -+.BI \-ldopt\ opt -+C option passed to the shared linker only. -+.TP -+.B \-linkall -+Build Caml archive with link-all behavior. -+.TP -+.BI \-l lib -+Specify a dependent C library. -+.TP -+.BI \-L dir -+Add -+.I dir -+to the path searched for C libraries. -+.TP -+.BI \-ocamlc\ cmd -+Use -+.I cmd -+in place of -+.BR ocamlc (1). -+.TP -+.BI \-ocamlopt\ cmd -+Use -+.I cmd -+in place of -+.BR ocamlopt (1). -+.TP -+.BI \-o\ name -+Generated Caml library is named -+.IR name .cma -+or -+.IR name .cmxa. -+.TP -+.BI \-oc\ name -+Generated C library is named -+.RI dll name .so -+or -+.RI lib name .a. -+.TP -+.BI \-rpath\ dir -+Same as -+.B \-dllpath -+.IR dir . -+.TP -+.BI \-R dir -+Same as -+.BR \-rpath . -+.TP -+.B \-verbose -+Print commands before executing them. -+.TP -+\fB\-Wl\fR, \fB\-rpath \fIdir -+Same as -+.B \-dllpath -+.IR dir . -+.TP -+\fB\-Wl\fR, \fB\-rpath\ \-Wl \fIdir -+Same as -+.B \-dllpath -+.IR dir . -+.TP -+\fB\-Wl\fR, \fB\-R\fIdir -+Same as -+.B \-dllpath -+.IR dir . -+.TP -+.BI \-F dir -+Specify a framework directory (MacOSX). -+.TP -+.BI \-framework\ name -+Use framework -+.I name -+(MacOSX). -+.SH SEE ALSO -+.BR ocamlc (1), -+.BR ocamlopt (1). -+.SH AUTHOR -+This manual page was written by Samuel Mimram , -+for the Debian project (but may be used by others). -- 2.30.2