From: Raspbian forward pporter <root@raspbian.org>
Date: Thu, 5 Apr 2018 00:49:38 +0000 (+0100)
Subject: Merge version 7u151-2.6.11-2~deb8u1+rpi1 and 7u171-2.6.13-1~deb8u1 to produce 7u171... 
X-Git-Tag: raspbian/7u171-2.6.13-1_deb8u1+rpi1
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=74a21f5c46bc17ca1e6ca565f4f3e2c8d2a80cd0;p=openjdk-7.git

Merge version 7u151-2.6.11-2~deb8u1+rpi1 and 7u171-2.6.13-1~deb8u1 to produce 7u171-2.6.13-1~deb8u1+rpi1
---

bfcf4e5c72704b30f5700ea98c9c92981913b078
diff --cc debian/changelog
index 4029812,11be470..e268ebf
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,13 -1,4 +1,13 @@@
- openjdk-7 (7u151-2.6.11-2~deb8u1+rpi1) jessie-staging; urgency=medium
++openjdk-7 (7u171-2.6.13-1~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.
 +
-  -- Peter Michael Green <plugwash@raspbian.org>  Sun, 03 Dec 2017 13:53:39 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Thu, 05 Apr 2018 00:49:38 +0000
 +
- openjdk-7 (7u151-2.6.11-2~deb8u1) jessie-security; urgency=medium
+ openjdk-7 (7u171-2.6.13-1~deb8u1) jessie-security; urgency=medium
  
    * Rebuild for jessie-security