From: Raspbian forward pporter Date: Sun, 3 Sep 2017 23:13:01 +0000 (+0100) Subject: Merge version 7u131-2.6.9-2~deb8u1+rpi1 and 7u151-2.6.11-1~deb8u1 to produce 7u151... X-Git-Tag: archive/raspbian/7u151-2.6.11-1_deb8u1+rpi1 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=427119021711fc3214eae4a64d6ff7684ea261dc;p=openjdk-7.git Merge version 7u131-2.6.9-2~deb8u1+rpi1 and 7u151-2.6.11-1~deb8u1 to produce 7u151-2.6.11-1~deb8u1+rpi1 --- f981525ab46f6e389957967cd23efeb1754bfc40 diff --cc debian/changelog index 0811aba,d8a7616..a493c77 --- a/debian/changelog +++ b/debian/changelog @@@ -1,13 -1,4 +1,13 @@@ - openjdk-7 (7u131-2.6.9-2~deb8u1+rpi1) jessie-staging; urgency=medium ++openjdk-7 (7u151-2.6.11-1~deb8u1+rpi1) jessie-staging; urgency=medium + + [changes brought forward from 7u75-2.5.4-3+rpi1 by Peter Michael Green 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 Tue, 30 May 2017 21:07:11 +0000 ++ -- Raspbian forward porter Sun, 03 Sep 2017 23:13:01 +0000 + - openjdk-7 (7u131-2.6.9-2~deb8u1) jessie-security; urgency=medium + openjdk-7 (7u151-2.6.11-1~deb8u1) jessie-security; urgency=medium * Rebuild for jessie-security diff --cc debian/rules index cfe4310,d3f398e..a7bff96 --- a/debian/rules +++ b/debian/rules @@@ -364,8 -331,8 +332,9 @@@ DISTRIBUTION_PATCHES += 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 \ + debian/patches/jdk-getAccessibleValue.diff \ ifeq (,$(filter $(DEB_HOST_ARCH),arm64)) DISTRIBUTION_PATCHES += \