diff -u ocaml-3.11.1/debian/changelog ocaml-3.11.1/debian/changelog
--- ocaml-3.11.1/debian/changelog
+++ ocaml-3.11.1/debian/changelog
@@ -1,3 +1,13 @@
+ocaml (3.11.1-4ubuntu1) lucid; urgency=low
+
+  * debian/patches/0007-disable-specific-registers-for-thumb: (LP: #503011)
+    - Resolve an FTBFS on armel caused by specifying specific registers for
+      counters in the interpreter. This patch causes the compiler to determine
+      what registers to use automatically instead of hardcoding a specific set of
+      registers. An upstream bug has been filed at http://caml.inria.fr/mantis/view.php?id=4953
+
+ -- Michael Casadevall <mcasadevall@ubuntu.com>  Mon, 04 Jan 2010 10:13:29 -0500
+
 ocaml (3.11.1-4) unstable; urgency=low
 
   * Exclude compiler-libs from exported modules (Closes: #554871)
diff -u ocaml-3.11.1/debian/control.in ocaml-3.11.1/debian/control.in
--- ocaml-3.11.1/debian/control.in
+++ ocaml-3.11.1/debian/control.in
@@ -1,7 +1,8 @@
 Source: ocaml
 Section: ocaml
 Priority: optional
-Maintainer: Debian OCaml Maintainers <debian-ocaml-maint@lists.debian.org>
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+XSBC-Original-Maintainer: Debian OCaml Maintainers <debian-ocaml-maint@lists.debian.org>
 Uploaders:
  Stefano Zacchiroli <zack@debian.org>,
  Samuel Mimram <smimram@debian.org>,
diff -u ocaml-3.11.1/debian/control ocaml-3.11.1/debian/control
--- ocaml-3.11.1/debian/control
+++ ocaml-3.11.1/debian/control
@@ -1,7 +1,8 @@
 Source: ocaml
 Section: ocaml
 Priority: optional
-Maintainer: Debian OCaml Maintainers <debian-ocaml-maint@lists.debian.org>
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+XSBC-Original-Maintainer: Debian OCaml Maintainers <debian-ocaml-maint@lists.debian.org>
 Uploaders:
  Stefano Zacchiroli <zack@debian.org>,
  Samuel Mimram <smimram@debian.org>,
diff -u ocaml-3.11.1/debian/patches/series ocaml-3.11.1/debian/patches/series
--- ocaml-3.11.1/debian/patches/series
+++ ocaml-3.11.1/debian/patches/series
@@ -6,0 +7 @@
+0007-disable-specific-registers-for-thumb
only in patch2:
unchanged:
--- ocaml-3.11.1.orig/debian/patches/0007-disable-specific-registers-for-thumb
+++ ocaml-3.11.1/debian/patches/0007-disable-specific-registers-for-thumb
@@ -0,0 +1,14 @@
+Index: ocaml-3.11.1/byterun/interp.c
+===================================================================
+--- ocaml-3.11.1.orig/byterun/interp.c	2010-01-04 10:20:26.387208256 -0500
++++ ocaml-3.11.1/byterun/interp.c	2010-01-04 10:25:41.727191496 -0500
+@@ -157,7 +157,8 @@
+ #define SP_REG asm("a4")
+ #define ACCU_REG asm("d7")
+ #endif
+-#ifdef __arm__
++/* specifying a specific register breaks when compiling for thumb mode */
++#if defined (__arm__) && !defined(__thumb__)
+ #define PC_REG asm("r9")
+ #define SP_REG asm("r8")
+ #define ACCU_REG asm("r7")