[Pkg-ocaml-maint-commits] [SCM] jocaml packaging branch, master, updated. debian/3.11.2.a-1-9-g15093e0

Sun Apr 17 12:39:10 UTC 2011

The following commit has been merged in the master branch:
commit e221983f2c936998b49fc647937bdc91cff0f1cb
Author: Mehdi Dogguy <mehdi at debian.org>
Date:   Sun Apr 17 13:38:51 2011 +0200

    Refresh patches

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
index 22edab7..ce23311 100644
--- 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
@@ -1,5 +1,5 @@
-From: Mehdi Dogguy <dogguy at pps.jussieu.fr>
-Date: Tue, 23 Jun 2009 18:05:26 +0200
+From: Mehdi Dogguy <mehdi at debian.org>
+Date: Sun, 17 Apr 2011 13:37:18 +0200
 Subject: [PATCH] Replace Otyp_proc with Otyp_stuff "" to make outcometree.mli compatible with the one from OCaml
 
 ---
@@ -9,40 +9,40 @@ Subject: [PATCH] Replace Otyp_proc with Otyp_stuff "" to make outcometree.mli co
  3 files changed, 1 insertions(+), 3 deletions(-)
 
 diff --git a/typing/oprint.ml b/typing/oprint.ml
-index 825d550..3e254f7 100644
+index 45bca05..2a36e7a 100644
 --- a/typing/oprint.ml
 +++ b/typing/oprint.ml
-@@ -209,7 +209,6 @@ and print_simple_out_type ppf =
+@@ -213,7 +213,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
+   | Otyp_module (p, n, tyl) ->
+       fprintf ppf "@[<1>(module %s" p;
+       let first = ref true in
 diff --git a/typing/outcometree.mli b/typing/outcometree.mli
-index aa3b327..8240e4b 100644
+index b68f0a7..7c41091 100644
 --- a/typing/outcometree.mli
 +++ b/typing/outcometree.mli
-@@ -60,7 +60,6 @@ type out_type =
-   | Otyp_variant of
+@@ -61,7 +61,6 @@ type out_type =
        bool * out_variant * bool * (string list) option
    | Otyp_poly of string list * out_type
+   | Otyp_module of string * string list * out_type list
 -  | 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 978a773..a203e80 100644
+index fc6311f..1006b92 100644
 --- a/typing/printtyp.ml
 +++ b/typing/printtyp.ml
-@@ -385,7 +385,7 @@ let rec tree_of_typexp sch ty =
+@@ -399,7 +399,7 @@ let rec tree_of_typexp sch ty =
          end
      | Tunivar ->
          Otyp_var (false, name_of_type ty)
 -    | Tproc _ -> Otyp_proc
 +    | Tproc _ -> Otyp_stuff ""
+     | Tpackage (p, n, tyl) ->
+         Otyp_module (Path.name p, n, tree_of_typlist sch tyl)
    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/0002-Add-option-v-to-expunge-to-select-modules-to-filter-.patch b/debian/patches/0002-Add-option-v-to-expunge-to-select-modules-to-filter-.patch
index 1834a23..edd706b 100644
--- a/debian/patches/0002-Add-option-v-to-expunge-to-select-modules-to-filter-.patch
+++ b/debian/patches/0002-Add-option-v-to-expunge-to-select-modules-to-filter-.patch
@@ -7,7 +7,7 @@ Subject: [PATCH] Add option -v to expunge to select modules to filter instead of
  1 files changed, 14 insertions(+), 8 deletions(-)
 
 diff --git a/toplevel/expunge.ml b/toplevel/expunge.ml
-index 05a4fe0..49fa91f 100644
+index 5e405a9..bdfef8e 100644
 --- a/toplevel/expunge.ml
 +++ b/toplevel/expunge.ml
 @@ -24,23 +24,29 @@ module StringSet =
diff --git a/debian/patches/0003-Fix-ocamlopt-w.r.t.-binutils-2.21.patch b/debian/patches/0003-Fix-ocamlopt-w.r.t.-binutils-2.21.patch
index 76d382b..81ffe20 100644
--- a/debian/patches/0003-Fix-ocamlopt-w.r.t.-binutils-2.21.patch
+++ b/debian/patches/0003-Fix-ocamlopt-w.r.t.-binutils-2.21.patch
@@ -1,6 +1,6 @@
 From: Stephane Glondu <steph at glondu.net>
 Date: Tue, 8 Mar 2011 21:17:40 +0100
-Subject: Fix ocamlopt w.r.t. binutils 2.21
+Subject: [PATCH] Fix ocamlopt w.r.t. binutils 2.21
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit
@@ -15,7 +15,7 @@ Reviewed-by: Stéphane Glondu <steph at glondu.net>
  2 files changed, 10 insertions(+), 9 deletions(-)
 
 diff --git a/asmcomp/amd64/emit.mlp b/asmcomp/amd64/emit.mlp
-index 55da47b..45afbb7 100644
+index 0a210f0..5022fe9 100644
 --- a/asmcomp/amd64/emit.mlp
 +++ b/asmcomp/amd64/emit.mlp
 @@ -688,17 +688,18 @@ let fundecl fundecl =
@@ -44,7 +44,7 @@ index 55da47b..45afbb7 100644
  (* Emission of data *)
  
 diff --git a/asmcomp/i386/emit.mlp b/asmcomp/i386/emit.mlp
-index 3baba2e..b29f365 100644
+index 16ee67e..cf162c5 100644
 --- a/asmcomp/i386/emit.mlp
 +++ b/asmcomp/i386/emit.mlp
 @@ -905,12 +905,12 @@ let fundecl fundecl =
diff --git a/debian/patches/0004-Natdynlink-works-on-powerpc.patch b/debian/patches/0004-Natdynlink-works-on-powerpc.patch
index 25cf206..79653a2 100644
--- a/debian/patches/0004-Natdynlink-works-on-powerpc.patch
+++ b/debian/patches/0004-Natdynlink-works-on-powerpc.patch
@@ -12,10 +12,10 @@ Signed-off-by: Stephane Glondu <steph at glondu.net>
  1 files changed, 1 insertions(+), 1 deletions(-)
 
 diff --git a/configure b/configure
-index 7a34621..a744e94 100755
+index 3f99f6f..00b0cb9 100755
 --- a/configure
 +++ b/configure
-@@ -625,7 +625,7 @@ if test $withsharedlibs = "yes"; then
+@@ -656,7 +656,7 @@ if test $withsharedlibs = "yes"; then
          natdynlink=true
        fi;;
      i[3456]86-*-darwin[89]*)      natdynlink=true;;

-- 
jocaml packaging

