From: Julien Cristau <julien.cristau@ens-lyon.org>
Date: Thu, 9 Mar 2006 16:49:22 +0000 (+0000)
Subject: Add patch from upstream to fix handling of `new' in camlp4 (Closes: #355651).
X-Git-Tag: archive/raspbian/4.08.1-4+rpi1~3^2~659
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=80db9842d7649f6f96bad264731ab276c971bc39;p=ocaml.git

Add patch from upstream to fix handling of `new' in camlp4 (Closes: #355651).
---

diff --git a/debian/changelog b/debian/changelog
index 5c361c7f..3cf99341 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,8 +2,10 @@ ocaml (3.09.1-4) UNRELEASED; urgency=low
 
   * Remove dh_gencontrol line for ocaml-source from the binary-arch target
     (ocaml-source is built in binary-indep).
+  * Add patch from upstream to fix handling of `new' in camlp4 (Closes:
+    #355651).
 
- -- Julien Cristau <julien.cristau@ens-lyon.org>  Thu,  9 Feb 2006 20:25:12 +0100
+ -- Julien Cristau <julien.cristau@ens-lyon.org>  Thu,  9 Mar 2006 17:39:56 +0100
 
 ocaml (3.09.1-3) unstable; urgency=low
 
diff --git a/debian/patches/00list b/debian/patches/00list
index f628d34e..64990b6a 100644
--- a/debian/patches/00list
+++ b/debian/patches/00list
@@ -5,3 +5,4 @@ man-ocamlmklib
 kbsd-gnu
 alpha_ld_no-relax
 call_ld_with_proper_flags
+pr_o
diff --git a/debian/patches/pr_o.dpatch b/debian/patches/pr_o.dpatch
new file mode 100644
index 00000000..46c0da60
--- /dev/null
+++ b/debian/patches/pr_o.dpatch
@@ -0,0 +1,25 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## pr_o.dpatch by Julien Cristau <julien.cristau@ens-lyon.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## 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
+@@ -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 *)
+         <:expr< assert $_$ >> | <:expr< lazy $_$ >> as e ->
+           fun curr next dg k ->
+             [: `S LO "("; `expr e "" [: `HVbox [: `S RO ")"; k :] :] :]