FYI:[icedtea6] Add IDL header fix
Andrew John Hughes
gnu_andrew at member.fsf.org
Wed Jun 25 14:46:04 PDT 2008
This applies the patch Iris posted for the IDL headers
to IcedTea6.
ChangeLog:
2008-06-25 Andrew John Hughes <gnu_andrew at member.fsf.org>
* HACKING: Update with new patch.
* Makefile.am: Add patch.
* Makefile.in,
* configure: Regenerated.
* patches/icedtea-idl.patch:
New patch to fix licensing on IDL files.
See PR141.
--
Andrew :)
Support Free Java!
Contribute to GNU Classpath and the OpenJDK
http://www.gnu.org/software/classpath
http://openjdk.java.net
PGP Key: 94EFD9D8 (http://subkeys.pgp.net)
Fingerprint = F8EF F1EA 401E 2E60 15FA 7927 142C 2591 94EF D9D8
-------------- next part --------------
diff -r 2cbd3adb240b HACKING
--- a/HACKING Wed Jun 25 21:11:26 2008 +0100
+++ b/HACKING Wed Jun 25 22:44:16 2008 +0100
@@ -26,6 +26,7 @@ The following patches are currently appl
* icedtea-gervill.patch: Add support for Gervill from the overlay.
* icedtea-graphics.patch: Fix word wrap in JTextArea (PR57/S6593649)
* icedtea-ia64-fdlibm.patch: Fix name of ia64 architecture from _M_IA64 to ia64.
+* icedtea-idl.patch: Fix IDL licenses (PR141).
* icedtea-javafiles.patch: Add missing Java files to list.
* icedtea-jpegclasses.patch: Add com.sun.image.codec.jpeg support.
* icedtea-jscheme.patch: Replace use of jscheme.jar with Java alternative (PR140).
diff -r 2cbd3adb240b Makefile.am
--- a/Makefile.am Wed Jun 25 21:11:26 2008 +0100
+++ b/Makefile.am Wed Jun 25 22:44:16 2008 +0100
@@ -348,6 +348,7 @@ ICEDTEA_PATCHES = \
patches/icedtea-jscheme.patch \
patches/icedtea-dnd-updatecursor.patch \
patches/icedtea-component.patch \
+ patches/icedtea-idl.patch \
patches/icedtea-shark-build.patch \
$(SHARK_PATCH) \
$(GCC_PATCH) \
diff -r 2cbd3adb240b Makefile.in
--- a/Makefile.in Wed Jun 25 21:11:26 2008 +0100
+++ b/Makefile.in Wed Jun 25 22:44:16 2008 +0100
@@ -454,7 +454,7 @@ ICEDTEA_PATCHES = $(ZERO_PATCHES_COND) \
patches/icedtea-override-redirect-metacity.patch \
patches/icedtea-no-bcopy.patch patches/icedtea-jscheme.patch \
patches/icedtea-dnd-updatecursor.patch \
- patches/icedtea-component.patch \
+ patches/icedtea-component.patch patches/icedtea-idl.patch \
patches/icedtea-shark-build.patch $(SHARK_PATCH) $(GCC_PATCH) \
$(DISTRIBUTION_PATCHES) $(am__append_7) $(am__append_8)
diff -r 2cbd3adb240b configure
--- a/configure Wed Jun 25 21:11:26 2008 +0100
+++ b/configure Wed Jun 25 22:44:16 2008 +0100
@@ -13259,9 +13259,11 @@ LLVM_CFLAGS!$LLVM_CFLAGS$ac_delim
LLVM_CFLAGS!$LLVM_CFLAGS$ac_delim
LLVM_LDFLAGS!$LLVM_LDFLAGS$ac_delim
LLVM_LIBS!$LLVM_LIBS$ac_delim
-_ACEOF
-
- if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 95; then
+LIBOBJS!$LIBOBJS$ac_delim
+LTLIBOBJS!$LTLIBOBJS$ac_delim
+_ACEOF
+
+ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
break
elif $ac_last_try; then
{ { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
@@ -13280,7 +13282,7 @@ fi
cat >>$CONFIG_STATUS <<_ACEOF
cat >"\$tmp/subs-2.sed" <<\CEOF$ac_eof
-/@[a-zA-Z_][a-zA-Z_0-9]*@/!b end
+/@[a-zA-Z_][a-zA-Z_0-9]*@/!b
_ACEOF
sed '
s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g
@@ -13293,53 +13295,6 @@ N; s/^.*\n//; s/[,\\&]/\\&/g; s/@/@|#_!!
' >>$CONFIG_STATUS <conf$$subs.sed
rm -f conf$$subs.sed
cat >>$CONFIG_STATUS <<_ACEOF
-:end
-s/|#_!!_#|//g
-CEOF$ac_eof
-_ACEOF
-
-
-ac_delim='%!_!# '
-for ac_last_try in false false false false false :; do
- cat >conf$$subs.sed <<_ACEOF
-LIBOBJS!$LIBOBJS$ac_delim
-LTLIBOBJS!$LTLIBOBJS$ac_delim
-_ACEOF
-
- if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 2; then
- break
- elif $ac_last_try; then
- { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
-echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
- { (exit 1); exit 1; }; }
- else
- ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
- fi
-done
-
-ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF/0/p' conf$$subs.sed`
-if test -n "$ac_eof"; then
- ac_eof=`echo "$ac_eof" | sort -nru | sed 1q`
- ac_eof=`expr $ac_eof + 1`
-fi
-
-cat >>$CONFIG_STATUS <<_ACEOF
-cat >"\$tmp/subs-3.sed" <<\CEOF$ac_eof
-/@[a-zA-Z_][a-zA-Z_0-9]*@/!b end
-_ACEOF
-sed '
-s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g
-s/^/s,@/; s/!/@,|#_!!_#|/
-:n
-t n
-s/'"$ac_delim"'$/,g/; t
-s/$/\\/; p
-N; s/^.*\n//; s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g; b n
-' >>$CONFIG_STATUS <conf$$subs.sed
-rm -f conf$$subs.sed
-cat >>$CONFIG_STATUS <<_ACEOF
-:end
-s/|#_!!_#|//g
CEOF$ac_eof
_ACEOF
@@ -13593,13 +13548,7 @@ s&@INSTALL@&$ac_INSTALL&;t t
s&@INSTALL@&$ac_INSTALL&;t t
s&@MKDIR_P@&$ac_MKDIR_P&;t t
$ac_datarootdir_hack
-<<<<<<< /home/andrew/projects/openjdk/icedtea6/configure.orig.250236848
-" $ac_file_inputs | sed -f "$tmp/subs-1.sed" | sed -f "$tmp/subs-2.sed" | sed -f "$tmp/subs-3.sed" >$tmp/out
-||||||| /tmp/configure~base.IJALPd
" $ac_file_inputs | sed -f "$tmp/subs-1.sed" | sed -f "$tmp/subs-2.sed" | sed 's/|#_!!_#|//g' >$tmp/out
-=======
-" $ac_file_inputs | sed -f "$tmp/subs-1.sed" | sed -f "$tmp/subs-2.sed" >$tmp/out
->>>>>>> /tmp/configure~other.W-AeMN
test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
{ ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } &&
diff -r 2cbd3adb240b patches/icedtea-idl.patch
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/icedtea-idl.patch Wed Jun 25 22:44:16 2008 +0100
@@ -0,0 +1,505 @@
+--- openjdk.old/corba/src/share/classes/com/sun/tools/corba/se/idl/first.set Wed Jun 25 10:48:45 2008
++++ openjdk/corba/src/share/classes/com/sun/tools/corba/se/idl/first.set Wed Jun 25 10:48:45 2008
+@@ -1,11 +1,35 @@
+ /*
++ * Copyright 1999 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
++ * under the terms of the GNU General Public License version 2 only, as
++ * published by the Free Software Foundation. Sun designates this
++ * particular file as subject to the "Classpath" exception as provided
++ * by Sun in the LICENSE file that accompanied this code.
++ *
++ * This code is distributed in the hope that it will be useful, but WITHOUT
++ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
++ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
++ * version 2 for more details (a copy is included in the LICENSE file that
++ * accompanied this code).
++ *
++ * You should have received a copy of the GNU General Public License version
++ * 2 along with this work; if not, write to the Free Software Foundation,
++ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
++ *
++ * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
++ * CA 95054 USA or visit www.sun.com if you need additional information or
++ * have any questions.
++ */
++
++/*
+ * COMPONENT_NAME: idl.parser
+- *
++ *
+ * ORIGINS: 27
+ *
+- * THIS PRODUCT CONTAINS RESTRICTED MATERIALS OF IBM
+ * 5639-D57, (C) COPYRIGHT International Business Machines Corp., 1997, 1998
+- *
++ *
+ */
+
+ CORBA IDL
+--- openjdk.old/corba/src/share/classes/com/sun/tools/corba/se/idl/follow.set Wed Jun 25 10:48:46 2008
++++ openjdk/corba/src/share/classes/com/sun/tools/corba/se/idl/follow.set Wed Jun 25 10:48:46 2008
+@@ -1,11 +1,35 @@
+ /*
++ * Copyright 1999 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
++ * under the terms of the GNU General Public License version 2 only, as
++ * published by the Free Software Foundation. Sun designates this
++ * particular file as subject to the "Classpath" exception as provided
++ * by Sun in the LICENSE file that accompanied this code.
++ *
++ * This code is distributed in the hope that it will be useful, but WITHOUT
++ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
++ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
++ * version 2 for more details (a copy is included in the LICENSE file that
++ * accompanied this code).
++ *
++ * You should have received a copy of the GNU General Public License version
++ * 2 along with this work; if not, write to the Free Software Foundation,
++ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
++ *
++ * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
++ * CA 95054 USA or visit www.sun.com if you need additional information or
++ * have any questions.
++ */
++
++/*
+ * COMPONENT_NAME: idl.parser
+- *
++ *
+ * ORIGINS: 27
+ *
+- * THIS PRODUCT CONTAINS RESTRICTED MATERIALS OF IBM
+ * 5639-D57, (C) COPYRIGHT International Business Machines Corp., 1997, 1998
+- *
++ *
+ */
+
+ CORBA IDL
+--- openjdk.old/corba/src/share/classes/com/sun/tools/corba/se/idl/grammar.idl Wed Jun 25 10:48:47 2008
++++ openjdk/corba/src/share/classes/com/sun/tools/corba/se/idl/grammar.idl Wed Jun 25 10:48:47 2008
+@@ -1,14 +1,38 @@
+ /*
++ * Copyright 1999 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
++ * under the terms of the GNU General Public License version 2 only, as
++ * published by the Free Software Foundation. Sun designates this
++ * particular file as subject to the "Classpath" exception as provided
++ * by Sun in the LICENSE file that accompanied this code.
++ *
++ * This code is distributed in the hope that it will be useful, but WITHOUT
++ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
++ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
++ * version 2 for more details (a copy is included in the LICENSE file that
++ * accompanied this code).
++ *
++ * You should have received a copy of the GNU General Public License version
++ * 2 along with this work; if not, write to the Free Software Foundation,
++ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
++ *
++ * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
++ * CA 95054 USA or visit www.sun.com if you need additional information or
++ * have any questions.
++ */
++
++/*
+ * COMPONENT_NAME: idl.parser
+- *
++ *
+ * ORIGINS: 27
+ *
+- * THIS PRODUCT CONTAINS RESTRICTED MATERIALS OF IBM
+ * 5639-D57, (C) COPYRIGHT International Business Machines Corp., 1997, 1998
+- *
++ *
+ */
+
+-CORBA 2.3 IDL
++CORBA 2.3 IDL
+ ---------------
+
+ (1) <specification> <definition><specification'>
+@@ -83,7 +107,7 @@
+
+ (16) <vad> e
+ <export> <vad>
+-
++
+ (17) <value_dcl> <value_header> "{" <value_element> <ve> "}"
+
+ (17) <ve> e
+@@ -91,9 +115,9 @@
+
+ (18) <value_header> "custom" "valuetype" <id> <value_inheritance_spec>
+ "valuetype" <id> <value_inheritance_spec>
+- "custom" "valuetype" <id>
+- "valuetype" <id>
+-
++ "custom" "valuetype" <id>
++ "valuetype" <id>
++
+ (19) <value_inheritance_spec> <opt_inherits> <opt_supports>
+
+ (19) <opt_inherits> e
+@@ -107,7 +131,7 @@
+ "supports" <interface_name> <interface_name_list>
+
+ (19) <interface_name_list> e
+- "," <interface_name> <interface_name_list>
++ "," <interface_name> <interface_name_list>
+
+ (20) <value_name> <scoped_name>
+
+@@ -121,7 +145,7 @@
+ (23) <init_dcl> "factory" <id> "(" ")"
+ "factory" <id> "(" <init_param_dcls> ")"
+
+-(24) <init_param_dcls> <init_param_decl>
++(24) <init_param_dcls> <init_param_decl>
+ <init_param_decl> "," <init_param_dcls>
+
+ (25) <init_param_dcl> <init_param_attribute> <param_type_spec> <simple_declarator>
+@@ -349,7 +373,7 @@
+
+ (87) <op_dcl''> e
+ <context_expr>
+- <raises_expr>
++ <raises_expr>
+ <raises_expr> <context_expr>
+
+ (88) <op_attribute> "oneway"
+@@ -386,7 +410,7 @@
+ <wide_string_type>
+ <scoped_name>
+
+-(96) <fixed_pt_type> "fixed" "<" <positive_int_const> "," <positive_int_const> ">"
++(96) <fixed_pt_type> "fixed" "<" <positive_int_const> "," <positive_int_const> ">"
+
+ (97) <fixed_pt_const_type> "fixed"
+
+--- openjdk.old/corba/src/share/classes/com/sun/tools/corba/se/idl/grammar3.idl Wed Jun 25 10:48:47 2008
++++ openjdk/corba/src/share/classes/com/sun/tools/corba/se/idl/grammar3.idl Wed Jun 25 10:48:47 2008
+@@ -1,11 +1,35 @@
+ /*
++ * Copyright 1999 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
++ * under the terms of the GNU General Public License version 2 only, as
++ * published by the Free Software Foundation. Sun designates this
++ * particular file as subject to the "Classpath" exception as provided
++ * by Sun in the LICENSE file that accompanied this code.
++ *
++ * This code is distributed in the hope that it will be useful, but WITHOUT
++ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
++ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
++ * version 2 for more details (a copy is included in the LICENSE file that
++ * accompanied this code).
++ *
++ * You should have received a copy of the GNU General Public License version
++ * 2 along with this work; if not, write to the Free Software Foundation,
++ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
++ *
++ * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
++ * CA 95054 USA or visit www.sun.com if you need additional information or
++ * have any questions.
++ */
++
++/*
+ * COMPONENT_NAME: idl.parser
+- *
++ *
+ * ORIGINS: 27
+ *
+- * THIS PRODUCT CONTAINS RESTRICTED MATERIALS OF IBM
+ * 5639-D57, (C) COPYRIGHT International Business Machines Corp., 1997, 1998
+- *
++ *
+ */
+
+ (1) <specification> <imports> <definition> <specification'> // CORBA3
+@@ -98,7 +122,7 @@
+
+ (16) <vad> e
+ <export> <vad>
+-
++
+ (17) <value_dcl> <value_header> "{" <value_element> <ve> "}"
+
+ (17) <ve> e
+@@ -106,9 +130,9 @@
+
+ (18) <value_header> "custom" "valuetype" <id> <value_inheritance_spec>
+ "valuetype" <id> <value_inheritance_spec>
+- "custom" "valuetype" <id>
+- "valuetype" <id>
+-
++ "custom" "valuetype" <id>
++ "valuetype" <id>
++
+ (19) <value_inheritance_spec> <opt_inherits> <opt_supports>
+
+ (19) <opt_inherits> e
+@@ -122,7 +146,7 @@
+ "supports" <interface_name> <interface_name_list>
+
+ (19) <interface_name_list> e
+- "," <interface_name> <interface_name_list>
++ "," <interface_name> <interface_name_list>
+
+ (20) <value_name> <scoped_name>
+
+@@ -136,7 +160,7 @@
+ (23) <init_dcl> "factory" <id> "(" ")"
+ "factory" <id> "(" <init_param_dcls> ")"
+
+-(24) <init_param_dcls> <init_param_dcl>
++(24) <init_param_dcls> <init_param_dcl>
+ <init_param_dcl> "," <init_param_dcls>
+
+ (25) <init_param_dcl> <init_param_attribute> <param_type_spec> <simple_declarator>
+@@ -351,7 +375,7 @@
+ (85) <readonly_attr_spec> <readonly_attr_header> <readonly_attr_declarator> // CORBA3
+
+ (85) <readonly_attr_header> "readonly" "attribute" <param_type_spec> // CORBA3
+-
++
+ (85) <readonly_attr_declarator> <simple_declarator> <get_excep_expr> // CORBA3
+ <simple_declarator> <sds> // CORBA3
+
+@@ -389,7 +413,7 @@
+
+ (87) <op_dcl''> e
+ <context_expr>
+- <raises_expr>
++ <raises_expr>
+ <raises_expr> <context_expr>
+
+ (88) <op_attribute> "oneway"
+@@ -426,7 +450,7 @@
+ <wide_string_type>
+ <scoped_name>
+
+-(96) <fixed_pt_type> "fixed" "<" <positive_int_const> "," <positive_int_const> ">"
++(96) <fixed_pt_type> "fixed" "<" <positive_int_const> "," <positive_int_const> ">"
+
+ (97) <fixed_pt_const_type> "fixed"
+
+@@ -450,7 +474,7 @@
+
+ (204) <snames> e
+ "," <scoped_name> <snames>
+-
++
+ (205) <component_inheritance_spec> ":" <scoped_name>
+
+ (206) <component_body> <component_export> <ces>
+@@ -458,8 +482,8 @@
+ (206) <ces> e
+ <component_export> <ces>
+
+-(207) <component_export> <provides_dcl> ";"
+- <uses_dcl> ";"
++(207) <component_export> <provides_dcl> ";"
++ <uses_dcl> ";"
+ <emits_dcl> ";"
+ <publishes_dcl> ";"
+ <consumes_dcl> ";"
+--- openjdk.old/corba/src/share/classes/com/sun/tools/corba/se/idl/idl.prp Wed Jun 25 10:48:48 2008
++++ openjdk/corba/src/share/classes/com/sun/tools/corba/se/idl/idl.prp Wed Jun 25 10:48:48 2008
+@@ -1,4 +1,29 @@
+ #
++# Copyright 1999-2004 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
++# under the terms of the GNU General Public License version 2 only, as
++# published by the Free Software Foundation. Sun designates this
++# particular file as subject to the "Classpath" exception as provided
++# by Sun in the LICENSE file that accompanied this code.
++#
++# This code is distributed in the hope that it will be useful, but WITHOUT
++# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
++# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
++# version 2 for more details (a copy is included in the LICENSE file that
++# accompanied this code).
++#
++# You should have received a copy of the GNU General Public License version
++# 2 along with this work; if not, write to the Free Software Foundation,
++# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
++#
++# Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
++# CA 95054 USA or visit www.sun.com if you need additional information or
++# have any questions.
++#
++
++#
+ # COMPONENT_NAME: idl.parser
+ #
+ # ORIGINS: 27
+--- openjdk.old/corba/src/share/classes/com/sun/tools/corba/se/idl/idl_ja.prp Wed Jun 25 10:48:49 2008
++++ openjdk/corba/src/share/classes/com/sun/tools/corba/se/idl/idl_ja.prp Wed Jun 25 10:48:49 2008
+@@ -1,4 +1,29 @@
+ #
++# Copyright 1999-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
++# under the terms of the GNU General Public License version 2 only, as
++# published by the Free Software Foundation. Sun designates this
++# particular file as subject to the "Classpath" exception as provided
++# by Sun in the LICENSE file that accompanied this code.
++#
++# This code is distributed in the hope that it will be useful, but WITHOUT
++# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
++# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
++# version 2 for more details (a copy is included in the LICENSE file that
++# accompanied this code).
++#
++# You should have received a copy of the GNU General Public License version
++# 2 along with this work; if not, write to the Free Software Foundation,
++# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
++#
++# Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
++# CA 95054 USA or visit www.sun.com if you need additional information or
++# have any questions.
++#
++
++#
+ # COMPONENT_NAME: idl.parser
+ #
+ # ORIGINS: 27
+--- openjdk.old/corba/src/share/classes/com/sun/tools/corba/se/idl/idl_zh_CN.prp Wed Jun 25 10:48:50 2008
++++ openjdk/corba/src/share/classes/com/sun/tools/corba/se/idl/idl_zh_CN.prp Wed Jun 25 10:48:50 2008
+@@ -1,4 +1,29 @@
+ #
++# Copyright 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
++# under the terms of the GNU General Public License version 2 only, as
++# published by the Free Software Foundation. Sun designates this
++# particular file as subject to the "Classpath" exception as provided
++# by Sun in the LICENSE file that accompanied this code.
++#
++# This code is distributed in the hope that it will be useful, but WITHOUT
++# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
++# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
++# version 2 for more details (a copy is included in the LICENSE file that
++# accompanied this code).
++#
++# You should have received a copy of the GNU General Public License version
++# 2 along with this work; if not, write to the Free Software Foundation,
++# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
++#
++# Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
++# CA 95054 USA or visit www.sun.com if you need additional information or
++# have any questions.
++#
++
++#
+ # COMPONENT_NAME: idl.parser
+ #
+ # ORIGINS: 27
+--- openjdk.old/corba/src/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/toJavaPortable.prp Wed Jun 25 10:48:50 2008
++++ openjdk/corba/src/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/toJavaPortable.prp Wed Jun 25 10:48:50 2008
+@@ -1,4 +1,29 @@
+ #
++# Copyright 1999-2004 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
++# under the terms of the GNU General Public License version 2 only, as
++# published by the Free Software Foundation. Sun designates this
++# particular file as subject to the "Classpath" exception as provided
++# by Sun in the LICENSE file that accompanied this code.
++#
++# This code is distributed in the hope that it will be useful, but WITHOUT
++# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
++# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
++# version 2 for more details (a copy is included in the LICENSE file that
++# accompanied this code).
++#
++# You should have received a copy of the GNU General Public License version
++# 2 along with this work; if not, write to the Free Software Foundation,
++# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
++#
++# Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
++# CA 95054 USA or visit www.sun.com if you need additional information or
++# have any questions.
++#
++
++#
+ # COMPONENT_NAME: idl.toJava
+ #
+ # ORIGINS: 27
+--- openjdk.old/corba/src/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/toJavaPortable_ja.prp Wed Jun 25 10:48:51 2008
++++ openjdk/corba/src/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/toJavaPortable_ja.prp Wed Jun 25 10:48:51 2008
+@@ -1,4 +1,29 @@
+ #
++# Copyright 2001-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
++# under the terms of the GNU General Public License version 2 only, as
++# published by the Free Software Foundation. Sun designates this
++# particular file as subject to the "Classpath" exception as provided
++# by Sun in the LICENSE file that accompanied this code.
++#
++# This code is distributed in the hope that it will be useful, but WITHOUT
++# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
++# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
++# version 2 for more details (a copy is included in the LICENSE file that
++# accompanied this code).
++#
++# You should have received a copy of the GNU General Public License version
++# 2 along with this work; if not, write to the Free Software Foundation,
++# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
++#
++# Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
++# CA 95054 USA or visit www.sun.com if you need additional information or
++# have any questions.
++#
++
++#
+ # COMPONENT_NAME: idl.toJava
+ #
+ # ORIGINS: 27
+--- openjdk.old/corba/src/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/toJavaPortable_zh_CN.prp Wed Jun 25 10:48:52 2008
++++ openjdk/corba/src/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/toJavaPortable_zh_CN.prp Wed Jun 25 10:48:52 2008
+@@ -1,4 +1,29 @@
+ #
++# Copyright 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
++# under the terms of the GNU General Public License version 2 only, as
++# published by the Free Software Foundation. Sun designates this
++# particular file as subject to the "Classpath" exception as provided
++# by Sun in the LICENSE file that accompanied this code.
++#
++# This code is distributed in the hope that it will be useful, but WITHOUT
++# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
++# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
++# version 2 for more details (a copy is included in the LICENSE file that
++# accompanied this code).
++#
++# You should have received a copy of the GNU General Public License version
++# 2 along with this work; if not, write to the Free Software Foundation,
++# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
++#
++# Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
++# CA 95054 USA or visit www.sun.com if you need additional information or
++# have any questions.
++#
++
++#
+ # COMPONENT_NAME: idl.toJava
+ #
+ # ORIGINS: 27
More information about the distro-pkg-dev
mailing list