/hg/release/icedtea6-1.11: 3 new changesets

[andrew at icedtea.classpath.org]

changeset 2f53d9397c78 in /hg/release/icedtea6-1.11
details: http://icedtea.classpath.org/hg/release/icedtea6-1.11?cmd=changeset;node=2f53d9397c78
author: Andrew John Hughes <gnu.andrew at redhat.com>
date: Mon Feb 11 15:25:23 2013 +0000

	Match local 8004341 patch to upstream version now it's available.

	2013-02-11  Andrew John Hughes  <gnu.andrew at redhat.com>

		* Makefile.am:
		(ICEDTEA_PATCHES): Add additional patch to
		make 8004341 fix match upstream version.
		* patches/openjdk/8004341-jck_dialog_failure-02.patch:
		Fix issue with Dialog serialization.


changeset ae00216847f4 in /hg/release/icedtea6-1.11
details: http://icedtea.classpath.org/hg/release/icedtea6-1.11?cmd=changeset;node=ae00216847f4
author: Andrew John Hughes <gnu.andrew at redhat.com>
date: Mon Feb 11 17:02:44 2013 +0000

	Prepare for 1.11.7 release.

	2013-02-11  Andrew John Hughes  <gnu.andrew at redhat.com>

		* NEWS: Add release date of 1.11.7.
		* configure.ac: Prepare for 1.11.7.


changeset 77394d47e098 in /hg/release/icedtea6-1.11
details: http://icedtea.classpath.org/hg/release/icedtea6-1.11?cmd=changeset;node=77394d47e098
author: Andrew John Hughes <gnu.andrew at redhat.com>
date: Mon Feb 11 18:06:49 2013 +0000

	Added tag icedtea6-1.11.7 for changeset ae00216847f4


diffstat:

 .hgtags                                             |   1 +
 ChangeLog                                           |  13 +++++++++++++
 Makefile.am                                         |   3 ++-
 NEWS                                                |   2 +-
 configure.ac                                        |   2 +-
 patches/openjdk/8004341-jck_dialog_failure-02.patch |  18 ++++++++++++++++++
 6 files changed, 36 insertions(+), 3 deletions(-)

diffs (84 lines):

diff -r f9cce486b359 -r 77394d47e098 .hgtags
--- a/.hgtags	Fri Feb 08 13:00:04 2013 +0000
+++ b/.hgtags	Mon Feb 11 18:06:49 2013 +0000
@@ -29,3 +29,4 @@
 a773e4481576804dfdf51501727bd5461f88b801 icedtea6-1.11.4
 f63ce43904998e7e9ac04558ada787bb73044ef6 icedtea6-1.11.5
 5abf1a204fb2d79db87beb5735f4cff245e90ff6 icedtea6-1.11.6
+ae00216847f46fa26899a5317b75ea07edd5cb19 icedtea6-1.11.7
diff -r f9cce486b359 -r 77394d47e098 ChangeLog
--- a/ChangeLog	Fri Feb 08 13:00:04 2013 +0000
+++ b/ChangeLog	Mon Feb 11 18:06:49 2013 +0000
@@ -1,3 +1,16 @@
+2013-02-11  Andrew John Hughes  <gnu.andrew at redhat.com>
+
+	* NEWS: Add release date of 1.11.7.
+	* configure.ac: Prepare for 1.11.7.
+
+2013-02-11  Andrew John Hughes  <gnu.andrew at redhat.com>
+
+	* Makefile.am:
+	(ICEDTEA_PATCHES): Add additional patch to
+	make 8004341 fix match upstream version.
+	* patches/openjdk/8004341-jck_dialog_failure-02.patch:
+	Fix issue with Dialog serialization.
+
 2013-02-08  Andrew John Hughes  <gnu.andrew at redhat.com>
 
 	PR1297: cacao and jamvm parallel unpack failures
diff -r f9cce486b359 -r 77394d47e098 Makefile.am
--- a/Makefile.am	Fri Feb 08 13:00:04 2013 +0000
+++ b/Makefile.am	Mon Feb 11 18:06:49 2013 +0000
@@ -491,7 +491,8 @@
 	patches/openjdk/7199153-try_with_resources_pushed_to_6.patch \
 	patches/openjdk/7010849-modernise_sa.patch \
 	patches/openjdk/8005615-failure_to_load_logger_implementation.patch \
-	patches/openjdk/8004341-jck_dialog_failure.patch
+	patches/openjdk/8004341-jck_dialog_failure.patch \
+	patches/openjdk/8004341-jck_dialog_failure-02.patch
 
 if WITH_RHINO
 ICEDTEA_PATCHES += \
diff -r f9cce486b359 -r 77394d47e098 NEWS
--- a/NEWS	Fri Feb 08 13:00:04 2013 +0000
+++ b/NEWS	Mon Feb 11 18:06:49 2013 +0000
@@ -10,7 +10,7 @@
 
 CVE-XXXX-YYYY: http://www.cve.mitre.org/cgi-bin/cvename.cgi?name=XXXX-YYYY
 
-New in release 1.11.7 (2013-02-XX):
+New in release 1.11.7 (2013-02-11):
 
 * Backports
   - S8004341: Two JCK tests fails with 7u11 b06
diff -r f9cce486b359 -r 77394d47e098 configure.ac
--- a/configure.ac	Fri Feb 08 13:00:04 2013 +0000
+++ b/configure.ac	Mon Feb 11 18:06:49 2013 +0000
@@ -1,4 +1,4 @@
-AC_INIT([icedtea6],[1.11.7pre],[distro-pkg-dev at openjdk.java.net])
+AC_INIT([icedtea6],[1.11.7],[distro-pkg-dev at openjdk.java.net])
 AM_INIT_AUTOMAKE([1.9 tar-pax foreign])
 AC_CONFIG_FILES([Makefile])
 
diff -r f9cce486b359 -r 77394d47e098 patches/openjdk/8004341-jck_dialog_failure-02.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/openjdk/8004341-jck_dialog_failure-02.patch	Mon Feb 11 18:06:49 2013 +0000
@@ -0,0 +1,18 @@
+# HG changeset patch
+# User andrew
+# Date 1360590852 0
+# Node ID 892e940d9996b09c01796de27fd57225faf8be0a
+# Parent  c6058fa2a9824f71e06ca214aa8ec54400b56cc4
+8004341: Two JCK tests fails with 7u11 b06
+
+diff --git a/src/share/classes/java/awt/Dialog.java b/src/share/classes/java/awt/Dialog.java
+--- openjdk/jdk/src/share/classes/java/awt/Dialog.java
++++ openjdk/jdk/src/share/classes/java/awt/Dialog.java
+@@ -1643,7 +1643,6 @@
+         this.resizable = fields.get("resizable", true);
+         this.undecorated = fields.get("undecorated", false);
+         this.title = (String)fields.get("title", "");
+-        this.modalityType = localModalityType;
+ 
+         blockedWindows = new IdentityArrayList();
+