diff -pruN 1.4.0-8/debian/changelog 1.4.0-8ubuntu1/debian/changelog
--- 1.4.0-8/debian/changelog	2011-09-08 21:24:50.000000000 +0000
+++ 1.4.0-8ubuntu1/debian/changelog	2011-09-08 21:25:01.000000000 +0000
@@ -1,3 +1,11 @@
+mozart (1.4.0-8ubuntu1) oneiric; urgency=low
+
+  * Merge with Debian; remaining changes:
+    - Recognize ARM architectures newer than armv5 in the build system,
+      to make some progress on building the package.
+
+ -- Matthias Klose <doko@ubuntu.com>  Thu, 08 Sep 2011 20:26:42 +0200
+
 mozart (1.4.0-8) unstable; urgency=low
 
   * Whoops, really change standards version to 3.9.2 as promised below.
@@ -17,6 +25,13 @@ mozart (1.4.0-7) unstable; urgency=low
 
  -- Kevin Glynn <keving@debian.org>  Sat, 04 Jun 2011 14:14:10 +0200
 
+mozart (1.4.0-6ubuntu1) natty; urgency=low
+
+  * Recognize ARM architectures newer than armv5 in the build system,
+    to make some progress on building the package.
+
+ -- Jani Monoses <jani@ubuntu.com>  Mon, 04 Apr 2011 20:55:52 +0300
+
 mozart (1.4.0-6) unstable; urgency=medium
 
   * Explicitly exclude the doc/changes directory when searching
diff -pruN 1.4.0-8/mozart_1.4.0-6ubuntu1.patch 1.4.0-8ubuntu1/mozart_1.4.0-6ubuntu1.patch
--- 1.4.0-8/mozart_1.4.0-6ubuntu1.patch	1970-01-01 00:00:00.000000000 +0000
+++ 1.4.0-8ubuntu1/mozart_1.4.0-6ubuntu1.patch	2011-09-08 21:25:01.000000000 +0000
@@ -0,0 +1,12 @@
+diff -pruN 1.4.0-6/share/bin/ozplatform 1.4.0-6ubuntu1/share/bin/ozplatform
+--- 1.4.0-6/share/bin/ozplatform	2011-04-04 21:09:15.000000000 +0100
++++ 1.4.0-6ubuntu1/share/bin/ozplatform	2011-04-04 21:02:10.000000000 +0100
+@@ -18,7 +18,7 @@ case $system in
+     s390*\ Linux\ *)	OZARCH=linux-s390
+     ;;
+     #-----------------------------------------------------------------
+-    armv4l\ Linux\ *)	OZARCH=linux-arm
++    arm*\ Linux\ *)	OZARCH=linux-arm
+     ;;
+     armv5tel\ Linux\ *)	OZARCH=linux-arm
+     ;;
diff -pruN 1.4.0-8/share/bin/ozplatform 1.4.0-8ubuntu1/share/bin/ozplatform
--- 1.4.0-8/share/bin/ozplatform	2011-09-08 21:24:50.000000000 +0000
+++ 1.4.0-8ubuntu1/share/bin/ozplatform	2011-09-08 21:25:01.000000000 +0000
@@ -22,6 +22,8 @@ case $system in
     ;;
     armv5tel\ Linux\ *)	OZARCH=linux-arm
     ;;
+    arm*\ Linux\ *)	OZARCH=linux-arm
+    ;;
     #parisc32\ Linux\ *)	OZARCH=linux-hppa32
     #;;
     # so far: userspace is 32 bits on linux-parisc / hppa