New upstream release.

diff --git a/debian/changelog b/debian/changelog
index b42411a16c11e0d9f32267e5a505b8bb47f5fb3b..ba9ed4ccb9e93783ea9b563644e856acea1a9ae0 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,11 @@
-ocaml (3.10.0-14) UNRELEASED; urgency=low
+ocaml (3.10.1-1) UNRELEASED; urgency=low
 
   * NOT RELEASED YET
 
+  [ Samuel Mimram ]
+  * New upstream release.
+  * Removed arm_ccheckbound_typo.dpatch, integrated upstream.
+
   [ Stefano Zacchiroli ]
   * fix vcs-svn field to point just above the debian/ dir
 
@@ -11,7 +15,7 @@ ocaml (3.10.0-14) UNRELEASED; urgency=low
   [ Julien Cristau ]
   * Add ${shlibs:Depends} and ${misc:Depends} to all packages.
 
- -- Julien Cristau <jcristau@debian.org>  Thu, 17 Jan 2008 18:48:51 +0100
+ -- Samuel Mimram <smimram@debian.org>  Sun, 03 Feb 2008 20:37:57 +0100
 
 ocaml (3.10.0-13) unstable; urgency=low
 

diff --git a/debian/patches/00list b/debian/patches/00list
index ce7f4ff0b82ae6c7913296472f37cfd77a4932ad..f129056b393f6623703fe933860fda438c58dec8 100644 (file)
--- a/debian/patches/00list
+++ b/debian/patches/00list
@@ -8,6 +8,5 @@ no_rpath.dpatch
 stdlib_man_section.dpatch
 install_scripts_config.dpatch
 install_ocamlbuild.dpatch
-arm_ccheckbound_typo.dpatch
 not-native-no-aspp
 camlrun_shared.dpatch

diff --git a/debian/patches/arm_ccheckbound_typo.dpatch b/debian/patches/arm_ccheckbound_typo.dpatch
deleted file mode 100755 (executable)
index 4111347..0000000
--- a/debian/patches/arm_ccheckbound_typo.dpatch
+++ /dev/null
@@ -1,20 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## arm_ccheckbound_typo.dpatch by Stefano Zacchiroli <zack@debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: fix typo (which induce typing error and in turn FTBFS) in the usage of
-## DP: the Ccheckbound type constructore in the arm asm compiler
-
-@DPATCH@
-diff -urNad trunk~/asmcomp/arm/selection.ml trunk/asmcomp/arm/selection.ml
---- trunk~/asmcomp/arm/selection.ml    2001-03-30 14:22:32.000000000 +0200
-+++ trunk/asmcomp/arm/selection.ml     2007-07-25 17:51:02.000000000 +0200
-@@ -106,7 +106,7 @@
-       | _ ->
-           (Iextcall("__modsi3", false), args)
-       end
--  | Ccheckbound ->
-+  | Ccheckbound _ ->
-       begin match args with
-         [Cop(Clsr, [arg1; Cconst_int n]); arg2]
-         when n > 0 && n < 32 && not(is_intconst arg2) ->

diff --git a/debian/rules b/debian/rules
index 3a7f34533a239d7874eeddaaae018693bff69995..9094bf622830cfb2a19fbd4c6c0de80e0ef85031 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -3,7 +3,7 @@ include /usr/share/dpatch/dpatch.make
 
 PACKAGE = ocaml
 OCAMLMAJOR = 3.10
-OCAMLMINOR = 0
+OCAMLMINOR = 1
 OCAMLABI = $(OCAMLMAJOR).$(OCAMLMINOR)
 STDLIBDIR = /usr/lib/ocaml/$(OCAMLABI)
 MD5SUMSDIR = /var/lib/ocaml/md5sums