copyright

diff --git a/client.c b/client.c
index 520928f9d42e5c87056cc5912b1a13167a84ae81..47600090ecc09fcda86200b41f3e08db83bf6463 100644 (file)
--- a/client.c
+++ b/client.c
@@ -433,8 +433,7 @@ static void usage(FILE *stream) {
     "userv -B 'X' ... is same as userv --override 'execute-builtin X' - 'X' ...\n"
     "         for help, type `userv -B help'; remember to quote multi-word X\n"
     "userv and uservd version " VERSION VEREXT ".\n"
-    "Copyright (C)1996-2003,2006 Ian Jackson; copyright (C)2000 Ben Harris.\n"
-    "there is NO WARRANTY; type `userv --copyright' for details.\n",
+    COPYRIGHT("","\n"),
             stream) < 0)
     syscallerror("write usage message");
 }
@@ -726,7 +725,9 @@ static void of_version(const struct optioninfo *oip, const char *value, char *ke
 
 static void of_copyright(const struct optioninfo *oip, const char *value, char *key) {
   if (fputs(
-" userv - user service daemon and client; copyright (C)1996-1999 Ian Jackson\n\n"
+" userv - user service daemon and client\n\n"
+COPYRIGHT(" ","\n")
+"\n"
 " This is free software; you can redistribute it and/or modify it under the\n"
 " terms of the GNU General Public License as published by the Free Software\n"
 " Foundation; either version 2 of the License, or (at your option) any\n"
@@ -736,9 +737,7 @@ static void of_copyright(const struct optioninfo *oip, const char *value, char *
 " MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General\n"
 " Public License for more details.\n\n"
 " You should have received a copy of the GNU General Public License along\n"
-" with userv; if not, write to Ian Jackson <ian@davenant.greenend.org.uk> or\n"
-" to the Free Software Foundation, 59 Temple Place - Suite 330, Boston,\n"
-" MA 02111-1307, USA.\n",
+" with userv; if not, see <http://www.gnu.org/licenses/>.\n",
            stdout) < 0) syscallerror("write usage to stderr");
   exit(0);
 }

diff --git a/common.h b/common.h
index 6b287da54dc7f833065bcfc8fc88ee1c5e01f569..e8f5b38c288af9dec5d543d0677433c80fda0db4 100644 (file)
--- a/common.h
+++ b/common.h
@@ -2,7 +2,7 @@
  * userv - common.h
  * definitions shared between client and daemon
  *
- * Copyright (C)1996-1997,1999 Ian Jackson
+ * Copyright (C)1996-1997,1999,2012 Ian Jackson
  *
  * This is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License as published by
@@ -22,6 +22,10 @@
 #ifndef COMMON_H
 #define COMMON_H
 
+#define COPYRIGHT(indent,nl)                                           \
+ indent "Copyright (C)1996-2012 Ian Jackson; copyright (C)2000 Ben Harris." nl \
+ indent "there is NO WARRANTY; type `userv --copyright' for details." nl
+
 #define PCSUMSIZE 16
 
 static const unsigned char protocolchecksumversion[PCSUMSIZE]= {

diff --git a/debian/changelog b/debian/changelog
index bc17ecc61a199712bb6f1d1ba2d0821e375107d1..f00c5de92a5402992a84828d23ac1623ec8cc8fc 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,14 +1,14 @@
 userv (1.1.1~~iwj) unstable; urgency=low
 
-  Packaging improvements:
   * Include INIT INFO stanza in init script.
   * Draft support for `status' in init script, currently commented
     out pending inclusion into policy of firm specification.
   * Remove spec.ps on make clean.
   * Remove spec.ps and dh log on debian/rules clean.  (Use dh_clean.)
     (To repro bug: dpkg-buildpackage, debian/rules clean, git-ls-files -o)
-
- -- Ian Jackson <ijackson@chiark.greenend.org.uk>  Thu, 07 Jun 2012 19:21:49 +0100
+  * Fix up some copyright messages.
+  
+ -- Ian Jackson <ijackson@chiark.greenend.org.uk>  Fri, 08 Jun 2012 20:13:47 +0100
 
 userv (1.1.0) unstable; urgency=medium
 

diff --git a/parser.c b/parser.c
index 037e6f9fe19a49eef2b4a88fac87e80645acb964..5157f39819a6771333ebd0bff67b768cef187273 100644 (file)
--- a/parser.c
+++ b/parser.c
@@ -6,7 +6,7 @@
  * about m4 quoting &c., but we have to #include it so that the C
  * objects from the lexer are available.
  *
- * Copyright (C)1996-1999,2001 Ian Jackson
+ * Copyright (C)1996-1999,2001,2006,2012 Ian Jackson
  *
  * This is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License as published by

diff --git a/servexec.c b/servexec.c
index 7b1bcc015be6ca93d8868857f769539b72d5d63f..5597402ae97f714075859240206c890068e873aa 100644 (file)
--- a/servexec.c
+++ b/servexec.c
@@ -71,7 +71,7 @@ void bisexec_version(const char *const *argv) {
   const unsigned char *p;
   int i;
   
-  printf("uservd version " VERSION VEREXT "; copyright (C)1996-2000 Ian Jackson.\n"
+  printf("uservd version " VERSION VEREXT "\n"
 #ifdef DEBUG
         "DEBUGGING VERSION"
 #else
@@ -93,7 +93,8 @@ void bisexec_version(const char *const *argv) {
   printf("\n"
         "rendezvous socket: `" RENDEZVOUSPATH "'\n"
         "system config dir: `" SYSTEMCONFIGDIR "'\n"
-        "pipe filename format: `%s' (max length %d)\n",
+        "pipe filename format: `%s' (max length %d)\n"
+        COPYRIGHT("","\n"),
         PIPEFORMAT, PIPEMAXLEN);
   serv_checkstdoutexit();
 }