From: Sven Luther Date: Thu, 19 Aug 2004 16:58:06 +0000 (+0000) Subject: Removed camlp4-coq-fix now fixed upstream. X-Git-Tag: archive/raspbian/4.08.1-4+rpi1~3^2~773 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=36108dcd9f7a6f7f6948c6d9b50ab6dc53432695;p=ocaml.git Removed camlp4-coq-fix now fixed upstream. Added ocamlmklib man page, courtesy of Samuel Mimram. --- diff --git a/debian/changelog b/debian/changelog index 45f8408c..05269622 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,10 +1,12 @@ -ocaml (3.08.0-1) unstable; urgency=high +ocaml (3.08.1-1) unstable; urgency=high * New upstream stable point release. * Dropped QPL 6c qnd choice of venue clause from the QPL licence. * The emacs files are now under GPL, adding them again. + * Added ocamlmklib man page, courtesy of Samuel Mimram . + * Removed camlp4-coq-fix, since it is now fixed upstream. - -- Sven Luther Thu, 19 Aug 2004 16:49:26 +0200 + -- Sven Luther Thu, 19 Aug 2004 18:49:30 +0200 ocaml (3.08.0-2) unstable; urgency=low diff --git a/debian/patches/00list b/debian/patches/00list index a06bbfd2..858d13e0 100644 --- a/debian/patches/00list +++ b/debian/patches/00list @@ -1,3 +1,3 @@ versioned_libdir objinfo -camlp4-coq-fix +man-ocamlmklib diff --git a/debian/patches/camlp4-coq-fix.dpatch b/debian/patches/camlp4-coq-fix.dpatch deleted file mode 100644 index 5defb205..00000000 --- a/debian/patches/camlp4-coq-fix.dpatch +++ /dev/null @@ -1,33 +0,0 @@ -#! /bin/sh -e -## camlp4-coq-fix.dpatch by Hugo Herbelin -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: Makefiles, configure scripts and other build stuff adapted for -## DP: debian package creation - -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 -urN ocaml-3.08.0.orig/camlp4/lib/Makefile ocaml-3.08.0/camlp4/lib/Makefile ---- ocaml-3.08.0.orig/camlp4/lib/Makefile 2004-07-09 17:09:46.000000000 +0200 -+++ ocaml-3.08.0/camlp4/lib/Makefile 2004-07-21 18:00:43.180226344 +0200 -@@ -48,7 +48,7 @@ - test -f $(TARGET:.cma=.cmxa) && $(MAKE) installopt LIBDIR="$(LIBDIR)" || true - - installopt: -- for f in $(TARGET:.cma=.cmxa) $(TARGET:.cma=.p.cmxa) ; do \ -+ for f in $(TARGET:.cma=.cmxa) *.cmx $(TARGET:.cma=.p.cmxa) ; do \ - test -f $$f && cp $$f "$(LIBDIR)/camlp4/." || true ; \ - done - # Special treatment for this one: some versions of make don't like $(A) in $(TARGET:.cma=.$(A)) diff --git a/debian/patches/man-ocamlmklib.dpatch b/debian/patches/man-ocamlmklib.dpatch new file mode 100644 index 00000000..adde94e0 --- /dev/null +++ b/debian/patches/man-ocamlmklib.dpatch @@ -0,0 +1,151 @@ +#! /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 -urN ocaml-3.08.1.orig/man/ocamlmklib.m ocaml-3.08.1/man/ocamlmklib.m +--- ocaml-3.08.1.orig/man/ocamlmklib.m 1970-01-01 01:00:00.000000000 +0100 ++++ ocaml-3.08.1/man/ocamlmklib.m 2004-08-19 18:38:55.000000000 +0200 +@@ -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/patches/objinfo.dpatch b/debian/patches/objinfo.dpatch index acd7ae07..4e91dd77 100755 --- a/debian/patches/objinfo.dpatch +++ b/debian/patches/objinfo.dpatch @@ -2,8 +2,7 @@ ## ocamlobjinfo.dpatch by ## ## All lines beginning with `## DP:' are a description of the patch. -## DP: Makefiles, configure scripts and other build stuff adapted for -## DP: debian package creation +## DP: ship ocamlobjinfo and add a manpage for it. if [ $# -ne 1 ]; then echo "`basename $0`: script expects -patch|-unpatch as argument" >&2 diff --git a/debian/patches/versioned_libdir.dpatch b/debian/patches/versioned_libdir.dpatch index f72a8d80..77232b61 100755 --- a/debian/patches/versioned_libdir.dpatch +++ b/debian/patches/versioned_libdir.dpatch @@ -2,8 +2,7 @@ ## versioned_libdir.dpatch by ## ## All lines beginning with `## DP:' are a description of the patch. -## DP: Makefiles, configure scripts and other build stuff adapted for -## DP: debian package creation +## DP: Add the version as path element for OCAML_LIBDIR. if [ $# -ne 1 ]; then echo "`basename $0`: script expects -patch|-unpatch as argument" >&2