* Add a patch to put stdlib manpages in section 3o.

* Fix typo in ocamldumpobj(1).
* Add symlinks so that ocamldep.opt(1) and ocamllex.opt(1) exist.
* Unfuzzy no_rpath.dpatch.

diff --git a/debian/changelog b/debian/changelog
index 9c1db448e9603500c27ee65eaab256801d849027..30f7abe967bfa1fa09de0f624f35f1ebb620ebdd 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+ocaml (3.09.2-2) experimental; urgency=low
+
+  * Add a patch to put stdlib manpages in section 3o.
+  * Fix typo in ocamldumpobj(1).
+  * Add symlinks so that ocamldep.opt(1) and ocamllex.opt(1) exist.
+
+ -- Julien Cristau <julien.cristau@ens-lyon.org>  Thu,  4 May 2006 13:08:00 +0200
+
 ocaml (3.09.2-1) experimental; urgency=low
 
   * New upstream release.

diff --git a/debian/patches/dumpobj.dpatch b/debian/patches/dumpobj.dpatch
index 2be24b25190709cdb351771a4b29766113751c40..4d9907c2eb7f89ed02f9054c2e9ceae833941601 100755 (executable)
--- a/debian/patches/dumpobj.dpatch
+++ b/debian/patches/dumpobj.dpatch
@@ -22,23 +22,23 @@ diff -urNad ocaml-3.09.1~/man/ocamldumpobj.m ocaml-3.09.1/man/ocamldumpobj.m
 --- ocaml-3.09.1~/man/ocamldumpobj.m   1970-01-01 01:00:00.000000000 +0100
 +++ ocaml-3.09.1/man/ocamldumpobj.m    2006-01-04 20:44:49.000000000 +0100
 @@ -0,0 +1,20 @@
-+.TH OCAMLDUMOBJ 1 "January 4, 2006"
++.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/patches/missing-manpage-links.dpatch b/debian/patches/missing-manpage-links.dpatch
new file mode 100755 (executable)
index 0000000..b131adc
--- /dev/null
+++ b/debian/patches/missing-manpage-links.dpatch
@@ -0,0 +1,16 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## missing-manpage-links.dpatch by  <julien.cristau@ens-lyon.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+@DPATCH@
+diff -urNad ocaml-3.09.2~/man/Makefile ocaml-3.09.2/man/Makefile
+--- ocaml-3.09.2~/man/Makefile 2002-04-24 11:09:35.000000000 +0200
++++ ocaml-3.09.2/man/Makefile  2006-05-04 00:27:38.000000000 +0200
+@@ -20,3 +20,5 @@
+       for i in *.m; do cp $$i $(DIR)/`basename $$i .m`.$(MANEXT); done
+       echo '.so man$(MANEXT)/ocamlc.$(MANEXT)' > $(DIR)/ocamlc.opt.$(MANEXT)
+       echo '.so man$(MANEXT)/ocamlopt.$(MANEXT)' > $(DIR)/ocamlopt.opt.$(MANEXT)
++      echo '.so man$(MANEXT)/ocamldep.$(MANEXT)' > $(DIR)/ocamldep.opt.$(MANEXT)
++      echo '.so man$(MANEXT)/ocamllex.$(MANEXT)' > $(DIR)/ocamllex.opt.$(MANEXT)

diff --git a/debian/patches/no_rpath.dpatch b/debian/patches/no_rpath.dpatch
index 94725c9113f0a2f3434ac918814f18fdbdc1e816..024259492d8ca1ea4c954add08e662ebe591325f 100755 (executable)
--- a/debian/patches/no_rpath.dpatch
+++ b/debian/patches/no_rpath.dpatch
@@ -7,9 +7,9 @@
 
 @DPATCH@
 diff -urNad ocaml-3.09.2~/tools/Makefile ocaml-3.09.2/tools/Makefile
---- ocaml-3.09.2~/tools/Makefile       2006-04-18 14:25:24.000000000 +0000
-+++ ocaml-3.09.2/tools/Makefile        2006-04-18 14:32:09.000000000 +0000
-@@ -102,9 +102,6 @@
+--- ocaml-3.09.2~/tools/Makefile       2006-05-04 00:05:39.000000000 +0200
++++ ocaml-3.09.2/tools/Makefile        2006-05-04 00:05:40.000000000 +0200
+@@ -104,9 +104,6 @@
        sed -e "s|%%BINDIR%%|$(BINDIR)|" \
              -e "s|%%SUPPORTS_SHARED_LIBRARIES%%|$(SUPPORTS_SHARED_LIBRARIES)|" \
              -e "s|%%MKSHAREDLIB%%|$(MKSHAREDLIB)|" \
@@ -20,8 +20,8 @@ diff -urNad ocaml-3.09.2~/tools/Makefile ocaml-3.09.2/tools/Makefile
            ocamlmklib.mlp >> ocamlmklib.ml
  
 diff -urNad ocaml-3.09.2~/tools/ocamlmklib.mlp ocaml-3.09.2/tools/ocamlmklib.mlp
---- ocaml-3.09.2~/tools/ocamlmklib.mlp 2004-11-27 01:04:19.000000000 +0000
-+++ ocaml-3.09.2/tools/ocamlmklib.mlp  2006-04-18 14:32:09.000000000 +0000
+--- ocaml-3.09.2~/tools/ocamlmklib.mlp 2006-05-04 00:01:58.000000000 +0200
++++ ocaml-3.09.2/tools/ocamlmklib.mlp  2006-05-04 00:05:40.000000000 +0200
 @@ -17,9 +17,9 @@
  let bindir = "%%BINDIR%%"
  and supports_shared_libraries = %%SUPPORTS_SHARED_LIBRARIES%%

diff --git a/debian/patches/stdlib_man_section.dpatch b/debian/patches/stdlib_man_section.dpatch
new file mode 100755 (executable)
index 0000000..2453bd8
--- /dev/null
+++ b/debian/patches/stdlib_man_section.dpatch
@@ -0,0 +1,19 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## stdlib_man_section.dpatch by Julien Cristau <julien.cristau@ens-lyon.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Put manpages in section 3o instead of 3.
+
+@DPATCH@
+diff -urNad ocaml-3.09.2~/ocamldoc/Makefile ocaml-3.09.2/ocamldoc/Makefile
+--- ocaml-3.09.2~/ocamldoc/Makefile    2005-11-10 15:44:36.000000000 +0100
++++ ocaml-3.09.2/ocamldoc/Makefile     2006-05-04 00:07:52.000000000 +0200
+@@ -314,7 +314,7 @@
+ stdlib_man/Pervasives.3o: $(STDLIB_MLIS)
+       $(MKDIR) stdlib_man
+       $(OCAMLDOC_RUN) -man -d stdlib_man $(INCLUDES) \
+-      -t "OCaml library" -man-mini \
++      -t "OCaml library" -man-mini -man-section 3o \
+       $(STDLIB_MLIS)
+ 
+ autotest_stdlib: dummy