diff -u openjdk-6-6b35-1.13.7/debian/changelog openjdk-6-6b35-1.13.7/debian/changelog
--- openjdk-6-6b35-1.13.7/debian/changelog
+++ openjdk-6-6b35-1.13.7/debian/changelog
@@ -1,3 +1,11 @@
+openjdk-6 (6b35-1.13.7-1~deb7u1+rpi1) wheezy-staging; urgency=medium
+  [changes brought forward from 6b34-1.13.6-1~deb7u1+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Sun, 01 Feb 2015 00:57:38 +0000]
+  * Alter arm_port/hotspot/src/cpu/zero/vm/cppInterpreter_arm.S for armv6
+  * Disable testsuite
+  * Add patch to disable currency timebomb.
+
+ -- Raspbian forward porter <root@raspbian.org>  Sat, 20 Jun 2015 00:31:47 +0000
+
 openjdk-6 (6b35-1.13.7-1~deb7u1) wheezy-security; urgency=low
 
   * Rebuild for stable
diff -u openjdk-6-6b35-1.13.7/debian/rules openjdk-6-6b35-1.13.7/debian/rules
--- openjdk-6-6b35-1.13.7/debian/rules
+++ openjdk-6-6b35-1.13.7/debian/rules
@@ -94,7 +94,7 @@
 #export HOTSPOT_BUILD_JOBS = 1
 #export ALT_PARALLEL_COMPILE_JOBS = 1
 
-with_check = $(if $(findstring nocheck, $(DEB_BUILD_OPTIONS)),,yes)
+with_check = disabled for raspbian wheezy due to build hang
 with_docs = $(if $(findstring nodocs, $(DEB_BUILD_OPTIONS)),,yes)
 ifneq (,$(findstring cacao shark, $(PKGSOURCE)))
   with_docs = disabled for cacao and shark
@@ -364,6 +364,7 @@
 	debian/patches/libpcsclite-dlopen.diff \
 	debian/patches/m68k-text-relocations.diff \
 	debian/patches/add-zero-ports.diff \
+	debian/patches/disable-currency-timebomb.diff \
 
 ifneq (,$(filter $(distrel),squeeze wheezy lucid maverick natty oneiric precise quantal raring))
   DISTRIBUTION_PATCHES += \
only in patch2:
unchanged:
--- openjdk-6-6b35-1.13.7.orig/arm_port/hotspot/src/cpu/zero/vm/cppInterpreter_arm.S
+++ openjdk-6-6b35-1.13.7/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-6b35-1.13.7.orig/debian/openjdk-6-jre-zero/usr/share/lintian/overrides/openjdk-6-jre-zero
+++ openjdk-6-6b35-1.13.7/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
only in patch2:
unchanged:
--- openjdk-6-6b35-1.13.7.orig/debian/patches/disable-currency-timebomb.diff
+++ openjdk-6-6b35-1.13.7/debian/patches/disable-currency-timebomb.diff
@@ -0,0 +1,15 @@
+--- openjdk-ecj/jdk/make/tools/src/build/tools/generatecurrencydata/GenerateCurrencyData.java	2014-10-08 15:35:08.000000000 +0000
++++ openjdk/jdk/make/tools/src/build/tools/generatecurrencydata/GenerateCurrencyData.java	2015-01-16 20:04:19.000000000 +0000
+@@ -281,9 +281,9 @@
+             checkCurrencyCode(newCurrency);
+             String timeString = currencyInfo.substring(4, length - 4);
+             long time = format.parse(timeString).getTime();
+-            if (Math.abs(time - System.currentTimeMillis()) > ((long) 10) * 365 * 24 * 60 * 60 * 1000) {
+-                throw new RuntimeException("time is more than 10 years from present: " + time);
+-            }
++            //if (Math.abs(time - System.currentTimeMillis()) > ((long) 10) * 365 * 24 * 60 * 60 * 1000) {
++            //    throw new RuntimeException("time is more than 10 years from present: " + time);
++            //}
+             specialCaseCutOverTimes[specialCaseCount] = time;
+             specialCaseOldCurrencies[specialCaseCount] = oldCurrency;
+             specialCaseOldCurrenciesDefaultFractionDigits[specialCaseCount] = getDefaultFractionDigits(oldCurrency);