New upstream release (3.09.1)

diff --git a/debian/changelog b/debian/changelog
index adfbec0db8c597348e130c1eaaa15c5619ecefa8..30e2f466dad4c15b542d2e05ccd24637b25ad5fd 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,15 +1,15 @@
-ocaml (3.09.0-5) UNRELEASED; urgency=low
+ocaml (3.09.1-1) UNRELEASED; urgency=low
 
   [ Samuel Mimram ]
-  * NOT RELEASED YET
   * Removing possibly leftover /usr/lib/ocaml/ld.conf, closes: #300846.
   * Added a watch file.
 
   [ Julien Cristau ]
-  * Patch configure to correctly detect sparc machines, and thus align doubles
-    and 64-bit ints on double-word boundaries (closes: #338437).
+  * New upstream release
+    + sparc is correctly detected and alignment of doubles and 64-bit ints on
+      double-word boundaries is forced (Closes: #344615).
 
- -- Julien Cristau <julien.cristau@ens-lyon.org>  Wed,  4 Jan 2006 15:28:00 +0100
+ -- Julien Cristau <julien.cristau@ens-lyon.org>  Wed,  4 Jan 2006 15:49:24 +0100
 
 ocaml (3.09.0-4) unstable; urgency=low
 

diff --git a/debian/patches/sparc_needs_double_align.dpatch b/debian/patches/sparc_needs_double_align.dpatch
deleted file mode 100644 (file)
index ab4f9da..0000000
--- a/debian/patches/sparc_needs_double_align.dpatch
+++ /dev/null
@@ -1,28 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## sparc_needs_double_align.dpatch
-##
-## DP: correctly detect sparc64 which needs to align doubles on double-word
-## DP: boundaries (bug#344615, upstream 3944)
-
-@DPATCH@
-
---- ocaml-3.09.0.orig/configure        8 Nov 2005 14:00:23 -0000       1.229
-+++ ocaml-3.09.0/configure     3 Jan 2006 15:52:10 -0000
-@@ -400,7 +400,7 @@
- # Determine alignment constraints
- 
- case "$host" in
--  sparc-*-*|hppa*-*-*)
-+  sparc*-*-*|hppa*-*-*)
-     # On Sparc V9 with certain versions of gcc, determination of double
-     # alignment is not reliable (PR#1521), hence force it.
-     # Same goes for hppa.
-@@ -434,7 +434,7 @@ esac
- 
- if $int64_native; then
-   case "$host" in
--    hppa*-*-*)
-+    sparc*-*-*|hppa*-*-*)
-       if test $2 = 8; then
-         echo "64-bit integers can be word-aligned."
-         echo "#undef ARCH_ALIGN_INT64" >> m.h

diff --git a/debian/rules b/debian/rules
index 71a106108f5b8a4006d1bd9e444dcd698b58ad22..74da48e4b9b905ac8aebac23983f7c65d62ae78c 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -9,7 +9,7 @@
 include /usr/share/dpatch/dpatch.make
 PACKAGE = ocaml
 OCAMLMAJOR = 3.09
-OCAMLMINOR = 0
+OCAMLMINOR = 1
 OCAMLABI = $(OCAMLMAJOR).$(OCAMLMINOR)
 STDLIBDIR = /usr/lib/ocaml/$(OCAMLABI)
 MD5SUMSDIR = /var/lib/ocaml/md5sums