From: Julien Cristau <julien.cristau@ens-lyon.org>
Date: Thu, 30 Mar 2006 16:18:53 +0000 (+0000)
Subject: Refresh patches for new upstream.
X-Git-Tag: archive/raspbian/4.08.1-4+rpi1~3^2~654^2~4
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=bb9c56f0e5f8f9c678fed27427c1d1f6f2d65e16;p=ocaml.git

Refresh patches for new upstream.
---

diff --git a/debian/patches/alpha_ld_no-relax.dpatch b/debian/patches/alpha_ld_no-relax.dpatch
index 6c398e68..244ad0cc 100644
--- a/debian/patches/alpha_ld_no-relax.dpatch
+++ b/debian/patches/alpha_ld_no-relax.dpatch
@@ -6,9 +6,9 @@
 ## DP: code (bug#338437)
 
 @DPATCH@
-
---- ocaml-3.09.0.orig/configure	2005-09-24 02:19:09.000000000 -0700
-+++ ocaml-3.09.0/configure	2005-12-07 22:03:36.019001353 -0800
+diff -urNad ocaml-3.09.1+3.09.2rc1~/configure ocaml-3.09.1+3.09.2rc1/configure
+--- ocaml-3.09.1+3.09.2rc1~/configure	2006-03-30 17:39:44.000000000 +0200
++++ ocaml-3.09.1+3.09.2rc1/configure	2006-03-30 17:39:49.000000000 +0200
 @@ -268,7 +268,8 @@
    gcc,alpha*-*-linux*)
      if cc="$bytecc" sh ./hasgot -mieee; then
@@ -19,7 +19,7 @@
    cc,mips-*-irix6*)
      # Add -n32 flag to ensure compatibility with native-code compiler
      bytecccompopts="-n32"
-@@ -612,6 +613,7 @@
+@@ -623,6 +624,7 @@
                         nativecccompopts="$gcc_warnings -DSHRINKED_GNUC";;
    *,*,rhapsody,*)
                   nativecccompopts="$gcc_warnings -DDARWIN_VERSION_6 $dl_defs";;
diff --git a/debian/patches/call_ld_with_proper_flags.dpatch b/debian/patches/call_ld_with_proper_flags.dpatch
index 523bba8b..feaa2007 100644
--- a/debian/patches/call_ld_with_proper_flags.dpatch
+++ b/debian/patches/call_ld_with_proper_flags.dpatch
@@ -7,18 +7,18 @@
 ## DP: gcc.
 
 @DPATCH@
-
---- ocaml-3.09.1.orig/Makefile	2005-09-24 18:20:36.000000000 +0200
-+++ ocaml-3.09.1/Makefile	2006-01-12 10:17:42.000000000 +0100
+diff -urNad ocaml-3.09.1+3.09.2rc1~/Makefile ocaml-3.09.1+3.09.2rc1/Makefile
+--- ocaml-3.09.1+3.09.2rc1~/Makefile	2006-03-30 17:40:58.000000000 +0200
++++ ocaml-3.09.1+3.09.2rc1/Makefile	2006-03-30 17:41:00.000000000 +0200
 @@ -313,6 +313,7 @@
  partialclean::
-        rm -f ocaml toplevel/toplevellib.cma
+ 	rm -f ocaml toplevel/toplevellib.cma
  
 +Wl = -Wl,
  # The configuration file
  
  utils/config.ml: utils/config.mlp config/Makefile
-@@ -324,8 +324,8 @@
+@@ -324,8 +325,8 @@
              -e 's|%%BYTELINK%%|$(BYTECC) $(BYTECCLINKOPTS)|' \
              -e 's|%%NATIVECC%%|$(NATIVECC) $(NATIVECCCOMPOPTS)|' \
              -e 's|%%NATIVELINK%%|$(NATIVECC) $(NATIVECCLINKOPTS)|' \
diff --git a/debian/patches/versioned_libdir.dpatch.in b/debian/patches/versioned_libdir.dpatch.in
index 2b45c5ac..2f862674 100755
--- a/debian/patches/versioned_libdir.dpatch.in
+++ b/debian/patches/versioned_libdir.dpatch.in
@@ -21,7 +21,7 @@ exit 0
 diff -ur ocaml.orig/camlp4/config/configure_batch ocaml/camlp4/config/configure_batch
 --- ocaml.orig/camlp4/config/configure_batch.orig	2003-09-30 18:11:57.000000000 +0200
 +++ ocaml/camlp4/config/configure_batch	2003-09-30 18:12:51.000000000 +0200
-@@ -94,13 +94,13 @@
+@@ -103,13 +103,13 @@
     *) echo "BINDIR=$bindir" >> Makefile.cnf;;
  esac
  case "$libdir" in
@@ -42,7 +42,7 @@ diff -ur ocaml.orig/camlp4/config/configure_batch ocaml/camlp4/config/configure_
 diff -ur ocaml.orig/configure ocaml/configure
 --- ocaml.orig/configure	2003-09-30 18:09:47.000000000 +0200
 +++ ocaml/configure	2003-09-30 18:10:12.000000000 +0200
-@@ -149,8 +149,8 @@
+@@ -146,8 +146,8 @@
     *) echo "BINDIR=$bindir" >> Makefile;;
  esac
  case "$libdir" in