[Pkg-ocaml-maint-commits] r4125 - in /trunk/packages/ocaml/trunk/debian: changelog patches/00list patches/arm_ccheckbound_typo.dpatch

[zack at users.alioth.debian.org]

Author: zack
Date: Wed Jul 25 15:53:07 2007
New Revision: 4125

URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/?sc=1&rev=4125
Log:
* add patch arm_ccheckbound_typo, fix a typing error typo which makes ocaml
  FTBFS on arm

Added:
    trunk/packages/ocaml/trunk/debian/patches/arm_ccheckbound_typo.dpatch   (with props)
Modified:
    trunk/packages/ocaml/trunk/debian/changelog
    trunk/packages/ocaml/trunk/debian/patches/00list

Modified: trunk/packages/ocaml/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocaml/trunk/debian/changelog?rev=4125&op=diff
==============================================================================
--- trunk/packages/ocaml/trunk/debian/changelog (original)
+++ trunk/packages/ocaml/trunk/debian/changelog Wed Jul 25 15:53:07 2007
@@ -1,11 +1,14 @@
-ocaml (3.10.0-5) experimental; urgency=low
-  
+ocaml (3.10.0-5) UNRELEASED; urgency=low
+
   [ Ralf Treinen ]
-
   * ocaml-mode.emacsen-install: do not hardcode the emacs flavours for which
     to compile ocaml-mode (closes: Bug#433082)
 
- -- Ralf Treinen <treinen at debian.org>  Wed, 18 Jul 2007 18:31:31 +0200
+  [ Stefano Zacchiroli ]
+  * add patch arm_ccheckbound_typo, fix a typing error typo which makes ocaml
+    FTBFS on arm
+
+ -- Stefano Zacchiroli <zack at debian.org>  Wed, 25 Jul 2007 17:52:23 +0200
 
 ocaml (3.10.0-4) experimental; urgency=low
 

Modified: trunk/packages/ocaml/trunk/debian/patches/00list
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocaml/trunk/debian/patches/00list?rev=4125&op=diff
==============================================================================
--- trunk/packages/ocaml/trunk/debian/patches/00list (original)
+++ trunk/packages/ocaml/trunk/debian/patches/00list Wed Jul 25 15:53:07 2007
@@ -8,3 +8,4 @@
 stdlib_man_section.dpatch
 install_scripts_config.dpatch
 install_ocamlbuild.dpatch
+arm_ccheckbound_typo.dpatch

Added: trunk/packages/ocaml/trunk/debian/patches/arm_ccheckbound_typo.dpatch
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocaml/trunk/debian/patches/arm_ccheckbound_typo.dpatch?rev=4125&op=file
==============================================================================
--- trunk/packages/ocaml/trunk/debian/patches/arm_ccheckbound_typo.dpatch (added)
+++ trunk/packages/ocaml/trunk/debian/patches/arm_ccheckbound_typo.dpatch Wed Jul 25 15:53:07 2007
@@ -1,0 +1,20 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## arm_ccheckbound_typo.dpatch by Stefano Zacchiroli <zack at 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
+
+ at 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) ->

Propchange: trunk/packages/ocaml/trunk/debian/patches/arm_ccheckbound_typo.dpatch
------------------------------------------------------------------------------
    svn:executable = *