# HG changeset patch
# User Andrew John Hughes <ahughes@redhat.com>
# Date 1312391974 -3600
# Node ID ae4845b324446139b467c55dee3f09aa33976a57
# Parent  a42d0626100f1a4af885cd57f1c03580525c85b5
PR586: Add missing sources to src.zip.
G356743: Support building against libpng 1.5.

2011-08-03  Andrew John Hughes  <ahughes@redhat.com>

	* Makefile.am:
	(JDK_CHANGESET): Updated to bring in
	libpng 1.5 and src.zip fixes.
	(JDK_SHA256SUM): Likewise.
	* NEWS: Updated.

diff -r a42d0626100f -r ae4845b32444 ChangeLog
--- a/ChangeLog	Wed Aug 03 18:01:15 2011 +0100
+++ b/ChangeLog	Wed Aug 03 18:19:34 2011 +0100
@@ -1,3 +1,11 @@
+2011-08-03  Andrew John Hughes  <ahughes@redhat.com>
+
+	* Makefile.am:
+	(JDK_CHANGESET): Updated to bring in
+	libpng 1.5 and src.zip fixes.
+	(JDK_SHA256SUM): Likewise.
+	* NEWS: Updated.
+
 2011-08-03  Andrew John Hughes  <ahughes@redhat.com>
 
 	* Makefile.am:
diff -r a42d0626100f -r ae4845b32444 Makefile.am
--- a/Makefile.am	Wed Aug 03 18:01:15 2011 +0100
+++ b/Makefile.am	Wed Aug 03 18:19:34 2011 +0100
@@ -6,7 +6,7 @@
 HOTSPOT_CHANGESET = 1dd9b3d73b22
 JAXP_CHANGESET = c40983d6ae70
 JAXWS_CHANGESET = 83db5e316798
-JDK_CHANGESET = ccf86bbc61fd
+JDK_CHANGESET = e46d527097f1
 LANGTOOLS_CHANGESET = fb7fb3071b64
 OPENJDK_CHANGESET = 3defd24c2671
 
@@ -14,7 +14,7 @@
 HOTSPOT_SHA256SUM = ffb1831a63e950bb7ade46a5382cb71d2603e0f40b3f758eb346833e18fca150
 JAXP_SHA256SUM = 6ab0cab1965edb28e4093b55436abd04fbffe0b0251016043c75246c4ee9dc2d
 JAXWS_SHA256SUM = 5567c90ce2857016365b2e346783a3b16ec0e76b80586a0371f601b4fed01f21
-JDK_SHA256SUM = aedc601afad003ae30b9268cd47c229d00636c488ad921ce02883f68f35842e0
+JDK_SHA256SUM = 0cd074fb2400c95d013373847b5c52bb13997acbb6530507e384856583e1abd4
 LANGTOOLS_SHA256SUM = 9ddc00ec50fd2f5e331dc2bc10da4e23b69bf644eb92d50b39a2003c18fb5aa1
 OPENJDK_SHA256SUM = 4043a75c2c4385dd735f8dbbf2369311ce1b951217c9dbe9bba9609e24eb291e
 
diff -r a42d0626100f -r ae4845b32444 NEWS
--- a/NEWS	Wed Aug 03 18:01:15 2011 +0100
+++ b/NEWS	Wed Aug 03 18:19:34 2011 +0100
@@ -15,6 +15,8 @@
   - PR767: Annotation Processing Filer.getResource() always throws FileNotFoundException
   - Allow the compiler used to be overridden by setting BUILD_GCC/BUILD_CPP.
   - Fixed regression test runtime/7020373.
+  - PR586: Add missing sources to src.zip.
+  - G356743: Support building against libpng 1.5.
 * Zero/Shark
   - PR757, 7066143: 7009309 regression: x86 stubRoutines
   - PR753, 7066143: 7009923 regression