diff -Nru openjdk-7-7u91-2.6.3/debian/changelog openjdk-7-7u91-2.6.3/debian/changelog
--- openjdk-7-7u91-2.6.3/debian/changelog 2015-11-19 00:27:54.000000000 +0000
+++ openjdk-7-7u91-2.6.3/debian/changelog 2015-11-28 01:33:02.000000000 +0000
@@ -1,3 +1,12 @@
+openjdk-7 (7u91-2.6.3-1+rpi1) stretch-staging; urgency=medium
+
+ [changes brought forward from 7u75-2.5.4-3+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Sat, 11 Apr 2015 23:21:38 +0000]
+ * Tag assembler as armv6 to avoid setting off armv7 contamination checker.
+ * Add patch to disable currency timebomb.
+ * Allow docs to be built on any architecture.
+
+ -- Raspbian forward porter <root@raspbian.org> Sat, 28 Nov 2015 01:33:02 +0000
+
openjdk-7 (7u91-2.6.3-1) unstable; urgency=medium
[ Tiago Stürmer Daitx ]
diff -Nru openjdk-7-7u91-2.6.3/debian/openjdk-7-jre-zero/usr/share/lintian/overrides/openjdk-7-jre-zero openjdk-7-7u91-2.6.3/debian/openjdk-7-jre-zero/usr/share/lintian/overrides/openjdk-7-jre-zero
--- openjdk-7-7u91-2.6.3/debian/openjdk-7-jre-zero/usr/share/lintian/overrides/openjdk-7-jre-zero 1970-01-01 00:00:00.000000000 +0000
+++ openjdk-7-7u91-2.6.3/debian/openjdk-7-jre-zero/usr/share/lintian/overrides/openjdk-7-jre-zero 2015-11-28 01:33:02.000000000 +0000
@@ -0,0 +1,2 @@
+# Strip libjvm.so with --strip-debug instead of --strip-unneeded. LP: #574997.
+openjdk-7-jre-zero binary: unstripped-binary-or-object
diff -Nru openjdk-7-7u91-2.6.3/debian/patches/disable-currency-timebomb.diff openjdk-7-7u91-2.6.3/debian/patches/disable-currency-timebomb.diff
--- openjdk-7-7u91-2.6.3/debian/patches/disable-currency-timebomb.diff 1970-01-01 00:00:00.000000000 +0000
+++ openjdk-7-7u91-2.6.3/debian/patches/disable-currency-timebomb.diff 2015-11-28 01:33:02.000000000 +0000
@@ -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);
diff -Nru openjdk-7-7u91-2.6.3/debian/patches/tag-asm-as-armv6.diff openjdk-7-7u91-2.6.3/debian/patches/tag-asm-as-armv6.diff
--- openjdk-7-7u91-2.6.3/debian/patches/tag-asm-as-armv6.diff 1970-01-01 00:00:00.000000000 +0000
+++ openjdk-7-7u91-2.6.3/debian/patches/tag-asm-as-armv6.diff 2015-11-28 01:33:02.000000000 +0000
@@ -0,0 +1,21 @@
+diff -ur openjdk/hotspot/src/cpu/zero/vm/cppInterpreter_arm.S openjdk.new/hotspot/src/cpu/zero/vm/cppInterpreter_arm.S
+--- openjdk/hotspot/src/cpu/zero/vm/cppInterpreter_arm.S 2014-07-15 21:55:15.000000000 +0000
++++ openjdk.new/hotspot/src/cpu/zero/vm/cppInterpreter_arm.S 2014-07-27 22:22:50.000000000 +0000
+@@ -625,7 +625,7 @@
+ .arch armv4
+
+ #else
+- .arch armv7-a
++ .arch armv6
+ #endif
+
+ #ifdef HW_FP
+@@ -5029,7 +5029,7 @@
+
+ SUB_DISPATCH_TABLES
+
+- .arch armv7-a
++ .arch armv6
+
+ ALIGN_CODE
+ .global Thumb2_stubs
diff -Nru openjdk-7-7u91-2.6.3/debian/rules openjdk-7-7u91-2.6.3/debian/rules
--- openjdk-7-7u91-2.6.3/debian/rules 2015-11-19 00:44:00.000000000 +0000
+++ openjdk-7-7u91-2.6.3/debian/rules 2015-11-28 01:33:02.000000000 +0000
@@ -423,6 +423,7 @@
debian/patches/nonreparenting-wm.diff \
debian/patches/accessible-toolkit.patch \
debian/patches/fix_extra_flags-$(hotspot_version).diff \
+ debian/patches/tag-asm-as-armv6.diff
ifeq ($(with_bridge),atk)
DISTRIBUTION_PATCHES += \
@@ -448,6 +449,7 @@
debian/patches/libpcsclite-dlopen.diff \
debian/patches/dnd-files.patch \
debian/patches/jdk-bold-swing-fonts.patch \
+ debian/patches/disable-currency-timebomb.diff \
debian/patches/javadoc-sort-enum-and-annotation-types.patch \
ifeq (,$(filter $(DEB_HOST_ARCH),arm64))
@@ -631,9 +633,9 @@
# assume we don't build binary indep packages on these architectures
# building these with zero is slow and seems to break from time to time.
ifeq ($(with_docs),yes)
- ifeq (,$(filter $(DEB_HOST_ARCH), amd64 i386 arm64 ppc64 ppc64el))
- CONFIGURE_ARGS += --disable-docs
- endif
+# ifeq (,$(filter $(DEB_HOST_ARCH), amd64 i386 arm64 ppc64 ppc64el))
+# CONFIGURE_ARGS += --disable-docs
+# endif
else
CONFIGURE_ARGS += --disable-docs
endif