diff -u openjdk-6-6b27-1.12.6/debian/rules openjdk-6-6b27-1.12.6/debian/rules --- openjdk-6-6b27-1.12.6/debian/rules +++ openjdk-6-6b27-1.12.6/debian/rules @@ -26,7 +26,7 @@ distribution := $(shell lsb_release --id --short) distrel := $(shell lsb_release --codename --short) ifeq ($(distrel),n/a) - distrel := sid + distrel := wheezy endif multiarch_dir = /$(DEB_HOST_MULTIARCH) diff -u openjdk-6-6b27-1.12.6/debian/changelog openjdk-6-6b27-1.12.6/debian/changelog --- openjdk-6-6b27-1.12.6/debian/changelog +++ openjdk-6-6b27-1.12.6/debian/changelog @@ -1,3 +1,10 @@ +openjdk-6 (6b27-1.12.6-1~deb7u1+rpi1) wheezy-staging; urgency=low + + * Alter arm_port/hotspot/src/cpu/zero/vm/cppInterpreter_arm.S for armv6 + * Treat a n/a response from lsb-release as wheezy + + -- Peter Michael Green Sat, 19 Oct 2013 10:09:26 +0000 + openjdk-6 (6b27-1.12.6-1~deb7u1) stable-security; urgency=low * Build for stable-security only in patch2: unchanged: --- openjdk-6-6b27-1.12.6.orig/debian/openjdk-6-jre-zero/usr/share/lintian/overrides/openjdk-6-jre-zero +++ openjdk-6-6b27-1.12.6/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-6b27-1.12.6.orig/arm_port/hotspot/src/cpu/zero/vm/cppInterpreter_arm.S +++ openjdk-6-6b27-1.12.6/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