changeset in /hg/icedtea6: Integrate b10.

Mark Wielaard mark at klomp.org
Sun Jun 1 15:44:02 PDT 2008 

changeset 37c853f39fe3 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=37c853f39fe3
description:
	Integrate b10.

	2008-06-01  Mark Wielaard  <mark at klomp.org>

	       * Makefile.am (OPENJDK_DATE): Updated to 30_may_2008.
	       (OPENJDK_MD5SUM): Updated.
	       (OPENJDK_VERSION): Updated to b10.
	       (OPENJDK_SRC_ZIP): Adjusted to new underscore convention between
	       version and date in b10.
	       (ICEDTEA_PATCHES): Removed icedtea-xinerama.patch,
	       icedtea-color-profiles.patch and icedtea-hat-spl-gpl.patch.
	       * Makefile.in: Regenerated.
	       * patches/icedtea-copy-plugs.patch: Adjusted to remove sound
	       references in b10.
	       * patches/icedtea-gervill.patch: Adjusted to new sound service
	       files in b10.
	       * overlays/openjdk/jdk/src/share/lib/cmm/lcms/GRAY.pf: Removed.
	       * overlays/openjdk/jdk/src/share/lib/cmm/lcms/LINEAR_RGB.pf: Removed.
	       * overlays/openjdk/jdk/src/share/lib/cmm/lcms/PYCC.pf: Removed.
	       * patches/icedtea-color-profiles.patch: Removed.
	       * patches/icedtea-hat-spl-gpl.patch: Removed.
	       * patches/icedtea-xinerama.patch: Removed.

diffstat:

8 files changed, 49 insertions(+), 2311 deletions(-)
ChangeLog                            |   21 
Makefile.am                          |   11 
Makefile.in                          |   13 
patches/icedtea-color-profiles.patch |   29 
patches/icedtea-copy-plugs.patch     |   41 
patches/icedtea-gervill.patch        |   28 
patches/icedtea-hat-spl-gpl.patch    | 2133 ----------------------------------
patches/icedtea-xinerama.patch       |   84 -

diffs (truncated from 2509 to 500 lines):

diff -r cebc828cf765 -r 37c853f39fe3 ChangeLog
--- a/ChangeLog	Fri May 30 15:39:55 2008 +0200
+++ b/ChangeLog	Mon Jun 02 00:35:24 2008 +0200
@@ -1,3 +1,24 @@ 2008-05-30  Mark Wielaard  <mark at klomp.o
+2008-06-01  Mark Wielaard  <mark at klomp.org>
+
+	* Makefile.am (OPENJDK_DATE): Updated to 30_may_2008.
+	(OPENJDK_MD5SUM): Updated.
+	(OPENJDK_VERSION): Updated to b10.
+	(OPENJDK_SRC_ZIP): Adjusted to new underscore convention between
+	version and date in b10.
+	(ICEDTEA_PATCHES): Removed icedtea-xinerama.patch,
+	icedtea-color-profiles.patch and icedtea-hat-spl-gpl.patch.
+	* Makefile.in: Regenerated.
+	* patches/icedtea-copy-plugs.patch: Adjusted to remove sound
+	references in b10.
+	* patches/icedtea-gervill.patch: Adjusted to new sound service
+	files in b10.
+	* overlays/openjdk/jdk/src/share/lib/cmm/lcms/GRAY.pf: Removed.
+	* overlays/openjdk/jdk/src/share/lib/cmm/lcms/LINEAR_RGB.pf: Removed.
+	* overlays/openjdk/jdk/src/share/lib/cmm/lcms/PYCC.pf: Removed.
+	* patches/icedtea-color-profiles.patch: Removed.
+	* patches/icedtea-hat-spl-gpl.patch: Removed.
+	* patches/icedtea-xinerama.patch: Removed.
+
 2008-05-30  Mark Wielaard  <mark at klomp.org>
 
 	* patches/icedtea-ecj.patch: Use `cat file-list` not gjar -@ stdin.
diff -r cebc828cf765 -r 37c853f39fe3 Makefile.am
--- a/Makefile.am	Fri May 30 15:39:55 2008 +0200
+++ b/Makefile.am	Mon Jun 02 00:35:24 2008 +0200
@@ -1,6 +1,6 @@ OPENJDK_DATE = 11_apr_2008
-OPENJDK_DATE = 11_apr_2008
-OPENJDK_MD5SUM = 9ef5b6e83ec0c7a32bffd1a4de50fe5c
-OPENJDK_VERSION = b09
+OPENJDK_DATE = 30_may_2008
+OPENJDK_MD5SUM = 98e9eb16615605f76056135b0eb0b39f
+OPENJDK_VERSION = b10
 
 if NETX_PLUGIN
 NETX_PATCH = patches/icedtea-netx-plugin.patch
@@ -200,7 +200,7 @@ if USE_ALT_OPENJDK_SRC_ZIP
 if USE_ALT_OPENJDK_SRC_ZIP
   OPENJDK_SRC_ZIP = $(ALT_OPENJDK_SRC_ZIP)
 else
-  OPENJDK_SRC_ZIP = openjdk-6-src-$(OPENJDK_VERSION)-$(OPENJDK_DATE).tar.gz
+  OPENJDK_SRC_ZIP = openjdk-6-src-$(OPENJDK_VERSION)_$(OPENJDK_DATE).tar.gz
 endif
 
 stamps/download.stamp:
@@ -303,16 +303,13 @@ ICEDTEA_PATCHES = \
 	patches/icedtea-zero-build.patch \
 	patches/icedtea-print-lsb-release.patch \
 	patches/icedtea-jpegclasses.patch \
-	patches/icedtea-xinerama.patch \
 	patches/icedtea-arm-uname.patch \
 	patches/icedtea-ia64-fdlibm.patch \
 	patches/icedtea-LCMS-setTagData.patch \
 	patches/icedtea-color-createcontext.patch \
-	patches/icedtea-color-profiles.patch \
 	patches/icedtea-fonts.patch \
 	patches/icedtea-gervill.patch \
 	patches/icedtea-directaudio-close-trick.patch \
-	patches/icedtea-hat-spl-gpl.patch \
 	patches/icedtea-sparc.patch \
 	patches/icedtea-override-redirect-metacity.patch \
 	$(GCC_PATCH) \
diff -r cebc828cf765 -r 37c853f39fe3 Makefile.in
--- a/Makefile.in	Fri May 30 15:39:55 2008 +0200
+++ b/Makefile.in	Mon Jun 02 00:35:24 2008 +0200
@@ -249,9 +249,9 @@ target_alias = @target_alias@
 target_alias = @target_alias@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-OPENJDK_DATE = 11_apr_2008
-OPENJDK_MD5SUM = 9ef5b6e83ec0c7a32bffd1a4de50fe5c
-OPENJDK_VERSION = b09
+OPENJDK_DATE = 30_may_2008
+OPENJDK_MD5SUM = 98e9eb16615605f76056135b0eb0b39f
+OPENJDK_VERSION = b10
 @NETX_PLUGIN_FALSE at NETX_PATCH = 
 @NETX_PLUGIN_TRUE at NETX_PATCH = patches/icedtea-netx-plugin.patch
 EXTRA_DIST = rt generated $(ICEDTEA_PATCHES) $(ICEDTEA_ECJ_PATCH) \
@@ -360,7 +360,7 @@ ICEDTEA_ENV_ECJ = "ALT_JDK_IMPORT_PATH=$
 
 # Download OpenJDK sources.
 OPENJDK_URL = http://download.java.net/openjdk/jdk6/promoted/$(OPENJDK_VERSION)/
- at USE_ALT_OPENJDK_SRC_ZIP_FALSE@OPENJDK_SRC_ZIP = openjdk-6-src-$(OPENJDK_VERSION)-$(OPENJDK_DATE).tar.gz
+ at USE_ALT_OPENJDK_SRC_ZIP_FALSE@OPENJDK_SRC_ZIP = openjdk-6-src-$(OPENJDK_VERSION)_$(OPENJDK_DATE).tar.gz
 @USE_ALT_OPENJDK_SRC_ZIP_TRUE at OPENJDK_SRC_ZIP = $(ALT_OPENJDK_SRC_ZIP)
 @GCC_OLD_FALSE at GCC_PATCH = patches/icedtea-gcc-4.3.patch
 
@@ -409,14 +409,13 @@ ICEDTEA_PATCHES = $(ZERO_PATCHES_COND) \
 	patches/icedtea-zero-build.patch \
 	patches/icedtea-print-lsb-release.patch \
 	patches/icedtea-jpegclasses.patch \
-	patches/icedtea-xinerama.patch patches/icedtea-arm-uname.patch \
+	patches/icedtea-arm-uname.patch \
 	patches/icedtea-ia64-fdlibm.patch \
 	patches/icedtea-LCMS-setTagData.patch \
 	patches/icedtea-color-createcontext.patch \
-	patches/icedtea-color-profiles.patch \
 	patches/icedtea-fonts.patch patches/icedtea-gervill.patch \
 	patches/icedtea-directaudio-close-trick.patch \
-	patches/icedtea-hat-spl-gpl.patch patches/icedtea-sparc.patch \
+	patches/icedtea-sparc.patch \
 	patches/icedtea-override-redirect-metacity.patch $(GCC_PATCH) \
 	$(DISTRIBUTION_PATCHES) $(am__append_7)
 
diff -r cebc828cf765 -r 37c853f39fe3 overlays/openjdk/jdk/src/share/lib/cmm/lcms/GRAY.pf
Binary file overlays/openjdk/jdk/src/share/lib/cmm/lcms/GRAY.pf has changed
diff -r cebc828cf765 -r 37c853f39fe3 overlays/openjdk/jdk/src/share/lib/cmm/lcms/LINEAR_RGB.pf
Binary file overlays/openjdk/jdk/src/share/lib/cmm/lcms/LINEAR_RGB.pf has changed
diff -r cebc828cf765 -r 37c853f39fe3 overlays/openjdk/jdk/src/share/lib/cmm/lcms/PYCC.pf
Binary file overlays/openjdk/jdk/src/share/lib/cmm/lcms/PYCC.pf has changed
diff -r cebc828cf765 -r 37c853f39fe3 patches/icedtea-color-profiles.patch
--- a/patches/icedtea-color-profiles.patch	Fri May 30 15:39:55 2008 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,29 +0,0 @@
-# Changeset: 804b0757d801
-# Author:    prr
-# Date:      2008-04-24 11:58 -0700
-# URL:       http://hg.openjdk.java.net/jdk7/2d/jdk/rev/804b0757d801
-# 
-# 6523403: Need to provide lcms library with PYCC and LINEAR_RGB OS ICC profiles
-# Summary: Add two contributed profiles and a fix to GRAY.pf, all from Redhat, keiths at redhat.com contributed the GRAY.pf fix.
-# Reviewed-by: jgodinez, avu, prr
-# Contributed-by: aph at redhat.com
-#
-# .pf files can be found under overlays/openjdk/jdk/src/share/lib/cmm/lcms/
-
---- openjdk/jdk/make/sun/cmm/Makefile.orig	2008-04-27 23:59:37.000000000 +0200
-+++ openjdk/jdk/make/sun/cmm/Makefile	2008-04-27 23:59:45.000000000 +0200
-@@ -41,12 +41,8 @@
- ICCPROFILE_DEST_DIR = $(LIBDIR)/cmm
- 
- iccprofiles: $(ICCPROFILE_DEST_DIR)/sRGB.pf $(ICCPROFILE_DEST_DIR)/GRAY.pf \
--	     $(ICCPROFILE_DEST_DIR)/CIEXYZ.pf
--
--ifndef OPENJDK
--iccprofiles:  $(ICCPROFILE_DEST_DIR)/PYCC.pf \
--	      $(ICCPROFILE_DEST_DIR)/LINEAR_RGB.pf
--endif
-+	     $(ICCPROFILE_DEST_DIR)/CIEXYZ.pf $(ICCPROFILE_DEST_DIR)/PYCC.pf \
-+	     $(ICCPROFILE_DEST_DIR)/LINEAR_RGB.pf
- 
- $(ICCPROFILE_DEST_DIR)/sRGB.pf: $(ICCPROFILE_SRC_DIR)/sRGB.pf
- 	$(RM) $(ICCPROFILE_DEST_DIR)/sRGB.pf
diff -r cebc828cf765 -r 37c853f39fe3 patches/icedtea-copy-plugs.patch
--- a/patches/icedtea-copy-plugs.patch	Fri May 30 15:39:55 2008 +0200
+++ b/patches/icedtea-copy-plugs.patch	Mon Jun 02 00:35:24 2008 +0200
@@ -33,9 +33,9 @@ diff -urN openjdk.orig/jdk/src/share/cla
  
                  Type[] paramTypes = constr.getGenericParameterTypes();
                  if (paramTypes.length != propertyNames.length) {
---- openjdk.orig/jdk/make/common/internal/BinaryPlugs.gmk	2008-02-28 04:39:40.000000000 -0500
-+++ openjdk/jdk/make/common/internal/BinaryPlugs.gmk	2008-02-29 14:28:47.000000000 -0500
-@@ -51,28 +51,19 @@
+--- openjdk/jdk/make/common/internal/BinaryPlugs.gmk.orig	2008-05-30 09:50:36.000000000 +0200
++++ openjdk/jdk/make/common/internal/BinaryPlugs.gmk	2008-06-01 23:18:11.000000000 +0200
+@@ -49,33 +49,30 @@
  com/sun/jmx/snmp/SnmpDataTypeEnums.class \
  com/sun/jmx/snmp/SnmpDefinitions.class \
  com/sun/jmx/snmp/SnmpOid.class \
@@ -64,10 +64,6 @@ diff -urN openjdk.orig/jdk/src/share/cla
 -com/sun/jmx/snmp/daemon/WaitQ.class
 +com/sun/jmx/snmp/daemon/SnmpSession.class
  
- PLUG_SOUND_CLASS_NAMES = \
- com/sun/media/sound/AbstractPlayer.class \
-@@ -128,8 +119,14 @@
- 
  # Class list temp files (used by both import and export of plugs)
  
 +PLUG_GNU_CLASS_NAMES = gnu
@@ -77,14 +73,14 @@ diff -urN openjdk.orig/jdk/src/share/cla
 +PLUG_NETX_CLASS_NAMES = net
 +
  PLUG_TEMPDIR=$(ABS_TEMPDIR)/plugs
--PLUG_CLASS_AREAS = jmf sound
-+PLUG_CLASS_AREAS = jmf sound gnu javax netx
+-PLUG_CLASS_AREAS = jmf
++PLUG_CLASS_AREAS = jmf gnu javax netx
  PLUG_CLISTS = $(PLUG_CLASS_AREAS:%=$(PLUG_TEMPDIR)/%.clist)
  
  # Create jargs file command
-@@ -152,6 +149,21 @@
- 	@for i in $(PLUG_SOUND_CLASS_NAMES) ; do \
- 	  $(ECHO) "$$i" >> $@ ; \
+@@ -93,11 +90,32 @@
+ 	@for i in $(PLUG_JMF_CLASS_NAMES) ; do \
+ 	  $(ECHO) "$$i" >> $@; \
  	done
 +$(PLUG_TEMPDIR)/gnu.clist:
 +	@$(prep-target)
@@ -104,9 +100,7 @@ diff -urN openjdk.orig/jdk/src/share/cla
  $(PLUG_TEMPDIR)/all.clist: $(PLUG_CLISTS)
  	@$(prep-target)
  	$(CAT) $(PLUG_CLISTS) > $@
-@@ -159,6 +171,12 @@
- 	$(plug-create-jargs)
- $(PLUG_TEMPDIR)/sound.jargs: $(PLUG_TEMPDIR)/sound.clist
+ $(PLUG_TEMPDIR)/jmf.jargs: $(PLUG_TEMPDIR)/jmf.clist
  	$(plug-create-jargs)
 +$(PLUG_TEMPDIR)/gnu.jargs: $(PLUG_TEMPDIR)/gnu.clist
 +	$(plug-create-jargs)
@@ -117,7 +111,7 @@ diff -urN openjdk.orig/jdk/src/share/cla
  $(PLUG_TEMPDIR)/all.jargs: $(PLUG_TEMPDIR)/all.clist
  	$(plug-create-jargs)
  
-@@ -188,9 +206,9 @@
+@@ -125,9 +143,9 @@
  # Import classes command
  
  define import-binary-plug-classes
@@ -129,10 +123,10 @@ diff -urN openjdk.orig/jdk/src/share/cla
  endef # import-binary-plug-classes
  
  else # IMPORT_BINARY_PLUGS
-@@ -220,12 +238,21 @@
+@@ -153,11 +171,20 @@
+ 
+ import-binary-plug-jmf-classes: $(PLUG_IMPORT_JARFILE) $(PLUG_TEMPDIR)/jmf.clist
  	$(call import-binary-plug-classes,$(PLUG_TEMPDIR)/jmf.clist)
- import-binary-plug-sound-classes: $(PLUG_IMPORT_JARFILE) $(PLUG_TEMPDIR)/sound.clist
- 	$(call import-binary-plug-classes,$(PLUG_TEMPDIR)/sound.clist)
 +import-binary-plug-gnu-classes: $(PLUG_IMPORT_JARFILE) $(PLUG_TEMPDIR)/gnu.clist
 +	$(call import-binary-plug-classes,$(PLUG_TEMPDIR)/gnu.clist)
 +import-binary-plug-javax-classes: $(PLUG_IMPORT_JARFILE) $(PLUG_TEMPDIR)/javax.clist
@@ -143,12 +137,11 @@ diff -urN openjdk.orig/jdk/src/share/cla
  # Import all classes from the jar file
  
  import-binary-plug-jar: \
- 	     import-binary-plug-jmf-classes \
--	     import-binary-plug-sound-classes
-+	     import-binary-plug-sound-classes \
+-	     import-binary-plug-jmf-classes
++	     import-binary-plug-jmf-classes \
 +	     import-binary-plug-gnu-classes \
 +	     import-binary-plug-javax-classes \
-+	     import-binary-plug-netx-classes \
++	     import-binary-plug-netx-classes
  
- # Import native libraries
+ # Binary plug start/complete messages
  
diff -r cebc828cf765 -r 37c853f39fe3 patches/icedtea-gervill.patch
--- a/patches/icedtea-gervill.patch	Fri May 30 15:39:55 2008 +0200
+++ b/patches/icedtea-gervill.patch	Mon Jun 02 00:35:24 2008 +0200
@@ -1,33 +1,7 @@
 # Adds the provides defined by gervill (and removes non-existing ones).
 # Gervill can be found in the overlays under
 # openjdk/jdk/src/share/classes/com/sun/media/sound
---- openjdk/jdk/src/share/classes/com/sun/media/sound/services/javax.sound.midi.spi.MidiDeviceProvider.orig	2008-04-30 16:12:37.000000000 +0200
-+++ openjdk/jdk/src/share/classes/com/sun/media/sound/services/javax.sound.midi.spi.MidiDeviceProvider	2008-04-30 16:06:18.000000000 +0200
-@@ -1,5 +1,5 @@
- # Providers for midi devices
--com.sun.media.sound.MixerSynthProvider
- com.sun.media.sound.RealTimeSequencerProvider
- com.sun.media.sound.MidiOutDeviceProvider
- com.sun.media.sound.MidiInDeviceProvider
-+com.sun.media.sound.SoftProvider
---- openjdk/jdk/src/share/classes/com/sun/media/sound/services/javax.sound.midi.spi.SoundbankReader.orig	2008-04-30 16:13:18.000000000 +0200
-+++ openjdk/jdk/src/share/classes/com/sun/media/sound/services/javax.sound.midi.spi.SoundbankReader	2008-04-30 16:07:16.000000000 +0200
-@@ -1,2 +1,6 @@
- # Providers for Soundbanks
--com.sun.media.sound.HsbParser
-+com.sun.media.sound.PATSoundbankReader
-+com.sun.media.sound.DLSSoundbankReader
-+com.sun.media.sound.JARSoundbankReader
-+com.sun.media.sound.AudioFileSoundbankReader
-+com.sun.media.sound.SF2SoundbankReader
---- openjdk/jdk/src/share/classes/com/sun/media/sound/services/javax.sound.sampled.spi.AudioFileReader.orig	2008-04-30 16:13:58.000000000 +0200
-+++ openjdk/jdk/src/share/classes/com/sun/media/sound/services/javax.sound.sampled.spi.AudioFileReader	2008-04-30 16:01:27.000000000 +0200
-@@ -2,3 +2,5 @@
- com.sun.media.sound.AuFileReader
- com.sun.media.sound.AiffFileReader
- com.sun.media.sound.WaveFileReader
-+com.sun.media.sound.WaveFloatFileReader
-+com.sun.media.sound.SoftMidiAudioFileReader
+# (This currently overrides the one from b10 because we track Gervill CVS)
 --- /home/mark/src/openjdk/jdk/src/share/classes/com/sun/media/sound/services/javax.sound.sampled.spi.FormatConversionProvider	2008-04-13 01:05:30.000000000 +0200
 +++ openjdk/jdk/src/share/classes/com/sun/media/sound/services/javax.sound.sampled.spi.FormatConversionProvider	2008-05-09 02:54:26.000000000 +0200
 @@ -2,3 +2,4 @@
diff -r cebc828cf765 -r 37c853f39fe3 patches/icedtea-hat-spl-gpl.patch
--- a/patches/icedtea-hat-spl-gpl.patch	Fri May 30 15:39:55 2008 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,2133 +0,0 @@
-Changeset: d70a63c92b49
-Author:    ohair
-Date:      2008-04-30 17:34 -0700
-URL:       http://hg.openjdk.java.net/jdk7/build/jdk/rev/d70a63c92b49
-
-6695553: Cleanup GPLv2+SPL legal notices in hat sources
-Summary: Just correcting the legal notices on the HAT sources.
-Reviewed-by: alanb
-
---- openjdk/jdk/src/share/classes/com/sun/tools/hat/Main.java	Fri Apr 18 16:40:32 2008 -0700
-+++ openjdk/jdk/src/share/classes/com/sun/tools/hat/Main.java	Wed Apr 30 17:34:41 2008 -0700
-@@ -23,18 +23,10 @@
-  * have any questions.
-  */
- 
--
- /*
-- * The contents of this file are subject to the Sun Public License
-- * Version 1.0 (the "License"); you may not use this file except in
-- * compliance with the License. A copy of the License is available at
-- * http://www.sun.com/, and in the file LICENSE.html in the
-- * doc directory.
-- *
-  * The Original Code is HAT. The Initial Developer of the
-  * Original Code is Bill Foote, with contributions from others
-- * at JavaSoft/Sun. Portions created by Bill Foote and others
-- * at Javasoft/Sun are Copyright (C) 1997-2004. All Rights Reserved.
-+ * at JavaSoft/Sun.
-  */
- 
- package com.sun.tools.hat;
---- openjdk/jdk/src/share/classes/com/sun/tools/hat/build.xml	Fri Apr 18 16:40:32 2008 -0700
-+++ openjdk/jdk/src/share/classes/com/sun/tools/hat/build.xml	Wed Apr 30 17:34:41 2008 -0700
-@@ -27,19 +27,9 @@
- 
- <!-- 
- 
-- The contents of this file are subject to the Sun Public License
-- Version 1.0 (the "License"); you may not use this file except in
-- compliance with the License. A copy of the License is available at
-- http://www.sun.com/, and in the file LICENSE.html in the
-- doc directory.
-- 
-  The Original Code is HAT. The Initial Developer of the
-  Original Code is Bill Foote, with contributions from others
-- at JavaSoft/Sun. Portions created by Bill Foote and others
-- at Javasoft/Sun are Copyright (C) 1997-2004. All Rights Reserved.
-- 
-- In addition to the formal license, I ask that you don't
-- change the history or donations files without permission.
-+ at JavaSoft/Sun.
- 
- -->
- 
---- openjdk/jdk/src/share/classes/com/sun/tools/hat/internal/model/AbstractJavaHeapObjectVisitor.java	Fri Apr 18 16:40:32 2008 -0700
-+++ openjdk/jdk/src/share/classes/com/sun/tools/hat/internal/model/AbstractJavaHeapObjectVisitor.java	Wed Apr 30 17:34:41 2008 -0700
-@@ -1,5 +1,5 @@
- /*
-- * Copyright 2005 Sun Microsystems, Inc.  All Rights Reserved.
-+ * Copyright 1997-2005 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-  *
-  * This code is free software; you can redistribute it and/or modify it
-@@ -25,20 +25,9 @@
- 
- 
- /*
-- * The contents of this file are subject to the Sun Public License
-- * Version 1.0 (the "License"); you may not use this file except in
-- * compliance with the License. A copy of the License is available at
-- * http://www.sun.com/, and in the file LICENSE.html in the
-- * doc directory.
-- *
-  * The Original Code is HAT. The Initial Developer of the
-  * Original Code is Bill Foote, with contributions from others
-- * at JavaSoft/Sun. Portions created by Bill Foote and others
-- * at Javasoft/Sun are Copyright (C) 1997-2004. All Rights Reserved.
-- *
-- * In addition to the formal license, I ask that you don't
-- * change the history or donations files without permission.
-- *
-+ * at JavaSoft/Sun.
-  */
- 
- package com.sun.tools.hat.internal.model;
---- openjdk/jdk/src/share/classes/com/sun/tools/hat/internal/model/ArrayTypeCodes.java	Fri Apr 18 16:40:32 2008 -0700
-+++ openjdk/jdk/src/share/classes/com/sun/tools/hat/internal/model/ArrayTypeCodes.java	Wed Apr 30 17:34:41 2008 -0700
-@@ -1,5 +1,5 @@
- /*
-- * Copyright 2005 Sun Microsystems, Inc.  All Rights Reserved.
-+ * Copyright 1997-2005 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-  *
-  * This code is free software; you can redistribute it and/or modify it
-@@ -25,20 +25,9 @@
- 
- 
- /*
-- * The contents of this file are subject to the Sun Public License
-- * Version 1.0 (the "License"); you may not use this file except in
-- * compliance with the License. A copy of the License is available at
-- * http://www.sun.com/, and in the file LICENSE.html in the
-- * doc directory.
-- *
-  * The Original Code is HAT. The Initial Developer of the
-  * Original Code is Bill Foote, with contributions from others
-- * at JavaSoft/Sun. Portions created by Bill Foote and others
-- * at Javasoft/Sun are Copyright (C) 1997-2004. All Rights Reserved.
-- *
-- * In addition to the formal license, I ask that you don't
-- * change the history or donations files without permission.
-- *
-+ * at JavaSoft/Sun.
-  */
- 
- package com.sun.tools.hat.internal.model;
---- openjdk/jdk/src/share/classes/com/sun/tools/hat/internal/model/HackJavaValue.java	Fri Apr 18 16:40:32 2008 -0700
-+++ openjdk/jdk/src/share/classes/com/sun/tools/hat/internal/model/HackJavaValue.java	Wed Apr 30 17:34:41 2008 -0700
-@@ -1,5 +1,5 @@
- /*
-- * Copyright 2005 Sun Microsystems, Inc.  All Rights Reserved.
-+ * Copyright 1997-2005 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-  *
-  * This code is free software; you can redistribute it and/or modify it
-@@ -25,20 +25,9 @@
- 
- 
- /*
-- * The contents of this file are subject to the Sun Public License
-- * Version 1.0 (the "License"); you may not use this file except in
-- * compliance with the License. A copy of the License is available at
-- * http://www.sun.com/, and in the file LICENSE.html in the
-- * doc directory.
-- *
-  * The Original Code is HAT. The Initial Developer of the
-  * Original Code is Bill Foote, with contributions from others
-- * at JavaSoft/Sun. Portions created by Bill Foote and others
-- * at Javasoft/Sun are Copyright (C) 1997-2004. All Rights Reserved.
-- *
-- * In addition to the formal license, I ask that you don't
-- * change the history or donations files without permission.
-- *
-+ * at JavaSoft/Sun.
-  */
- 
- package com.sun.tools.hat.internal.model;
---- openjdk/jdk/src/share/classes/com/sun/tools/hat/internal/model/JavaBoolean.java	Fri Apr 18 16:40:32 2008 -0700
-+++ openjdk/jdk/src/share/classes/com/sun/tools/hat/internal/model/JavaBoolean.java	Wed Apr 30 17:34:41 2008 -0700
-@@ -1,5 +1,5 @@
- /*
-- * Copyright 2005 Sun Microsystems, Inc.  All Rights Reserved.
-+ * Copyright 1997-2005 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-  *
-  * This code is free software; you can redistribute it and/or modify it
-@@ -25,20 +25,9 @@
- 
- 
- /*
-- * The contents of this file are subject to the Sun Public License
-- * Version 1.0 (the "License"); you may not use this file except in
-- * compliance with the License. A copy of the License is available at
-- * http://www.sun.com/, and in the file LICENSE.html in the
-- * doc directory.
-- *
-  * The Original Code is HAT. The Initial Developer of the
-  * Original Code is Bill Foote, with contributions from others
-- * at JavaSoft/Sun. Portions created by Bill Foote and others
-- * at Javasoft/Sun are Copyright (C) 1997-2004. All Rights Reserved.
-- *
-- * In addition to the formal license, I ask that you don't
-- * change the history or donations files without permission.
-- *
-+ * at JavaSoft/Sun.
-  */
- 
- package com.sun.tools.hat.internal.model;
---- openjdk/jdk/src/share/classes/com/sun/tools/hat/internal/model/JavaByte.java	Fri Apr 18 16:40:32 2008 -0700
-+++ openjdk/jdk/src/share/classes/com/sun/tools/hat/internal/model/JavaByte.java	Wed Apr 30 17:34:41 2008 -0700
-@@ -1,5 +1,5 @@
- /*
-- * Copyright 2005 Sun Microsystems, Inc.  All Rights Reserved.
-+ * Copyright 1997-2005 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-  *
-  * This code is free software; you can redistribute it and/or modify it
-@@ -25,20 +25,9 @@
- 
- 
- /*
-- * The contents of this file are subject to the Sun Public License
-- * Version 1.0 (the "License"); you may not use this file except in
-- * compliance with the License. A copy of the License is available at
-- * http://www.sun.com/, and in the file LICENSE.html in the
-- * doc directory.
-- *
-  * The Original Code is HAT. The Initial Developer of the
-  * Original Code is Bill Foote, with contributions from others
-- * at JavaSoft/Sun. Portions created by Bill Foote and others
-- * at Javasoft/Sun are Copyright (C) 1997-2004. All Rights Reserved.
-- *
-- * In addition to the formal license, I ask that you don't
-- * change the history or donations files without permission.
-- *
-+ * at JavaSoft/Sun.
-  */
- 
- package com.sun.tools.hat.internal.model;
---- openjdk/jdk/src/share/classes/com/sun/tools/hat/internal/model/JavaChar.java	Fri Apr 18 16:40:32 2008 -0700
-+++ openjdk/jdk/src/share/classes/com/sun/tools/hat/internal/model/JavaChar.java	Wed Apr 30 17:34:41 2008 -0700
-@@ -1,5 +1,5 @@

More information about the distro-pkg-dev mailing list