From: Raspbian forward pporter <root@raspbian.org>
Date: Sun, 25 Nov 2018 02:36:37 +0000 (+0000)
Subject: Merge version 7u181-2.6.14-1~deb8u1+rpi1 and 7u181-2.6.14-2~deb8u1 to produce 7u181... 
X-Git-Tag: archive/raspbian/7u181-2.6.14-2_deb8u1+rpi1^0
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=d89ca6f54969af7d92e15208fdf1af8c00b218f8;p=openjdk-7.git

Merge version 7u181-2.6.14-1~deb8u1+rpi1 and 7u181-2.6.14-2~deb8u1 to produce 7u181-2.6.14-2~deb8u1+rpi1
---

d89ca6f54969af7d92e15208fdf1af8c00b218f8
diff --cc debian/changelog
index f2f297c,b78a96d..0dd486f
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,13 -1,4 +1,13 @@@
- openjdk-7 (7u181-2.6.14-1~deb8u1+rpi1) jessie-staging; urgency=medium
++openjdk-7 (7u181-2.6.14-2~deb8u1+rpi1) jessie-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>  Wed, 20 Jun 2018 01:08:34 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Sun, 25 Nov 2018 02:36:36 +0000
 +
- openjdk-7 (7u181-2.6.14-1~deb8u1) jessie-security; urgency=medium
+ openjdk-7 (7u181-2.6.14-2~deb8u1) jessie-security; urgency=medium
  
    * Rebuild for jessie-security.
  
diff --cc debian/rules
index 634f545,7281871..49eb262
--- a/debian/rules
+++ b/debian/rules
@@@ -318,8 -317,8 +317,9 @@@ 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/hotspot-aarch64-S8150652-unused-template.diff \
+ 	debian/patches/hotspot-S8207151-fix-bad-klassoop.patch \
  
  ifeq ($(with_bridge),atk)
      DISTRIBUTION_PATCHES += \
@@@ -349,14 -348,10 +349,11 @@@ 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 ($(derivative),Debian)
-   DISTRIBUTION_PATCHES += \
- 	debian/patches/hotspot-disable-exec-shield-workaround.patch
- endif
+ 	debian/patches/jdk-8132985-backport-double-free.patch \
+ 	debian/patches/jdk-8139803-backport-warning.patch \
  
  ifeq (,$(filter $(DEB_HOST_ARCH),arm64))
    DISTRIBUTION_PATCHES += \