[Pkg-ocaml-maint-commits] r2601 - in trunk/packages/ocaml/trunk/debian: . patches

[Samuel Mimram]

Author: smimram
Date: 2006-03-25 13:44:49 +0000 (Sat, 25 Mar 2006)
New Revision: 2601

Modified:
   trunk/packages/ocaml/trunk/debian/ocaml-base-nox.README.Debian
   trunk/packages/ocaml/trunk/debian/patches/pr_o.dpatch
Log:
Updated pr_o.dpatch (it was not applying successfully before).

Modified: trunk/packages/ocaml/trunk/debian/ocaml-base-nox.README.Debian
===================================================================
--- trunk/packages/ocaml/trunk/debian/ocaml-base-nox.README.Debian	2006-03-25 12:52:13 UTC (rev 2600)
+++ trunk/packages/ocaml/trunk/debian/ocaml-base-nox.README.Debian	2006-03-25 13:44:49 UTC (rev 2601)
@@ -44,7 +44,7 @@
   4) Starting from ocaml 3.05, ocaml now puts all dll.so files into a common
   stublibs directory, so the ocaml-ldconf tool for handling the ld.conf
   file is not needed anymore, but we will still keep it aroung until all
-  libraries are ported. As of ocam l3.08, ocaml-ldconf is now deprecated
+  libraries are ported. As of ocaml 3.08, ocaml-ldconf is now deprecated
   and not available anymore.
   Notice that user installed dll.so files should go into
   /usr/local/lib/ocaml/<ocaml_version>/stublibs which is searched before

Modified: trunk/packages/ocaml/trunk/debian/patches/pr_o.dpatch
===================================================================
--- trunk/packages/ocaml/trunk/debian/patches/pr_o.dpatch	2006-03-25 12:52:13 UTC (rev 2600)
+++ trunk/packages/ocaml/trunk/debian/patches/pr_o.dpatch	2006-03-25 13:44:49 UTC (rev 2601)
@@ -5,21 +5,16 @@
 ## DP: Upstream fix for camlp4 (PR#3948, debian bug 355651)
 
 @DPATCH@
-
-Index: camlp4/etc/pr_o.ml
-===================================================================
-RCS file: /net/yquem/devel/caml/repository/csl/camlp4/etc/pr_o.ml,v
-retrieving revision 1.49.2.1
-diff -u -r1.49.2.1 pr_o.ml
---- camlp4/etc/pr_o.ml	3 Jan 2006 18:12:30 -0000	1.49.2.1
-+++ camlp4/etc/pr_o.ml	5 Jan 2006 10:39:28 -0000
+diff -urNad ocaml-3.09.1~/camlp4/etc/pr_o.ml ocaml-3.09.1/camlp4/etc/pr_o.ml
+--- ocaml-3.09.1~/camlp4/etc/pr_o.ml    2006-01-03 18:12:30.000000000 +0000
++++ ocaml-3.09.1/camlp4/etc/pr_o.ml     2006-03-25 13:42:35.000000000 +0000
 @@ -1408,7 +1408,8 @@
          <:expr< while $_$ do { $list:_$ } >> | <:expr< ($list: _$) >> |
          <:expr< let $opt:_$ $list:_$ in $_$ >> |
          <:expr< let module $_$ = $_$ in $_$ >> |
 -        <:expr< new $list:_$ >> | 
-+	(* Note: `new' is treated differently in pa_o and in pa_r,
-+	   and should not occur at this level *)
++       (* Note: `new' is treated differently in pa_o and in pa_r,
++          and should not occur at this level *)
          <:expr< assert $_$ >> | <:expr< lazy $_$ >> as e ->
            fun curr next dg k ->
              [: `S LO "("; `expr e "" [: `HVbox [: `S RO ")"; k :] :] :]