[Pkg-ocaml-maint-commits] [SCM] otags packaging branch, master, updated. debian/3.09.3-4-12-g5b8e80c

[Stephane Glondu]

The following commit has been merged in the master branch:
commit a746f09c13f453a1c00df10d93078bbced5bcde0
Author: Stephane Glondu <steph at glondu.net>
Date:   Tue Nov 16 23:11:32 2010 +0100

    Add 0004-Compatibility-with-Camlp5-6.02.2.patch
    
    Note: probably not backward-compatible...

diff --git a/debian/control b/debian/control
index a5f2cab..ae804d5 100644
--- a/debian/control
+++ b/debian/control
@@ -10,7 +10,7 @@ Build-Depends:
  ocaml-nox (>= 3.11.1-3~),
  debhelper (>= 7.2.11~),
  dh-ocaml (>= 0.9~),
- camlp5
+ camlp5 (>= 6.02.0)
 Standards-Version: 3.8.4
 Homepage: http://www.cs.ru.nl/~tews/otags/
 Vcs-Git: git://git.debian.org/git/pkg-ocaml-maint/packages/otags.git
diff --git a/debian/patches/0004-Compatibility-with-Camlp5-6.02.2.patch b/debian/patches/0004-Compatibility-with-Camlp5-6.02.2.patch
new file mode 100644
index 0000000..503b69e
--- /dev/null
+++ b/debian/patches/0004-Compatibility-with-Camlp5-6.02.2.patch
@@ -0,0 +1,62 @@
+From: Stephane Glondu <steph at glondu.net>
+Date: Tue, 16 Nov 2010 23:04:20 +0100
+Subject: [PATCH] Compatibility with Camlp5 6.02.2
+
+---
+ pr.ml |   14 +++++++++-----
+ 1 files changed, 9 insertions(+), 5 deletions(-)
+
+diff --git a/pr.ml b/pr.ml
+index b57173b..fb9e486 100644
+--- a/pr.ml
++++ b/pr.ml
+@@ -32,6 +32,10 @@ module Tags = functor (T : Tags_param) -> struct
+     | <:patt< ( $p$ : $t$ ) >> -> pe_patt p
+     | <:patt< $_$ >> -> ()
+ 
++  let option_iter f = function
++    | Some x -> f x
++    | None -> ()
++
+   let rec pe_ctyp ast = 
+     (* let loc = kludge (MLast.loc_of_ctyp ast) in *)
+     match ast with
+@@ -40,7 +44,7 @@ module Tags = functor (T : Tags_param) -> struct
+     | <:ctyp< { $list:sbtl$ } >> ->
+       List.iter (fun (loc,s,_,c) -> T.add s (kludge loc); pe_ctyp c) sbtl
+     | <:ctyp< [ $list:stll$ ] >> ->
+-      List.iter (fun (loc,s,l) -> T.add s (kludge loc); List.iter pe_ctyp l) stll
++      List.iter (fun (loc,s,l,c) -> T.add s (kludge loc); List.iter pe_ctyp l; option_iter pe_ctyp c) stll
+     | _ -> ()
+ 
+ 
+@@ -63,7 +67,7 @@ let rec pe_class_expr ast =
+   | <:class_expr< $ce$ $expr$ >> -> pe_class_expr ce
+   | <:class_expr< fun $p$ -> $cfb$ >> -> pe_class_expr cfb
+   | <:class_expr< ($ce$ : $ct$) >> -> pe_class_expr ce
+-  | <:class_expr< $list:id$ [ $list:tl$ ] >> -> ()
++  | <:class_expr< $id$ [ $tl$ ] >> -> ()
+ (* next one is possible but not neccessary *)
+ (* | <:class_expr< $list:id$ >> -> () *)
+             
+@@ -99,7 +103,7 @@ let rec pe_class_sig_item ast =
+ let rec pe_class_type ast =
+   (* let loc = kludge (MLast.loc_of_class_type ast) in *)
+   match ast with
+-    | <:class_type< $list:id$ [ $list:tl$ ] >> -> ()
++    | <:class_type< $id$ [ $tl$ ] >> -> ()
+ (* possible but not necessary
+  *     | <:class_type< $list:id$ >> -> ()
+  *)
+@@ -209,8 +213,8 @@ let rec interf = function
+   | [] -> ()
+   | (a, _) :: l -> pe_sig_item a; interf l
+ 
+-let _ = Pcaml.print_implem := implem
+-let _ = Pcaml.print_interf := interf
++let _ = Pcaml.print_implem := fun (x, _) -> implem x
++let _ = Pcaml.print_interf := fun (x, _) -> interf x
+ 
+ (* switch off lexing of quotations *)
+ let _ = Plexer.no_quotations := true
+-- 
diff --git a/debian/patches/series b/debian/patches/series
index ea20ee1..2f70220 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 0001-Change-install-directory.patch
 0002-Use-camlp5-instead-of-camlp4.patch
 0003-Do-not-set-an-upper-bound-on-supported-OCaml-version.patch
+0004-Compatibility-with-Camlp5-6.02.2.patch

-- 
otags packaging