[Pkg-ocaml-maint-commits] [SCM] jocaml packaging branch, master, updated. debian/3.11.0-3-12-g2c617ef

[Mehdi Dogguy]

The following commit has been merged in the master branch:
commit 860f1c452d23c54bff1d6b0d46b06e4028d3bae4
Author: Mehdi Dogguy <dogguy at pps.jussieu.fr>
Date:   Wed Jun 24 09:11:26 2009 +0200

    Add a patch and update build-deps

diff --git a/debian/control b/debian/control
index a8779ab..3691864 100644
--- a/debian/control
+++ b/debian/control
@@ -6,7 +6,8 @@ Uploaders:
  Mehdi Dogguy <dogguy at pps.jussieu.fr>,
  Samuel Mimram <smimram at debian.org>
 Build-Depends:
- debhelper (>= 7),
+ debhelper (>= 7.0.52),
+ quilt (>= 0.46-7),
  autotools-dev,
  libx11-dev,
  libncurses5-dev,
diff --git a/debian/patches/0001-Replace-Otyp_proc-with-Otyp_stuff-to-make-outcometre.patch b/debian/patches/0001-Replace-Otyp_proc-with-Otyp_stuff-to-make-outcometre.patch
new file mode 100644
index 0000000..d0a7115
--- /dev/null
+++ b/debian/patches/0001-Replace-Otyp_proc-with-Otyp_stuff-to-make-outcometre.patch
@@ -0,0 +1,48 @@
+From: Mehdi Dogguy <dogguy at pps.jussieu.fr>
+Date: Tue, 23 Jun 2009 18:05:26 +0200
+Subject: [PATCH] Replace Otyp_proc with Otyp_stuff "" to make outcometree.mli compatible with the one from OCaml
+
+---
+ typing/oprint.ml       |    1 -
+ typing/outcometree.mli |    1 -
+ typing/printtyp.ml     |    2 +-
+ 3 files changed, 1 insertions(+), 3 deletions(-)
+
+diff --git a/typing/oprint.ml b/typing/oprint.ml
+index 085c178..a6a1a04 100644
+--- a/typing/oprint.ml
++++ b/typing/oprint.ml
+@@ -209,7 +209,6 @@ and print_simple_out_type ppf =
+   | Otyp_alias _ | Otyp_poly _ | Otyp_arrow _ | Otyp_tuple _ as ty ->
+       fprintf ppf "@[<1>(%a)@]" print_out_type ty
+   | Otyp_abstract | Otyp_sum _ | Otyp_record _ | Otyp_manifest (_, _) -> ()
+-  | Otyp_proc -> ()
+ 
+ and print_fields rest ppf =
+   function
+diff --git a/typing/outcometree.mli b/typing/outcometree.mli
+index b550ab8..e9d1964 100644
+--- a/typing/outcometree.mli
++++ b/typing/outcometree.mli
+@@ -60,7 +60,6 @@ type out_type =
+   | Otyp_variant of
+       bool * out_variant * bool * (string list) option
+   | Otyp_poly of string list * out_type
+-  | Otyp_proc
+ 
+ and out_variant =
+   | Ovar_fields of (string * bool * out_type list) list
+diff --git a/typing/printtyp.ml b/typing/printtyp.ml
+index 6c72732..9832412 100644
+--- a/typing/printtyp.ml
++++ b/typing/printtyp.ml
+@@ -385,7 +385,7 @@ let rec tree_of_typexp sch ty =
+         end
+     | Tunivar ->
+         Otyp_var (false, name_of_type ty)
+-    | Tproc _ -> Otyp_proc
++    | Tproc _ -> Otyp_stuff ""
+   in
+   if List.memq px !delayed then delayed := List.filter ((!=) px) !delayed;
+   if is_aliased px && aliasable ty then begin
+-- 
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..2a3c543
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+0001-Replace-Otyp_proc-with-Otyp_stuff-to-make-outcometre.patch

-- 
jocaml packaging