* java/lang/natSystem.cc (init_properties): Include the `Inc.' in

	java.vendor and java.vm.vendor.
	* gnu/java/rmi/rmic/RMIC.java (parseOptions): Only print most
	recent copyright date.
	* gnu/gcj/convert/Convert.java (version): Print `Inc'.
	* gij.cc (version): Print `Inc'.


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@49975 138bc75d-0d04-0410-961f-82ee72b054a4

5 files changed, 15 insertions, 6 deletions

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 04eb55c3741..72802f68b09 100644
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,12 @@
+2002-02-22  Tom Tromey  <tromey@redhat.com>
+
+	* java/lang/natSystem.cc (init_properties): Include the `Inc.' in
+	java.vendor and java.vm.vendor.
+	* gnu/java/rmi/rmic/RMIC.java (parseOptions): Only print most
+	recent copyright date.
+	* gnu/gcj/convert/Convert.java (version): Print `Inc'.
+	* gij.cc (version): Print `Inc'.
+
 2002-02-22  Alexandre Oliva  <aoliva@redhat.com>
 
 	* acinclude.m4 (CXX): AC_SUBST it, instead of glibcpp_CXX.
diff --git a/libjava/gij.cc b/libjava/gij.cc
index c3197e25b13..e4a8ca3d975 100644
--- a/libjava/gij.cc
+++ b/libjava/gij.cc
@@ -1,4 +1,4 @@
-/* Copyright (C) 1999, 2000, 2001  Free Software Foundation
+/* Copyright (C) 1999, 2000, 2001, 2002  Free Software Foundation
 
    This file is part of libgcj.
 
@@ -41,7 +41,7 @@ static void
 version ()
 {
   printf ("gij (GNU libgcj) version %s\n\n", GCJVERSION);
-  printf ("Copyright (C) 2001 Free Software Foundation.\n");
+  printf ("Copyright (C) 2002 Free Software Foundation, Inc.\n");
   printf ("This is free software; see the source for copying conditions.  There is NO\n");
   printf ("warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n");
   exit (0);
diff --git a/libjava/gnu/gcj/convert/Convert.java b/libjava/gnu/gcj/convert/Convert.java
index 1858a5fc850..820fe14a9f3 100644
--- a/libjava/gnu/gcj/convert/Convert.java
+++ b/libjava/gnu/gcj/convert/Convert.java
@@ -45,7 +45,7 @@ public class Convert
 		       + ") "
 		       + System.getProperty("java.vm.version"));
     System.out.println();
-    System.out.println("Copyright (C) 2002 Free Software Foundation");
+    System.out.println("Copyright (C) 2002 Free Software Foundation, Inc.");
     System.out.println("This is free software; see the source for copying conditions.  There is NO");
     System.out.println("warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.");
     System.exit(0);
diff --git a/libjava/gnu/java/rmi/rmic/RMIC.java b/libjava/gnu/java/rmi/rmic/RMIC.java
index 630d5db5c74..f3ff128f2a4 100644
--- a/libjava/gnu/java/rmi/rmic/RMIC.java
+++ b/libjava/gnu/java/rmi/rmic/RMIC.java
@@ -944,7 +944,7 @@ private void parseOptions() {
 					   + ") "
 					   + System.getProperty("java.vm.version"));
 			System.out.println();
-			System.out.println("Copyright 1996, 1997, 1998, 1999, 2001, 2002 Free Software Foundation");
+			System.out.println("Copyright 2002 Free Software Foundation, Inc.");
 			System.out.println("This is free software; see the source for copying conditions.  There is NO");
 			System.out.println("warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.");
 			System.exit(0);
diff --git a/libjava/java/lang/natSystem.cc b/libjava/java/lang/natSystem.cc
index 28ef04dd778..86b7c60e97c 100644
--- a/libjava/java/lang/natSystem.cc
+++ b/libjava/java/lang/natSystem.cc
@@ -304,14 +304,14 @@ java::lang::System::init_properties (void)
   // A mixture of the Java Product Versioning Specification
   // (introduced in 1.2), and earlier versioning properties.
   SET ("java.version", VERSION);
-  SET ("java.vendor", "Free Software Foundation");
+  SET ("java.vendor", "Free Software Foundation, Inc.");
   SET ("java.vendor.url", "http://gcc.gnu.org/java/");
   SET ("java.class.version", GCJVERSION);
   SET ("java.vm.specification.version", "1.1");
   SET ("java.vm.specification.name", "Java(tm) Virtual Machine Specification");
   SET ("java.vm.specification.vendor", "Sun Microsystems Inc.");
   SET ("java.vm.version", GCJVERSION);
-  SET ("java.vm.vendor", "Free Software Foundation");
+  SET ("java.vm.vendor", "Free Software Foundation, Inc.");
   SET ("java.vm.name", "libgcj");
   SET ("java.specification.version", "1.1");
   SET ("java.specification.name", "Java(tm) Language Specification");