[Pkg-ocaml-maint-commits] [SCM] OCaml packaging branch, 312/master, updated. debian/3.11.2-4-42-g49f9260

Fri Mar 18 23:00:52 UTC 2011

The following commit has been merged in the 312/master branch:
commit 3454e64c600852fce1adfe7bfec48745518f532a
Author: Stephane Glondu <steph at glondu.net>
Date:   Fri Mar 18 15:40:37 2011 +0100

    Refresh patches

diff --git a/debian/patches/0001-Pass-no-relax-to-ld-on-alpha.patch b/debian/patches/0001-Pass-no-relax-to-ld-on-alpha.patch
index 8cd3811..c9f4359 100644
--- a/debian/patches/0001-Pass-no-relax-to-ld-on-alpha.patch
+++ b/debian/patches/0001-Pass-no-relax-to-ld-on-alpha.patch
@@ -1,6 +1,6 @@
 From: Stefano Zacchiroli <zack at debian.org>
 Date: Tue, 19 May 2009 17:22:39 +0200
-Subject: [PATCH] Pass --no-relax to ld on alpha
+Subject: Pass --no-relax to ld on alpha
 
 Pass the --no-relax option to ld to fix a segfault in initialization
 code (bug#338437)
@@ -9,7 +9,7 @@ code (bug#338437)
  1 files changed, 3 insertions(+), 1 deletions(-)
 
 diff --git a/configure b/configure
-index 48b05b7..ff2de61 100755
+index 66ccda9..2b40fc2 100755
 --- a/configure
 +++ b/configure
 @@ -284,7 +284,8 @@ case "$bytecc,$host" in
@@ -22,7 +22,7 @@ index 48b05b7..ff2de61 100755
    cc,mips-*-irix6*)
      # Add -n32 flag to ensure compatibility with native-code compiler
      bytecccompopts="-n32"
-@@ -734,6 +735,7 @@ case "$arch,$nativecc,$system,$host_type" in
+@@ -731,6 +732,7 @@ case "$arch,$nativecc,$system,$host_type" in
                         nativecccompopts="$gcc_warnings -DSHRINKED_GNUC";;
    *,*,rhapsody,*)      nativecccompopts="$gcc_warnings -DDARWIN_VERSION_6 $dl_defs"
                         if $arch64; then partialld="ld -r -arch ppc64"; fi;;
diff --git a/debian/patches/0002-Call-ld-with-proper-flags.patch b/debian/patches/0002-Call-ld-with-proper-flags.patch
index 85cffdd..42f477a 100644
--- a/debian/patches/0002-Call-ld-with-proper-flags.patch
+++ b/debian/patches/0002-Call-ld-with-proper-flags.patch
@@ -1,6 +1,6 @@
 From: Stefano Zacchiroli <zack at debian.org>
 Date: Tue, 19 May 2009 17:23:34 +0200
-Subject: [PATCH] Call ld with proper flags
+Subject: Call ld with proper flags
 
 Filter linkflags passed to ld by ocamlopt -pack and -output-obj
 to remove the "-Wl," parts, which are only used when ocamlopt calls
@@ -10,10 +10,10 @@ gcc.
  1 files changed, 1 insertions(+), 1 deletions(-)
 
 diff --git a/configure b/configure
-index ff2de61..2872ae8 100755
+index 2b40fc2..7a34621 100755
 --- a/configure
 +++ b/configure
-@@ -1635,7 +1635,7 @@ echo "DEBUGGER=$debugger" >> Makefile
+@@ -1632,7 +1632,7 @@ echo "DEBUGGER=$debugger" >> Makefile
  echo "CC_PROFILE=$cc_profile" >> Makefile
  echo "SYSTHREAD_SUPPORT=$systhread_support" >> Makefile
  echo "PARTIALLD=$partialld" >> Makefile
diff --git a/debian/patches/0003-Don-t-use-rpath.patch b/debian/patches/0003-Don-t-use-rpath.patch
index 7729b6f..1442816 100644
--- a/debian/patches/0003-Don-t-use-rpath.patch
+++ b/debian/patches/0003-Don-t-use-rpath.patch
@@ -1,6 +1,6 @@
 From: Stefano Zacchiroli <zack at debian.org>
 Date: Tue, 19 May 2009 17:24:14 +0200
-Subject: [PATCH] Don't use rpath
+Subject: Don't use rpath
 
 ---
  tools/ocamlmklib.mlp |    5 +++++
diff --git a/debian/patches/0004-Put-manpages-in-section-3o-instead-of-3.patch b/debian/patches/0004-Put-manpages-in-section-3o-instead-of-3.patch
index 2b8a2b4..14f758b 100644
--- a/debian/patches/0004-Put-manpages-in-section-3o-instead-of-3.patch
+++ b/debian/patches/0004-Put-manpages-in-section-3o-instead-of-3.patch
@@ -1,6 +1,6 @@
 From: Julien Cristau <julien.cristau at ens-lyon.org>
 Date: Tue, 19 May 2009 17:24:52 +0200
-Subject: [PATCH] Put manpages in section 3o instead of 3
+Subject: Put manpages in section 3o instead of 3
 
 ---
  ocamldoc/Makefile |    2 +-
diff --git a/debian/patches/0005-Patch-config.sh-for-installation.patch b/debian/patches/0005-Patch-config.sh-for-installation.patch
index 7ba75ff..3308a86 100644
--- a/debian/patches/0005-Patch-config.sh-for-installation.patch
+++ b/debian/patches/0005-Patch-config.sh-for-installation.patch
@@ -1,6 +1,6 @@
 From: Ralf Treinen <treinen at debian.org>
 Date: Tue, 19 May 2009 17:28:09 +0200
-Subject: [PATCH] Patch config.sh for installation
+Subject: Patch config.sh for installation
 
 Use for installatation a patched config.sh (created by debian/rules).
 ---
diff --git a/debian/patches/0006-Install-ocamlbuild-as-a-link-on-either-.native-or-.b.patch b/debian/patches/0006-Install-ocamlbuild-as-a-link-on-either-.native-or-.b.patch
index 6fd13d0..cac2084 100644
--- a/debian/patches/0006-Install-ocamlbuild-as-a-link-on-either-.native-or-.b.patch
+++ b/debian/patches/0006-Install-ocamlbuild-as-a-link-on-either-.native-or-.b.patch
@@ -1,6 +1,6 @@
 From: Stefano Zacchiroli <zack at debian.org>
 Date: Tue, 19 May 2009 17:28:56 +0200
-Subject: [PATCH] Install ocamlbuild as a link on either .native or .byte
+Subject: Install ocamlbuild as a link on either .native or .byte
 
 ---
  build/partial-install.sh |   17 ++++++++++++++++-
diff --git a/debian/patches/0007-Fix-ocamlopt-w.r.t.-binutils-2.21.patch b/debian/patches/0007-Fix-ocamlopt-w.r.t.-binutils-2.21.patch
index fa7664c..76d382b 100644
--- a/debian/patches/0007-Fix-ocamlopt-w.r.t.-binutils-2.21.patch
+++ b/debian/patches/0007-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: [PATCH] Fix ocamlopt w.r.t. binutils 2.21
+Subject: Fix ocamlopt w.r.t. binutils 2.21
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit
@@ -15,10 +15,10 @@ 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 4a3f844..525c6e6 100644
+index 55da47b..45afbb7 100644
 --- a/asmcomp/amd64/emit.mlp
 +++ b/asmcomp/amd64/emit.mlp
-@@ -679,17 +679,18 @@ let fundecl fundecl =
+@@ -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 ();
@@ -44,7 +44,7 @@ index 4a3f844..525c6e6 100644
  (* Emission of data *)
  
 diff --git a/asmcomp/i386/emit.mlp b/asmcomp/i386/emit.mlp
-index 2992f29..0b1252c 100644
+index 3baba2e..b29f365 100644
 --- a/asmcomp/i386/emit.mlp
 +++ b/asmcomp/i386/emit.mlp
 @@ -905,12 +905,12 @@ let fundecl fundecl =

-- 
OCaml packaging

