diff -u openjdk-6-6b24-1.11.1/debian/control openjdk-6-6b24-1.11.1/debian/control
--- openjdk-6-6b24-1.11.1/debian/control
+++ openjdk-6-6b24-1.11.1/debian/control
@@ -153,7 +153,7 @@
  The VM is started with the option `-cacao'. See the README.Debian for details.
 
 Package: icedtea-6-jre-jamvm
-Architecture: amd64 armel armhf i386 lpia mips mipsel powerpc
+Architecture: amd64 armel i386 lpia mips mipsel powerpc
 Multi-Arch: same
 Priority: extra
 Pre-Depends: ${dpkg:Depends}
diff -u openjdk-6-6b24-1.11.1/debian/rules openjdk-6-6b24-1.11.1/debian/rules
--- openjdk-6-6b24-1.11.1/debian/rules
+++ openjdk-6-6b24-1.11.1/debian/rules
@@ -131,7 +131,7 @@
   cacao_archs = alpha amd64 armel armhf i386 lpia powerpc m68k mips mipsel s390
 endif
 ifeq (,$(filter $(distrel),squeeze lenny maverick lucid karmic hardy dapper))
-  jamvm_archs = amd64 armel armhf i386 lpia mips mipsel powerpc
+  jamvm_archs = amd64 armel i386 lpia mips mipsel powerpc
 endif
 #ifeq (,$(filter $(distrel),wheezy sid squeeze lenny maverick natty maverick lucid karmic hardy dapper))
 #  jamvm_defaults = armel armhf
diff -u openjdk-6-6b24-1.11.1/debian/changelog openjdk-6-6b24-1.11.1/debian/changelog
--- openjdk-6-6b24-1.11.1/debian/changelog
+++ openjdk-6-6b24-1.11.1/debian/changelog
@@ -1,3 +1,10 @@
+openjdk-6 (6b24-1.11.1-6+rpi1) unstable; urgency=low
+
+  * Alter arm_port/hotspot/src/cpu/zero/vm/cppInterpreter_arm.S for armv6
+  * Disable building of jamvm package as it comes out armv7 dirty
+
+ -- Peter Michael Green <plugwash@p10link.net>  Wed, 09 May 2012 21:18:06 +0000
+
 openjdk-6 (6b24-1.11.1-6) unstable; urgency=low
 
   * Build using gcc-4.4 on mips, mipsel.
only in patch2:
unchanged:
--- openjdk-6-6b24-1.11.1.orig/arm_port/hotspot/src/cpu/zero/vm/cppInterpreter_arm.S
+++ openjdk-6-6b24-1.11.1/arm_port/hotspot/src/cpu/zero/vm/cppInterpreter_arm.S
@@ -583,13 +583,13 @@
 	.arch armv4
 
 #else
-	.arch armv7-a
+	.arch armv6
 #endif
 
 #ifdef HW_FP
 
 #ifdef __ARM_PCS_VFP
- 	.fpu vfpv3-d16
+ 	.fpu vfpv2
 	.eabi_attribute Tag_ABI_HardFP_use, 3
 	.eabi_attribute Tag_ABI_VFP_args, 1
 #else // __ARM_PCS_VFP
@@ -5046,7 +5046,7 @@
 
 	SUB_DISPATCH_TABLES
 
-	.arch	armv7-a
+	.arch	armv6
 
 	ALIGN_CODE
 	.global	Thumb2_stubs
only in patch2:
unchanged:
--- openjdk-6-6b24-1.11.1.orig/debian/icedtea-6-jre-jamvm.substvars
+++ openjdk-6-6b24-1.11.1/debian/icedtea-6-jre-jamvm.substvars
@@ -0,0 +1,2 @@
+shlibs:Depends=libc6 (>= 2.4), libc6 (>= 2.13-28), libgcc1 (>= 1:4.4.0), zlib1g (>= 1:1.1.4)
+misc:Depends=
only in patch2:
unchanged:
--- openjdk-6-6b24-1.11.1.orig/debian/openjdk-6-jre-zero/usr/share/lintian/overrides/openjdk-6-jre-zero
+++ openjdk-6-6b24-1.11.1/debian/openjdk-6-jre-zero/usr/share/lintian/overrides/openjdk-6-jre-zero
@@ -0,0 +1,6 @@
+# the doc directory and the symlink are in openjdk-6-jre-headless
+openjdk-6-jre-zero binary: no-copyright-file
+openjdk-6-jre-zero binary: usr-share-doc-symlink-without-dependency
+
+# Strip libjvm.so with --strip-debug instead of --strip-unneeded. LP: #574997.
+openjdk-6-jre-zero binary: unstripped-binary-or-object