[Pkg-ocaml-maint-commits] r2665 - in /trunk/packages/ocaml/trunk/debian: changelog patches/dumpobj.dpatch patches/missing-manpage-links.dpatch patches/no_rpath.dpatch patches/stdlib_man_section.dpatch

Thu May 4 11:10:51 UTC 2006

Author: jcristau-guest
Date: Thu May  4 11:10:46 2006
New Revision: 2665

URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/?sc=1&rev=2665
Log:
* 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.

Added:
    trunk/packages/ocaml/trunk/debian/patches/missing-manpage-links.dpatch   (with props)
    trunk/packages/ocaml/trunk/debian/patches/stdlib_man_section.dpatch   (with props)
Modified:
    trunk/packages/ocaml/trunk/debian/changelog
    trunk/packages/ocaml/trunk/debian/patches/dumpobj.dpatch
    trunk/packages/ocaml/trunk/debian/patches/no_rpath.dpatch

Modified: trunk/packages/ocaml/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocaml/trunk/debian/changelog?rev=2665&op=diff
==============================================================================

--- trunk/packages/ocaml/trunk/debian/changelog (original)
+++ trunk/packages/ocaml/trunk/debian/changelog Thu May  4 11:10:46 2006
@@ -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 at ens-lyon.org>  Thu,  4 May 2006 13:08:00 +0200
+
 ocaml (3.09.2-1) experimental; urgency=low
 
   * New upstream release.

Modified: trunk/packages/ocaml/trunk/debian/patches/dumpobj.dpatch
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocaml/trunk/debian/patches/dumpobj.dpatch?rev=2665&op=diff
==============================================================================
--- trunk/packages/ocaml/trunk/debian/patches/dumpobj.dpatch (original)
+++ trunk/packages/ocaml/trunk/debian/patches/dumpobj.dpatch Thu May  4 11:10:46 2006
@@ -22,23 +22,23 @@
 --- 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 at debian.org>,
 +for the Debian GNU/Linux system (but may be used by others).

Added: trunk/packages/ocaml/trunk/debian/patches/missing-manpage-links.dpatch
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocaml/trunk/debian/patches/missing-manpage-links.dpatch?rev=2665&op=file
==============================================================================
--- trunk/packages/ocaml/trunk/debian/patches/missing-manpage-links.dpatch (added)
+++ trunk/packages/ocaml/trunk/debian/patches/missing-manpage-links.dpatch Thu May  4 11:10:46 2006
@@ -1,0 +1,16 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## missing-manpage-links.dpatch by  <julien.cristau at ens-lyon.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+ at 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)

Propchange: trunk/packages/ocaml/trunk/debian/patches/missing-manpage-links.dpatch
------------------------------------------------------------------------------
    svn:executable = *

Modified: trunk/packages/ocaml/trunk/debian/patches/no_rpath.dpatch
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocaml/trunk/debian/patches/no_rpath.dpatch?rev=2665&op=diff
==============================================================================
--- trunk/packages/ocaml/trunk/debian/patches/no_rpath.dpatch (original)
+++ trunk/packages/ocaml/trunk/debian/patches/no_rpath.dpatch Thu May  4 11:10:46 2006
@@ -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 @@
            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%%

Added: trunk/packages/ocaml/trunk/debian/patches/stdlib_man_section.dpatch
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocaml/trunk/debian/patches/stdlib_man_section.dpatch?rev=2665&op=file
==============================================================================
--- trunk/packages/ocaml/trunk/debian/patches/stdlib_man_section.dpatch (added)
+++ trunk/packages/ocaml/trunk/debian/patches/stdlib_man_section.dpatch Thu May  4 11:10:46 2006
@@ -1,0 +1,19 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## stdlib_man_section.dpatch by Julien Cristau <julien.cristau at ens-lyon.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Put manpages in section 3o instead of 3.
+
+ at 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

Propchange: trunk/packages/ocaml/trunk/debian/patches/stdlib_man_section.dpatch
------------------------------------------------------------------------------
    svn:executable = *


