changeset in /hg/icedtea: Bump to b38.
Andrew John Hughes
gnu_andrew at member.fsf.org
Mon Oct 27 13:09:53 PDT 2008
changeset 7ff57d37137f in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=7ff57d37137f
description:
Bump to b38.
2008-10-27 Andrew John Hughes <ahughes at redhat.com>
* patches/icedtea-license-headers.patch,
* patches/icedtea-timerqueue.patch:
Removed, now obsolete for IcedTea7.
* HACKING: Updated.
* Makefile.am: Bump to b38.
diffstat:
5 files changed, 13 insertions(+), 106 deletions(-)
ChangeLog | 8 +++
HACKING | 4 -
Makefile.am | 8 +--
patches/icedtea-license-headers.patch | 81 ---------------------------------
patches/icedtea-timerqueue.patch | 18 -------
diffs (183 lines):
diff -r 0c1f4e6469c9 -r 7ff57d37137f ChangeLog
--- a/ChangeLog Mon Oct 27 14:15:38 2008 +0000
+++ b/ChangeLog Mon Oct 27 20:09:41 2008 +0000
@@ -1,3 +1,11 @@ 2008-10-27 Andrew John Hughes <ahughes
+2008-10-27 Andrew John Hughes <ahughes at redhat.com>
+
+ * patches/icedtea-license-headers.patch,
+ * patches/icedtea-timerqueue.patch:
+ Removed, now obsolete for IcedTea7.
+ * HACKING: Updated.
+ * Makefile.am: Bump to b38.
+
2008-10-27 Andrew John Hughes <ahughes at redhat.com>
* configure.ac:
diff -r 0c1f4e6469c9 -r 7ff57d37137f HACKING
--- a/HACKING Mon Oct 27 14:15:38 2008 +0000
+++ b/HACKING Mon Oct 27 20:09:41 2008 +0000
@@ -9,7 +9,6 @@ included in the tarball resulting from t
* icedtea-idl.patch: Fix IDL licenses (PR141/S6695776).
* icedtea-jscheme.patch: Replace use of jscheme.jar with Java alternative (PR140/S6695776).
-* icedtea-license-headers.patch: Generate GPL header from automulti tool (PR148/S6713083).
The fsg.sh script is also run to delete certain files with dubious licensing and/or only occuring
in binary format.
@@ -53,7 +52,6 @@ The following patches are currently appl
* icedtea-static-libstdc++.patch: Don't use static C++ on PPC64.
* icedtea-sunsrc.patch: Remove service property files from TOOLS list.
* icedtea-text-relocations.patch: Use correct -fPIC/-fpic flag on all platforms.
-* icedtea-timerqueue.patch: Fix setting of running variable (PR87).
* icedtea-tools.patch: Remove DebugHelperHelper and add sources in make/java/awt/Makefile to fix build of jvmti.
* icedtea-use-system-tzdata.patch: Use timezone data from the system (PR70/S6593486).
* icedtea-version.patch: Replace name and bug URL with IcedTea versions.
@@ -78,6 +76,7 @@ The following patches are only applied t
* icedtea-lucene-crash.patch: Fix lucene bad code generation bug #6707044.
* icedtea-6700047-loopopts.patch: Fix partial peeling issue, bug #6700047.
* icedtea-6712835-ifnode.patch: Fix infinite loop in PhaseIterGVN::transform.
+* icedtea-timerqueue.patch: Fix setting of running variable (PR87/S6623943).
The following patches are only applied to OpenJDK in IcedTea:
@@ -159,3 +158,4 @@ XSL file (S6707485): Included upstream i
XSL file (S6707485): Included upstream in OpenJDK7 b29/hs13.
* openjdk-color.patch: Include Free java.awt.color and java.awt.image
(S6662775): Included upstream in OpenJDK6 b06 and OpenJDK7 b28.
+* icedtea-license-headers.patch: Generate GPL header from automulti tool (PR148/S6713083).
diff -r 0c1f4e6469c9 -r 7ff57d37137f Makefile.am
--- a/Makefile.am Mon Oct 27 14:15:38 2008 +0000
+++ b/Makefile.am Mon Oct 27 20:09:41 2008 +0000
@@ -1,6 +1,6 @@ OPENJDK_DATE = 09_oct_2008
-OPENJDK_DATE = 09_oct_2008
-OPENJDK_MD5SUM = 979a7f60de588f1f416657d41ad5e63c
-OPENJDK_VERSION = b37
+OPENJDK_DATE = 23_oct_2008
+OPENJDK_MD5SUM = 2893ceeae804ce4f7e268388afed3449
+OPENJDK_VERSION = b38
CACAO_VERSION = 0.99.3
CACAO_MD5SUM = 80de3ad344c1a20c086ec5f1390bd1b8
@@ -521,7 +521,6 @@ endif
endif
ICEDTEA_FSG_PATCHES = \
- patches/icedtea-license-headers.patch \
patches/icedtea-idl.patch \
patches/icedtea-jscheme.patch
@@ -551,7 +550,6 @@ ICEDTEA_PATCHES = \
patches/icedtea-core-build.patch \
patches/icedtea-linker-options.patch \
patches/icedtea-static-libstdc++.patch \
- patches/icedtea-timerqueue.patch \
patches/icedtea-lib64.patch \
patches/icedtea-zero-build.patch \
patches/icedtea-print-lsb-release.patch \
diff -r 0c1f4e6469c9 -r 7ff57d37137f patches/icedtea-license-headers.patch
--- a/patches/icedtea-license-headers.patch Mon Oct 27 14:15:38 2008 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,81 +0,0 @@
---- ../opienjdkb23/openjdk/jdk/make/tools/src/build/tools/automulti/AutoMulti.java 2007-10-30 04:39:58.000000000 -0400
-+++ openjdk/jdk/make/tools/src/build/tools/automulti/AutoMulti.java 2007-11-13 13:09:08.000000000 -0500
-@@ -99,15 +99,30 @@
- */
- public static StringBuffer createPreamble(String prefixName) {
- StringBuffer s = new StringBuffer();
-- s.append("/*\n");
-+ s.append("/* Copyright 2003-2006 Sun Microsystems, Inc. All Rights Reserved.\n");
-+ s.append(" * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.\n");
- s.append(" *\n");
-- s.append(" * Copyright 1997-2007 Sun Microsystems, Inc. All Rights Reserved.\n");
-- s.append(" * \n");
-- s.append(" * This software is the proprietary information of Sun Microsystems, Inc. \n");
-- s.append(" * Use is subject to license terms.\n");
-- s.append(" * \n");
-+ s.append(" * This code is free software; you can redistribute it and/or modify it\n");
-+ s.append(" * under the terms of the GNU General Public License version 2 only, as\n");
-+ s.append(" * published by the Free Software Foundation. Sun designates this\n");
-+ s.append(" * particular file as subject to the \"Classpath\" exception as provided\n");
-+ s.append(" * by Sun in the LICENSE file that accompanied this code.\n");
-+ s.append(" *\n");
-+ s.append(" * This code is distributed in the hope that it will be useful, but WITHOUT\n");
-+ s.append(" * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or\n");
-+ s.append(" * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License\n");
-+ s.append(" * version 2 for more details (a copy is included in the LICENSE file that\n");
-+ s.append(" * accompanied this code).\n");
-+ s.append(" *\n");
-+ s.append(" * You should have received a copy of the GNU General Public License version\n");
-+ s.append(" * 2 along with this work; if not, write to the Free Software Foundation,\n");
-+ s.append(" * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.\n");
-+ s.append(" *\n");
-+ s.append(" * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,\n");
-+ s.append(" * CA 95054 USA or visit www.sun.com if you need additional information or\n");
-+ s.append(" * have any questions.\n");
- s.append(" */\n");
-- s.append("package " + prefixName + ".swing.plaf.multi;\n");
-+ s.append("package " + prefixName + ".swing.plaf.multi;\n");
- s.append("\n");
- return s;
- }
---- ../opeiinjdkb23/openjdk/jdk/make/tools/src/build/tools/automulti/TestALFGenerator.java 2007-10-30 04:39:58.000000000 -0400
-+++ openjdk/jdk/make/tools/src/build/tools/automulti/TestALFGenerator.java 2007-11-13 13:10:19.000000000 -0500
-@@ -102,15 +102,29 @@
- */
- public static StringBuffer createPreamble(String prefixName) {
- StringBuffer s = new StringBuffer();
-- s.append("/*\n");
-- s.append(" *\n");
-- s.append(" * Copyright 1997-2007 Sun Microsystems, Inc. All Rights Reserved.\n");
-- s.append(" * \n");
-- s.append(" * This software is the proprietary information of Sun Microsystems, Inc. \n");
-- s.append(" * Use is subject to license terms.\n");
-- s.append(" * \n");
-- s.append(" */\n");
-- if (packageName != null) {
-+ s.append("/* Copyright 2003-2006 Sun Microsystems, Inc. All Rights Reserved.\n");
-+ s.append(" * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.\n");
-+ s.append(" *\n");
-+ s.append(" * under the terms of the GNU General Public License version 2 only, as\n");
-+ s.append(" * published by the Free Software Foundation. Sun designates this\n");
-+ s.append(" * particular file as subject to the \"Classpath\" exception as provided\n");
-+ s.append(" * by Sun in the LICENSE file that accompanied this code.\n");
-+ s.append(" *\n");
-+ s.append(" * This code is distributed in the hope that it will be useful, but WITHOUT\n");
-+ s.append(" * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or\n");
-+ s.append(" * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License\n");
-+ s.append(" * version 2 for more details (a copy is included in the LICENSE file that\n");
-+ s.append(" * accompanied this code).\n");
-+ s.append(" *\n");
-+ s.append(" * You should have received a copy of the GNU General Public License version\n");
-+ s.append(" * 2 along with this work; if not, write to the Free Software Foundation,\n");
-+ s.append(" * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.\n");
-+ s.append(" *\n");
-+ s.append(" * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,\n");
-+ s.append(" * CA 95054 USA or visit www.sun.com if you need additional information or\n");
-+ s.append(" * have any questions.\n");
-+ s.append(" */\n");
-+ if (packageName != null) {
- s.append("package " + packageName + ";\n");
- s.append("\n");
- }
diff -r 0c1f4e6469c9 -r 7ff57d37137f patches/icedtea-timerqueue.patch
--- a/patches/icedtea-timerqueue.patch Mon Oct 27 14:15:38 2008 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,18 +0,0 @@
---- TimerQueue.java.orig 2007-12-13 14:08:33.000000000 -0500
-+++ openjdk/jdk/src/share/classes/javax/swing/TimerQueue.java 2007-12-13 14:08:52.000000000 -0500
-@@ -106,7 +106,6 @@
- return null;
- }
- });
-- running = true;
- }
- }
-
-@@ -164,6 +163,7 @@
-
-
- public void run() {
-+ running = true;
- try {
- while (running) {
- try {
More information about the distro-pkg-dev
mailing list