natSystem.cc (init_properties): Include the `Inc.' in java.vendor and java.vm.vendor.

	* 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'.

From-SVN: r49975

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 04eb55c37414961cb3af9fd618f3e66ad6cafe40..72802f68b09f4ae2656a3d1508549e8fed61ea87 100644 (file)
--- 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 c3197e25b13de5c07fdb8993867462c5b1237b1f..e4a8ca3d975df49adea271969644e3e7cdecf464 100644 (file)
--- 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 1858a5fc85069c7d7f93d3ee2bcd7b5fb5049e84..820fe14a9f3481aa976bb256e85be2fa2e5cfd42 100644 (file)
--- 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 630d5db5c74c9736adea3fd805f8cac73912113a..f3ff128f2a45062237aa00025186a9d7d73b07c8 100644 (file)
--- 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 28ef04dd778f5852f7eedd1bb2e58674c72c22e4..86b7c60e97ccc30209ca019b19d6de230a7784aa 100644 (file)
--- 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");