New upstream release candidate, refresh patches

diff --git a/debian/changelog b/debian/changelog
index baa09e9643a6042c92f061821b794e896fd7fac4..fec0af52668c79dcc77636520d44589c52ce93d5 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,7 @@
-ocaml (3.12.0~beta1-1) UNRELEASED; urgency=low
+ocaml (3.12.0~rc1-2) UNRELEASED; urgency=low
 
   [ Stéphane Glondu ]
-  * New upstream beta release (Closes: #255245, #570920)
+  * New upstream release candidate (Closes: #255245, #570920)
     - add armel to native architectures; note that the Dynlink module is
       not available in native code there: software using it should take care
       of this new possibility
@@ -16,7 +16,7 @@ ocaml (3.12.0~beta1-1) UNRELEASED; urgency=low
   * debian/ocaml-mode.emacs-install: do not byte-compile camldebug.el
     and inf-caml.el for xemacs21 (Closes: #508813, LP: #464587).
 
- -- Stéphane Glondu <glondu@debian.org>  Wed, 16 Jun 2010 08:38:11 -0700
+ -- Stéphane Glondu <glondu@debian.org>  Sat, 24 Jul 2010 14:24:19 +0200
 
 ocaml (3.11.2-1) unstable; urgency=low
 

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 acd2f183ebe61a1886c7b48f4bfe2f9670a3efbc..8cd3811520fe52f889f81ccf735a9882a723bfa3 100644 (file)
--- a/debian/patches/0001-Pass-no-relax-to-ld-on-alpha.patch
+++ b/debian/patches/0001-Pass-no-relax-to-ld-on-alpha.patch
@@ -9,7 +9,7 @@ code (bug#338437)
  1 files changed, 3 insertions(+), 1 deletions(-)
 
 diff --git a/configure b/configure
-index 1a9d4b0..fb876d6 100755
+index 48b05b7..ff2de61 100755
 --- a/configure
 +++ b/configure
 @@ -284,7 +284,8 @@ case "$bytecc,$host" in
@@ -22,7 +22,7 @@ index 1a9d4b0..fb876d6 100755
    cc,mips-*-irix6*)
      # Add -n32 flag to ensure compatibility with native-code compiler
      bytecccompopts="-n32"
-@@ -732,6 +733,7 @@ case "$arch,$nativecc,$system,$host_type" in
+@@ -734,6 +735,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 12e121d9e71d0df0b3baede771fbf2bb3159e1e3..85cffddd252ac22fb6bb8885d18cf1d7aec29443 100644 (file)
--- a/debian/patches/0002-Call-ld-with-proper-flags.patch
+++ b/debian/patches/0002-Call-ld-with-proper-flags.patch
@@ -10,10 +10,10 @@ gcc.
  1 files changed, 1 insertions(+), 1 deletions(-)
 
 diff --git a/configure b/configure
-index fb876d6..32d754b 100755
+index ff2de61..2872ae8 100755
 --- a/configure
 +++ b/configure
-@@ -1632,7 +1632,7 @@ echo "DEBUGGER=$debugger" >> Makefile
+@@ -1635,7 +1635,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/0004-Put-manpages-in-section-3o-instead-of-3.patch b/debian/patches/0004-Put-manpages-in-section-3o-instead-of-3.patch
index c879d28bcd55310ba34acf7e914209d356bfdb76..2b8a2b4b9aa0db9e6ef53e9f76cc0aee04898ef0 100644 (file)
--- 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
@@ -7,7 +7,7 @@ Subject: [PATCH] Put manpages in section 3o instead of 3
  1 files changed, 1 insertions(+), 1 deletions(-)
 
 diff --git a/ocamldoc/Makefile b/ocamldoc/Makefile
-index 95b0f9d..978caed 100644
+index 2d8b0ea..30684ee 100644
 --- a/ocamldoc/Makefile
 +++ b/ocamldoc/Makefile
 @@ -319,7 +319,7 @@ test_texi: dummy