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

[andrew at icedtea.classpath.org]

changeset 5de52fb737ad in /hg/release/icedtea6-1.12
details: http://icedtea.classpath.org/hg/release/icedtea6-1.12?cmd=changeset;node=5de52fb737ad
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 ba91bee6c0d6 in /hg/release/icedtea6-1.12
details: http://icedtea.classpath.org/hg/release/icedtea6-1.12?cmd=changeset;node=ba91bee6c0d6
author: Andrew John Hughes <gnu.andrew at redhat.com>
date: Mon Feb 11 15:36:15 2013 +0000

	Prepare for 1.12.2.

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

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


changeset 78bd642b19af in /hg/release/icedtea6-1.12
details: http://icedtea.classpath.org/hg/release/icedtea6-1.12?cmd=changeset;node=78bd642b19af
author: Andrew John Hughes <gnu.andrew at redhat.com>
date: Mon Feb 11 16:59:54 2013 +0000

	Added tag icedtea6-1.12.2 for changeset ba91bee6c0d6


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 4a6f2eb69167 -r 78bd642b19af .hgtags
--- a/.hgtags	Fri Feb 08 13:31:03 2013 +0000
+++ b/.hgtags	Mon Feb 11 16:59:54 2013 +0000
@@ -24,3 +24,4 @@
 5a1e1b39664409e9a0945ba49b558f25ef976c58 icedtea6-1.12-branchpoint
 69b6ee29712304225f57535e507e6745e478ae9e icedtea6-1.12
 63fea6a4bee0e2e8ecb9f2061dba92be4924ddb4 icedtea6-1.12.1
+ba91bee6c0d6d4634a4d6de69095af01689f7419 icedtea6-1.12.2
diff -r 4a6f2eb69167 -r 78bd642b19af ChangeLog
--- a/ChangeLog	Fri Feb 08 13:31:03 2013 +0000
+++ b/ChangeLog	Mon Feb 11 16:59:54 2013 +0000
@@ -1,3 +1,16 @@
+2013-02-11  Andrew John Hughes  <gnu.andrew at redhat.com>
+
+	* NEWS: Add release date of 1.12.2.
+	* configure.ac: Prepare for 1.12.2.
+
+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>
 
 	PR1301: PR1171 causes Zero builds to fail
diff -r 4a6f2eb69167 -r 78bd642b19af Makefile.am
--- a/Makefile.am	Fri Feb 08 13:31:03 2013 +0000
+++ b/Makefile.am	Mon Feb 11 16:59:54 2013 +0000
@@ -502,7 +502,8 @@
 	patches/traceable.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 4a6f2eb69167 -r 78bd642b19af NEWS
--- a/NEWS	Fri Feb 08 13:31:03 2013 +0000
+++ b/NEWS	Mon Feb 11 16:59:54 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.12.2 (2013-XX-YY):
+New in release 1.12.2 (2013-02-11):
 
 * Backports
   - S8004341: Two JCK tests fails with 7u11 b06
diff -r 4a6f2eb69167 -r 78bd642b19af configure.ac
--- a/configure.ac	Fri Feb 08 13:31:03 2013 +0000
+++ b/configure.ac	Mon Feb 11 16:59:54 2013 +0000
@@ -1,4 +1,4 @@
-AC_INIT([icedtea6],[1.12.2pre],[distro-pkg-dev at openjdk.java.net])
+AC_INIT([icedtea6],[1.12.2],[distro-pkg-dev at openjdk.java.net])
 AM_INIT_AUTOMAKE([1.9 tar-pax foreign])
 AC_CONFIG_FILES([Makefile])
 
diff -r 4a6f2eb69167 -r 78bd642b19af 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 16:59:54 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();
+