Merge version 7u131-2.6.9-2~deb8u1+rpi1 and 7u151-2.6.11-1~deb8u1 to produce 7u151... archive/raspbian/7u151-2.6.11-1_deb8u1+rpi1 raspbian/7u151-2.6.11-1_deb8u1+rpi1
authorRaspbian forward pporter <root@raspbian.org>
Sun, 3 Sep 2017 23:13:01 +0000 (00:13 +0100)
committerRaspbian forward pporter <root@raspbian.org>
Sun, 3 Sep 2017 23:13:01 +0000 (00:13 +0100)
1  2 
debian/changelog
debian/rules

index 0811abaa788725fb0610566c18ce1d2953bdafca,d8a7616d22a5f57eaaaffa0bd6f23eb50147fd53..a493c770391ce2d1f29f0180464485a25fade236
@@@ -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 <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>  Tue, 30 May 2017 21:07:11 +0000
++ -- Raspbian forward porter <root@raspbian.org>  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 cfe43107ccf681f1b116bd03ed604239312df220,d3f398ea8957cd1359103bc8ee3375768f8c1897..a7bff9665389f6ca6db24787bde5b51eeac81476
@@@ -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 += \