[Cvs-cvs] ccvs/src ChangeLog Makefile.in main.c sanity.sh...

[Derek Robert Price]

CVSROOT:        /cvsroot/cvs
Module name:    ccvs
Changes by:     Derek Robert Price <dprice>     07/08/21 22:35:19

Modified files:
        src            : ChangeLog Makefile.in main.c sanity.sh 
                         version.c 

Log message:
        * main.c (main): Improve version string with standard GNU GPL notice.
        Update copyright year.
        * version.c (version): Use new PACKAGE_CONFIG string defined by
        configure.
        * sanity.sh (version-1): Update to account for new version string.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/ccvs/src/ChangeLog?cvsroot=cvs&r1=1.3517&r2=1.3518
http://cvs.savannah.gnu.org/viewcvs/ccvs/src/Makefile.in?cvsroot=cvs&r1=1.185&r2=1.186
http://cvs.savannah.gnu.org/viewcvs/ccvs/src/main.c?cvsroot=cvs&r1=1.270&r2=1.271
http://cvs.savannah.gnu.org/viewcvs/ccvs/src/sanity.sh?cvsroot=cvs&r1=1.1181&r2=1.1182
http://cvs.savannah.gnu.org/viewcvs/ccvs/src/version.c?cvsroot=cvs&r1=1.123&r2=1.124

Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/cvs/ccvs/src/ChangeLog,v
retrieving revision 1.3517
retrieving revision 1.3518
diff -u -b -r1.3517 -r1.3518
--- ChangeLog   19 Jun 2007 03:09:23 -0000      1.3517
+++ ChangeLog   21 Aug 2007 22:35:18 -0000      1.3518
@@ -1,3 +1,11 @@
+2007-08-21  Derek Price  <address@hidden>
+
+       * main.c (main): Improve version string with standard GNU GPL notice.
+       Update copyright year.
+       * version.c (version): Use new PACKAGE_CONFIG string defined by
+       configure.
+       * sanity.sh (version-1): Update to account for new version string.
+
 2007-06-18  Derek Price  <address@hidden>
 
        * client.c (send_repository): Don't attempt to send metadata from CVS

Index: Makefile.in
===================================================================
RCS file: /cvsroot/cvs/ccvs/src/Makefile.in,v
retrieving revision 1.185
retrieving revision 1.186
diff -u -b -r1.185 -r1.186
--- Makefile.in 21 Aug 2007 18:42:55 -0000      1.185
+++ Makefile.in 21 Aug 2007 22:35:19 -0000      1.186
@@ -279,6 +279,7 @@
 OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_CONFIG = @PACKAGE_CONFIG@
 PACKAGE_NAME = @PACKAGE_NAME@
 PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@

Index: main.c
===================================================================
RCS file: /cvsroot/cvs/ccvs/src/main.c,v
retrieving revision 1.270
retrieving revision 1.271
diff -u -b -r1.270 -r1.271
--- main.c      30 May 2007 23:20:43 -0000      1.270
+++ main.c      21 Aug 2007 22:35:19 -0000      1.271
@@ -1,7 +1,8 @@
 /*
- * Copyright (C) 1986-2006 The Free Software Foundation, Inc.
+ * Copyright (C) 1986-2007 The Free Software Foundation, Inc.
  *
- * Portions Copyright (C) 1998-2006 Derek Price, Ximbiot <http://ximbiot.com>,
+ * Portions Copyright (C) 1998-2007 Derek Price,
+ *                                  Ximbiot LLC <http://ximbiot.com>,
  *                                  and others.
  *
  * Portions Copyright (C) 1992, Brian Berliner and Jeff Polk
@@ -884,23 +885,18 @@
                logoff = 1;
                break;
            case 'v':
-               (void) fputs ("\n", stdout);
                version (0, NULL);    
-               (void) fputs ("\n", stdout);
-               (void) fputs ("\
-Copyright (C) 2006 Free Software Foundation, Inc.\n\
+               fputs ("\
+Copyright (C) 2007 Free Software Foundation, Inc.\n\
+\n\
+This is free software.  You may redistribute copies of it under the terms of\n\
+the GNU General Public License <http://www.gnu.org/licenses/gpl.html>.\n\
+There is NO WARRANTY, to the extent permitted by law.\n\
 \n\
 Senior active maintainers include Larry Jones, Derek R. Price,\n\
 and Mark D. Baushke.  Please see the AUTHORS and README files from the CVS\n\
 distribution kit for a complete list of contributors and copyrights.\n",
                              stdout);
-               (void) fputs ("\n", stdout);
-               (void) fputs ("CVS may be copied only under the terms of the 
GNU General Public License,\n", stdout);
-               (void) fputs ("a copy of which can be found with the CVS 
distribution kit.\n", stdout);
-               (void) fputs ("\n", stdout);
-
-               (void) fputs ("Specify the --help option for further 
information about CVS\n", stdout);
-
                exit (0);
                break;
            case 'b':

Index: sanity.sh
===================================================================
RCS file: /cvsroot/cvs/ccvs/src/sanity.sh,v
retrieving revision 1.1181
retrieving revision 1.1182
diff -u -b -r1.1181 -r1.1182
--- sanity.sh   15 Jun 2007 21:19:34 -0000      1.1181
+++ sanity.sh   21 Aug 2007 22:35:19 -0000      1.1182
@@ -2,7 +2,7 @@
 :
 #      sanity.sh -- a growing testsuite for cvs.
 #
-# Copyright (C) 2006 The Free Software Foundation, Inc.
+# Copyright (C) 2007 The Free Software Foundation, Inc.
 # Copyright (C) 1992, 1993 Cygnus Support
 #
 # This program is free software; you can redistribute it and/or modify
@@ -3427,19 +3427,16 @@
          # We've had cases where the version command started dumping core,
          # so we might as well test it
          dotest version-1 "${testcvs} --version" \
-'
-Concurrent Versions System (CVS) [0-9.]*.*
-
-Copyright (C) [0-9]* Free Software Foundation, Inc.
-
-Senior active maintainers include Larry Jones, Derek R. Price,
-and Mark D. Baushke.  Please see the AUTHORS and README files from the CVS
-distribution kit for a complete list of contributors and copyrights.
-
-CVS may be copied only under the terms of the GNU General Public License,
-a copy of which can be found with the CVS distribution kit.
+'Concurrent Versions System (CVS) [0-9.]*.*
+Copyright (C) [0-9]* Free Software Foundation, Inc\.
 
-Specify the --help option for further information about CVS'
+This is free software\.  You may redistribute copies of it under the terms of
+the GNU General Public License <http://www.gnu.org/licenses/gpl.html>.
+There is NO WARRANTY, to the extent permitted by law\.
+
+Senior active maintainers include Larry Jones, Derek R\. Price,
+and Mark D\. Baushke\.  Please see the AUTHORS and README files from the CVS
+distribution kit for a complete list of contributors and copyrights\.'
 
 # Maybe someday...
 #        if $proxy; then

Index: version.c
===================================================================
RCS file: /cvsroot/cvs/ccvs/src/version.c,v
retrieving revision 1.123
retrieving revision 1.124
diff -u -b -r1.123 -r1.124
--- version.c   2 Sep 2006 23:18:00 -0000       1.123
+++ version.c   21 Aug 2007 22:35:19 -0000      1.124
@@ -1,7 +1,8 @@
 /*
- * Copyright (C) 1986-2005 The Free Software Foundation, Inc.
+ * Copyright (C) 1986-2007 The Free Software Foundation, Inc.
  *
- * Portions Copyright (C) 1998-2005 Derek Price, Ximbiot <http://ximbiot.com>,
+ * Portions Copyright (C) 1998-2007 Derek Price,
+ *                                  Ximbiot LLC <http://ximbiot.com>,
  *                                  and others.
  *
  * Portions Copyright (C) 1994 david d `zoo' zuhn
@@ -20,22 +21,6 @@
 
 #include "cvs.h"
 
-#ifdef CLIENT_SUPPORT
-#ifdef SERVER_SUPPORT
-char *config_string = " (client/server)\n";
-#else
-char *config_string = " (client)\n";
-#endif
-#else
-#ifdef SERVER_SUPPORT
-char *config_string = " (server)\n";
-#else
-char *config_string = "\n";
-#endif
-#endif
-
-
-
 static const char *const version_usage[] =
 {
     "Usage: %s %s\n",
@@ -65,8 +50,8 @@
     /* Having the year here is a good idea, so people have
        some idea of how long ago their version of CVS was
        released.  */
-    (void) fputs (PACKAGE_STRING, stdout);
-    (void) fputs (config_string, stdout);
+    (void) fputs (PACKAGE_CONFIG, stdout);
+    (void) fputc ('\n', stdout);
 
 #ifdef CLIENT_SUPPORT
     if (current_parsed_root && current_parsed_root->isremote)