From: Peter Michael Green Date: Thu, 7 Dec 2017 15:35:59 +0000 (+0000) Subject: Manual merge of version 7u151-2.6.11-1~deb8u1+rpi1 and 7u151-2.6.11-2~deb8u1 to produ... X-Git-Tag: archive/raspbian/7u151-2.6.11-2_deb8u1+rpi1^0 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=afb69904f7ed985ae22f45db925dba28826a0b0c;p=openjdk-7.git Manual merge of version 7u151-2.6.11-1~deb8u1+rpi1 and 7u151-2.6.11-2~deb8u1 to produce 7u151-2.6.11-2~deb8u1+rpi1 --- afb69904f7ed985ae22f45db925dba28826a0b0c diff --cc debian/changelog index a493c77,9e67523..4029812 --- a/debian/changelog +++ b/debian/changelog @@@ -1,13 -1,4 +1,13 @@@ - openjdk-7 (7u151-2.6.11-1~deb8u1+rpi1) jessie-staging; urgency=medium ++openjdk-7 (7u151-2.6.11-2~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 Sun, 03 Sep 2017 23:13:01 +0000 ++ -- Peter Michael Green Sun, 03 Dec 2017 13:53:39 +0000 + - openjdk-7 (7u151-2.6.11-1~deb8u1) jessie-security; urgency=medium + openjdk-7 (7u151-2.6.11-2~deb8u1) jessie-security; urgency=medium * Rebuild for jessie-security diff --cc debian/rules index a7bff96,35e4727..e3b345d --- a/debian/rules +++ b/debian/rules @@@ -302,7 -305,7 +305,8 @@@ DISTRIBUTION_PATCHES += 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 ++ debian/patches/tag-asm-as-armv6.diff \ + debian/patches/hotspot-aarch64-S8150652-unused-template.diff \ ifeq ($(with_bridge),atk) DISTRIBUTION_PATCHES += \