The following commit has been merged in the master branch:
commit ada7ceae43ac9b237f4d4e8f9f3102e57d75b330
Author: Mehdi Dogguy <me...@debian.org>
Date:   Tue Nov 1 22:15:23 2011 +0100

    Refresh patches

diff --git a/debian/changelog b/debian/changelog
index 4d062ce..1225bbe 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,11 @@
 jocaml (3.12.1-1) UNRELEASED; urgency=low
 
   * New upstream release
+  * Refresh patches
+    - Remvove 0003-Fix-ocamlopt-w.r.t.-binutils-2.21.patch which was
+      integrated into this latest release.
 
- -- Mehdi Dogguy <me...@debian.org>  Tue, 01 Nov 2011 22:13:51 +0100
+ -- Mehdi Dogguy <me...@debian.org>  Tue, 01 Nov 2011 22:19:55 +0100
 
 jocaml (3.12.0-1) unstable; urgency=low
 
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 ce23311..3a42b83 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
@@ -9,7 +9,7 @@ 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 45bca05..2a36e7a 100644
+index cd4cfa5..4ad2e3e 100644
 --- a/typing/oprint.ml
 +++ b/typing/oprint.ml
 @@ -213,7 +213,6 @@ and print_simple_out_type ppf =
@@ -33,7 +33,7 @@ index b68f0a7..7c41091 100644
  and out_variant =
    | Ovar_fields of (string * bool * out_type list) list
 diff --git a/typing/printtyp.ml b/typing/printtyp.ml
-index fc6311f..1006b92 100644
+index 6178561..acccb3a 100644
 --- a/typing/printtyp.ml
 +++ b/typing/printtyp.ml
 @@ -399,7 +399,7 @@ let rec tree_of_typexp sch ty =
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
deleted file mode 100644
index 81ffe20..0000000
--- a/debian/patches/0003-Fix-ocamlopt-w.r.t.-binutils-2.21.patch
+++ /dev/null
@@ -1,66 +0,0 @@
-From: Stephane Glondu <st...@glondu.net>
-Date: Tue, 8 Mar 2011 21:17:40 +0100
-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
-
-Bug: http://caml.inria.fr/mantis/view.php?id=5237
-Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=617404
-Authors: Eric Cooper, spiralvoice
-Reviewed-by: St├ęphane Glondu <st...@glondu.net>
----
- asmcomp/amd64/emit.mlp |   13 +++++++------
- asmcomp/i386/emit.mlp  |    6 +++---
- 2 files changed, 10 insertions(+), 9 deletions(-)
-
-diff --git a/asmcomp/amd64/emit.mlp b/asmcomp/amd64/emit.mlp
-index 0a210f0..5022fe9 100644
---- a/asmcomp/amd64/emit.mlp
-+++ b/asmcomp/amd64/emit.mlp
-@@ -688,17 +688,18 @@ let fundecl fundecl =
-   emit_all true fundecl.fun_body;
-   List.iter emit_call_gc !call_gc_sites;
-   emit_call_bound_errors ();
-+  begin match Config.system with
-+    "linux" | "gnu" ->
-+      `       .type   {emit_symbol fundecl.fun_name},@function\n`;
-+      `       .size   {emit_symbol fundecl.fun_name},.-{emit_symbol 
fundecl.fun_name}\n`
-+    | _ -> ()
-+  end;
-   if !float_constants <> [] then begin
-     if macosx
-     then `    .literal8\n`
-     else `    .section        .rodata.cst8,\"a\",@progbits\n`;
-     List.iter emit_float_constant !float_constants
--  end;
--  match Config.system with
--    "linux" | "gnu" ->
--      `       .type   {emit_symbol fundecl.fun_name},@function\n`;
--      `       .size   {emit_symbol fundecl.fun_name},.-{emit_symbol 
fundecl.fun_name}\n`
--  | _ -> ()
-+  end
- 
- (* Emission of data *)
- 
-diff --git a/asmcomp/i386/emit.mlp b/asmcomp/i386/emit.mlp
-index 16ee67e..cf162c5 100644
---- a/asmcomp/i386/emit.mlp
-+++ b/asmcomp/i386/emit.mlp
-@@ -905,12 +905,12 @@ let fundecl fundecl =
-   emit_all true fundecl.fun_body;
-   List.iter emit_call_gc !call_gc_sites;
-   emit_call_bound_errors ();
--  List.iter emit_float_constant !float_constants;
--  match Config.system with
-+  begin match Config.system with
-     "linux_elf" | "bsd_elf" | "gnu" ->
-       `       .type   {emit_symbol fundecl.fun_name},@function\n`;
-       `       .size   {emit_symbol fundecl.fun_name},.-{emit_symbol 
fundecl.fun_name}\n`
--  | _ -> ()
-+  | _ -> () end;
-+  List.iter emit_float_constant !float_constants
- 
- 
- (* Emission of data *)
--- 
diff --git a/debian/patches/0004-Natdynlink-works-on-powerpc.patch 
b/debian/patches/0003-Natdynlink-works-on-powerpc.patch
similarity index 90%
rename from debian/patches/0004-Natdynlink-works-on-powerpc.patch
rename to debian/patches/0003-Natdynlink-works-on-powerpc.patch
index 79653a2..b17a5be 100644
--- a/debian/patches/0004-Natdynlink-works-on-powerpc.patch
+++ b/debian/patches/0003-Natdynlink-works-on-powerpc.patch
@@ -12,10 +12,10 @@ Signed-off-by: Stephane Glondu <st...@glondu.net>
  1 files changed, 1 insertions(+), 1 deletions(-)
 
 diff --git a/configure b/configure
-index 3f99f6f..00b0cb9 100755
+index 1cdf960..2eef8d4 100755
 --- a/configure
 +++ b/configure
-@@ -656,7 +656,7 @@ if test $withsharedlibs = "yes"; then
+@@ -657,7 +657,7 @@ if test $withsharedlibs = "yes"; then
          natdynlink=true
        fi;;
      i[3456]86-*-darwin[89]*)      natdynlink=true;;
diff --git a/debian/patches/series b/debian/patches/series
index 8435d3f..4307fe0 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
 0001-Replace-Otyp_proc-with-Otyp_stuff-to-make-outcometre.patch
 0002-Add-option-v-to-expunge-to-select-modules-to-filter-.patch
-0003-Fix-ocamlopt-w.r.t.-binutils-2.21.patch
-0004-Natdynlink-works-on-powerpc.patch
+0003-Natdynlink-works-on-powerpc.patch

-- 
jocaml packaging

_______________________________________________
Pkg-ocaml-maint-commits mailing list
Pkg-ocaml-maint-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-ocaml-maint-commits

Reply via email to