Merge version 7u231-2.6.19-1~deb8u2+rpi1 and 7u241-2.6.20-1~deb8u1 to produce 7u241...

diff --cc debian/changelog
index 46e8ea3467e8b4d39b1029181725852883bb5522,c3e34f96d314193542f74e3e1637a20f81a46e53..12541e8502a21e0aa5274d6731f434578c2d76c9
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,11 -1,33 +1,42 @@@
- openjdk-7 (7u231-2.6.19-1~deb8u2+rpi1) jessie-staging; urgency=medium
++openjdk-7 (7u241-2.6.20-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>  Fri, 23 Aug 2019 12:27:05 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Sun, 08 Dec 2019 14:32:10 +0000
++
+ openjdk-7 (7u241-2.6.20-1~deb8u1) jessie-security; urgency=high
+ 
+   * Non-maintainer upload by the LTS team.
+   * IcedTea release 2.6.20 (based on 7u241).
+   * Security fixes
+       - S8167646: Better invalid FilePermission
+       - S8213429, CVE-2019-2933: Windows file handling redux
+       - S8218573, CVE-2019-2945: Better socket support
+       - S8218877: Help transform transformers
+       - S8220186: Improve use of font temporary files
+       - S8220302, CVE-2019-2949: Better Kerberos ccache handling
+       - S8221497: Optional Panes in Swing
+       - S8221858, CVE-2019-2958: Build Better Processes
+       - S8222684, CVE-2019-2964: Better support for patterns
+       - S8222690, CVE-2019-2962: Better Glyph Images
+       - S8223163: Better pattern recognition
+       - S8223505, CVE-2019-2973: Better pattern compilation
+       - S8223892, CVE-2019-2978: Improved handling of jar files
+       - S8224532, CVE-2019-2981: Better Path supports
+       - S8224915, CVE-2019-2983: Better serial attributes
+       - S8225286, CVE-2019-2987: Better rendering of native glyphs
+       - S8225292, CVE-2019-2988: Better Graphics2D drawing
+       - S8225298, CVE-2019-2989: Improve TLS connection support
+       - S8225597, CVE-2019-2992: Enhance font glyph mapping
+       - S8226765, CVE-2019-2999: Commentary on Javadoc comments
+       - S8227129: Better ligature for subtables
+       - S8227601: Better collection of references
+       - S8228825, CVE-2019-2894: Enhance ECDSA operations
+ 
+  -- Markus Koschany <apo@debian.org>  Sat, 07 Dec 2019 20:36:34 +0100
  
  openjdk-7 (7u231-2.6.19-1~deb8u2) jessie-security; urgency=high
  

diff --cc debian/rules
Simple merge