diff -pruN 3.12.1-1/debian/changelog 3.12.1-1ubuntu1/debian/changelog
--- 3.12.1-1/debian/changelog	2011-12-01 15:20:25.000000000 +0000
+++ 3.12.1-1ubuntu1/debian/changelog	2011-12-01 15:20:25.000000000 +0000
@@ -1,3 +1,12 @@
+jocaml (3.12.1-1ubuntu1) precise; urgency=low
+
+  * Resynchronise with Debian.  Remaining changes:
+    - Snag the 0001-Pass-no-relax-to-ld-on-alpha.patch from ocaml to match
+      ocaml's linker behaviour with regard to --hash-style=both
+      --no-copy-dt-needed-entries --as-needed switches.
+
+ -- Colin Watson <cjwatson@ubuntu.com>  Thu, 01 Dec 2011 12:51:04 +0000
+
 jocaml (3.12.1-1) unstable; urgency=low
 
   * New upstream release
@@ -15,6 +24,27 @@ jocaml (3.12.1-1) unstable; urgency=low
 
  -- Mehdi Dogguy <mehdi@debian.org>  Tue, 01 Nov 2011 22:52:10 +0100
 
+jocaml (3.12.0-1ubuntu3) precise; urgency=low
+
+  * Rebuild for OCaml 3.12.1.
+
+ -- Colin Watson <cjwatson@ubuntu.com>  Fri, 18 Nov 2011 20:52:59 +0000
+
+jocaml (3.12.0-1ubuntu2) oneiric; urgency=low
+
+  * Snag the 0001-Pass-no-relax-to-ld-on-alpha.patch from ocaml to 
+    match ocaml's linker behaviour with regard to --hash-style=both
+    --no-copy-dt-needed-entries --as-needed switches.
+
+ -- Adam Conrad <adconrad@ubuntu.com>  Fri, 19 Aug 2011 12:57:45 -0600
+
+jocaml (3.12.0-1ubuntu1) oneiric; urgency=low
+
+  * Apply 0013-ocamlopt-arm-add-.type-directive-for-code-symbols.patch
+    from the latest ocaml upload to fix the same bits in jocaml.
+
+ -- Adam Conrad <adconrad@ubuntu.com>  Sat, 13 Aug 2011 17:04:16 -0600
+
 jocaml (3.12.0-1) unstable; urgency=low
 
   * New upstream release (Closes: #580103).
diff -pruN 3.12.1-1/debian/control 3.12.1-1ubuntu1/debian/control
--- 3.12.1-1/debian/control	2011-12-01 15:20:25.000000000 +0000
+++ 3.12.1-1ubuntu1/debian/control	2011-12-01 15:20:25.000000000 +0000
@@ -1,7 +1,8 @@
 Source: jocaml
 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:
  Mehdi Dogguy <mehdi@debian.org>,
  Samuel Mimram <smimram@debian.org>
diff -pruN 3.12.1-1/debian/patches/0001-Pass-no-relax-to-ld-on-alpha.patch 3.12.1-1ubuntu1/debian/patches/0001-Pass-no-relax-to-ld-on-alpha.patch
--- 3.12.1-1/debian/patches/0001-Pass-no-relax-to-ld-on-alpha.patch	1970-01-01 00:00:00.000000000 +0000
+++ 3.12.1-1ubuntu1/debian/patches/0001-Pass-no-relax-to-ld-on-alpha.patch	2011-12-01 15:20:25.000000000 +0000
@@ -0,0 +1,35 @@
+From: Stefano Zacchiroli <zack@debian.org>
+Date: Tue, 19 May 2009 17:22:39 +0200
+Subject: Pass --no-relax to ld on alpha
+
+Pass the --no-relax option to ld to fix a segfault in initialization
+code (bug#338437)
+---
+ configure |    4 +++-
+ 1 files changed, 3 insertions(+), 1 deletions(-)
+
+Index: ocaml-3.12.0/configure
+===================================================================
+--- ocaml-3.12.0.orig/configure	2010-07-28 13:18:22.000000000 +0000
++++ ocaml-3.12.0/configure	2011-08-15 10:17:07.665664798 +0000
+@@ -284,7 +284,10 @@
+   gcc,alpha*-*-linux*)
+     if cc="$bytecc" sh ./hasgot -mieee; then
+       bytecccompopts="-mieee $bytecccompopts";
+-    fi;;
++    fi
++    bytecclinkopts="-Wl,--no-relax -Wl,--hash-style=both -Wl,--no-copy-dt-needed-entries -Wl,--as-needed";;
++  gcc,*-*-linux*)
++    bytecclinkopts="-Wl,--hash-style=both -Wl,--no-copy-dt-needed-entries -Wl,--as-needed";;
+   cc,mips-*-irix6*)
+     # Add -n32 flag to ensure compatibility with native-code compiler
+     bytecccompopts="-n32"
+@@ -731,6 +734,8 @@
+                        nativecccompopts="$gcc_warnings -DSHRINKED_GNUC";;
+   *,*,rhapsody,*)      nativecccompopts="$gcc_warnings -DDARWIN_VERSION_6 $dl_defs"
+                        if $arch64; then partialld="ld -r -arch ppc64"; fi;;
++  alpha,gcc*,linux*,*) nativecclinkopts="-Wl,--no-relax -Wl,--hash-style=both -Wl,--no-copy-dt-needed-entries -Wl,--as-needed";;
++  *,gcc*,linux*,*) nativecclinkopts="-Wl,--hash-style=both -Wl,--no-copy-dt-needed-entries -Wl,--as-needed";;
+   *,gcc*,cygwin,*)     nativecccompopts="$gcc_warnings -U_WIN32";;
+   amd64,gcc*,macosx,*) partialld="ld -r -arch x86_64";;
+   amd64,gcc*,solaris,*) partialld="ld -r -m elf_x86_64";;
diff -pruN 3.12.1-1/debian/patches/series 3.12.1-1ubuntu1/debian/patches/series
--- 3.12.1-1/debian/patches/series	2011-12-01 15:20:25.000000000 +0000
+++ 3.12.1-1ubuntu1/debian/patches/series	2011-12-01 15:20:25.000000000 +0000
@@ -1,3 +1,4 @@
+0001-Pass-no-relax-to-ld-on-alpha.patch
 0001-Replace-Otyp_proc-with-Otyp_stuff-to-make-outcometre.patch
 0002-Add-option-v-to-expunge-to-select-modules-to-filter-.patch
 0003-Natdynlink-works-on-powerpc-and-hurd-i386.patch