gcc:

	* gccbug.in: Follow GNU Coding Standards for --version.  Use GCC
	version rather than GNATS version in --version output.

gcc/f:
	* g77spec.c (lang_specific_driver): Follow GNU Coding Standards
	for --version.

gcc/java:
	* gjavah.c (version), jcf-dump.c (version), jv-scan.c (version):
	Follow GNU Coding Standards for --version.

libjava:
	* gnu/gcj/convert/Convert.java: Only include one copyright year in
	--version output.


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

10 files changed, 39 insertions, 12 deletions

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 410e1b028be..f7ea2298a64 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2002-01-31  Joseph S. Myers  <jsm28@cam.ac.uk>
+
+	* gccbug.in: Follow GNU Coding Standards for --version.  Use GCC
+	version rather than GNATS version in --version output.
+
 2002-01-31  Richard Sandiford  <rsandifo@redhat.com>
 
 	* ifcvt.c (noce_process_if_block): Make a copy of the destination
diff --git a/gcc/f/ChangeLog b/gcc/f/ChangeLog
index ee4afd782bd..7cec89c9ed7 100644
--- a/gcc/f/ChangeLog
+++ b/gcc/f/ChangeLog
@@ -1,3 +1,8 @@
+2002-01-31  Joseph S. Myers  <jsm28@cam.ac.uk>
+
+	* g77spec.c (lang_specific_driver): Follow GNU Coding Standards
+	for --version.
+
 2002-01-30  Richard Henderson  <rth@redhat.com>
 
 	* ste.c (ffeste_begin_iterdo_): Use expand_exit_loop_top_cond.
diff --git a/gcc/f/g77spec.c b/gcc/f/g77spec.c
index 7ba075675e9..2e094d911c7 100644
--- a/gcc/f/g77spec.c
+++ b/gcc/f/g77spec.c
@@ -374,7 +374,7 @@ lang_specific_driver (in_argc, in_argv, in_added_libraries)
 
 	case OPTION_version:
 	  printf ("\
-GNU Fortran %s (Fortran Frontend version %s)\n\
+GNU Fortran (GCC %s) %s\n\
 Copyright (C) 2002 Free Software Foundation, Inc.\n\
 \n\
 GNU Fortran comes with NO WARRANTY, to the extent permitted by law.\n\
diff --git a/gcc/gccbug.in b/gcc/gccbug.in
index 5b085b4c8ea..9619e61222c 100755
--- a/gcc/gccbug.in
+++ b/gcc/gccbug.in
@@ -1,6 +1,6 @@
 #!/bin/sh
 # Submit a problem report to a GNATS site.
-# Copyright (C) 1993, 2000, 2001 Free Software Foundation, Inc.
+# Copyright (C) 1993, 2000, 2001, 2002 Free Software Foundation, Inc.
 # Contributed by Brendan Kehoe (brendan@cygnus.com), based on a
 # version written by Heinz G. Seidl (hgs@cygnus.com).
 #
@@ -183,7 +183,14 @@ while [ $# -gt 0 ]; do
     -l | -CL | --lisp) FORMAT=lisp ;;
     --request-id) REQUEST_ID=true ;;
     -h | --help) echo "$USAGE"; $REMOVE_TEMP; exit 0 ;;
-    -V | --version) echo "$VERSION"; $REMOVE_TEMP; exit 0 ;;
+    -V | --version) cat <<EOF
+gccbug (GCC) $DEFAULT_RELEASE
+Copyright (C) 2002 Free Software Foundation, Inc.
+This is free software; see the source for copying conditions.  There is NO
+warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+
+EOF
+	$REMOVE_TEMP; exit 0 ;;
     -*) echo "$USAGE" ; $REMOVE_TEMP; exit 1 ;;
     *) echo "$USAGE" ; $REMOVE_TEMP; exit 1
  esac
diff --git a/gcc/java/ChangeLog b/gcc/java/ChangeLog
index 8e434f25afd..a4fec0936cb 100644
--- a/gcc/java/ChangeLog
+++ b/gcc/java/ChangeLog
@@ -1,3 +1,8 @@
+2002-01-31  Joseph S. Myers  <jsm28@cam.ac.uk>
+
+	* gjavah.c (version), jcf-dump.c (version), jv-scan.c (version):
+	Follow GNU Coding Standards for --version.
+
 2002-01-28  Tom Tromey  <tromey@redhat.com>
 
 	* expr.c (build_jni_stub): Ensure storage for `meth' is
diff --git a/gcc/java/gjavah.c b/gcc/java/gjavah.c
index b128ab74ae9..9b205f43500 100644
--- a/gcc/java/gjavah.c
+++ b/gcc/java/gjavah.c
@@ -2185,8 +2185,8 @@ help ()
 static void
 version ()
 {
-  printf ("gcjh (%s)\n\n", version_string);
-  printf ("Copyright (C) 2001 Free Software Foundation, Inc.\n");
+  printf ("gcjh (GCC) %s\n\n", version_string);
+  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\n");
   exit (0);
diff --git a/gcc/java/jcf-dump.c b/gcc/java/jcf-dump.c
index 16fce909bf0..fefee03ed66 100644
--- a/gcc/java/jcf-dump.c
+++ b/gcc/java/jcf-dump.c
@@ -1,7 +1,7 @@
 /* Program to dump out a Java(TM) .class file.
    Functionally similar to Sun's javap.
 
-   Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
+   Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002 Free Software Foundation, Inc.
 
 This program is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
@@ -822,8 +822,8 @@ help ()
 static void
 version ()
 {
-  printf ("jcf-dump (%s)\n\n", version_string);
-  printf ("Copyright (C) 2001 Free Software Foundation, Inc.\n");
+  printf ("jcf-dump (GCC) %s\n\n", version_string);
+  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\n");
   exit (0);
diff --git a/gcc/java/jv-scan.c b/gcc/java/jv-scan.c
index 4120a2f3700..343655e5c90 100644
--- a/gcc/java/jv-scan.c
+++ b/gcc/java/jv-scan.c
@@ -1,5 +1,5 @@
 /* Main for jv-scan
-   Copyright (C) 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
+   Copyright (C) 1998, 1999, 2000, 2001, 2002 Free Software Foundation, Inc.
    Contributed by Alexandre Petit-Bianco (apbianco@cygnus.com)
 
 This file is part of GNU CC.
@@ -118,8 +118,8 @@ help ()
 static void
 version ()
 {
-  printf ("jv-scan (%s)\n\n", version_string);
-  printf ("Copyright (C) 2001 Free Software Foundation, Inc.\n");
+  printf ("jv-scan (GCC) %s\n\n", version_string);
+  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\n");
   exit (0);
diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 1c192d704b0..ffdf4321135 100644
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,8 @@
+2002-01-31  Joseph S. Myers  <jsm28@cam.ac.uk>
+
+	* gnu/gcj/convert/Convert.java: Only include one copyright year in
+	--version output.
+
 2002-01-30  Tom Tromey  <tromey@redhat.com>
 
 	* java/net/natPlainSocketImpl.cc (_Jv_recv): Added template
diff --git a/libjava/gnu/gcj/convert/Convert.java b/libjava/gnu/gcj/convert/Convert.java
index fe18a67c97f..1858a5fc850 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 1999, 2002 Free Software Foundation");
+    System.out.println("Copyright (C) 2002 Free Software Foundation");
     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);