From 6f3532c0d110bf8ecb7d84a50d2f9fd1e933ee46 Mon Sep 17 00:00:00 2001
From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Mon, 23 Jan 2017 13:59:34 +0000
Subject: [PATCH] Update some copyright notices.

---
 INSTALL          | 5 +++--
 Makefile.in      | 2 +-
 README           | 5 +++--
 debian/changelog | 3 ++-
 spec.sgml.in     | 5 +++--
 userv.1          | 5 ++---
 uservd.8         | 8 +++-----
 7 files changed, 17 insertions(+), 16 deletions(-)

diff --git a/INSTALL b/INSTALL
index 46d3bdc..91ab5e8 100644
--- a/INSTALL
+++ b/INSTALL
@@ -173,8 +173,9 @@ This file, INSTALL, contains installation instructions and other
 details for userv.
 
 userv is
-Copyright (C)1996-2000 Ian Jackson <ian@davenant.greenend.org.uk>.
-Copyright (C)2000      Ben Harris <bjh21@cam.ac.uk>
+Copyright 1996-2017 Ian Jackson <ian@davenant.greenend.org.uk>.
+Copyright 2000      Ben Harris <bjh21@cam.ac.uk>
+Copyright 2016-2017 Peter Benie <pjb1008@cam.ac.uk>
 
 userv is free software; you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free
diff --git a/Makefile.in b/Makefile.in
index d36c6c6..21d5890 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,6 +1,6 @@
 #  userv - Makefile.in
 #  
-#  Copyright (C)1996-1997,1999 Ian Jackson
+#  Copyright (C)1996-2017 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/README b/README
index 8e9a041..d000c77 100644
--- a/README
+++ b/README
@@ -20,8 +20,9 @@ list if you are subscribed to it.
 
 
 userv is
-Copyright (C)1996-2003,2006 Ian Jackson <ian@davenant.greenend.org.uk>.
-Copyright (C)2000           Ben Harris <bjh21@cam.ac.uk>
+Copyright 1996-2017 Ian Jackson <ian@davenant.greenend.org.uk>.
+Copyright 2000      Ben Harris <bjh21@cam.ac.uk>
+Copyright 2016-2017 Peter Benie <pjb1008@cam.ac.uk>
 
 userv is free software; you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free
diff --git a/debian/changelog b/debian/changelog
index eca804d..eb460e2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,10 +9,11 @@ userv (1.1.2~~iwj1) unstable; urgency=low
   * Correct docs for errors-push, which takes no filename.
     Closes:#775852.
 
-  Upstream Makefiles etc.:
+  Packaging etc.
   * Honour XCFLAGS.
   * Use `%option nounput' rather than #define YY_NO_UNPUT.
     Patch from Peter Benie, but modified.
+  * Update some copyright notices.
 
   Debian packaging:
   * Honour dpkg-buildflags.
diff --git a/spec.sgml.in b/spec.sgml.in
index 3eb8cb6..0da8a71 100644
--- a/spec.sgml.in
+++ b/spec.sgml.in
@@ -12,8 +12,9 @@ between them.
 
 <copyright>
 <prgn/userv/ is
-Copyright 1996-2003,2006 Ian Jackson;
-Copyright 2000 Ben Harris.
+Copyright 1996-2017 Ian Jackson;
+Copyright 2000 Ben Harris;
+Copyright 2016-2017 Peter Benie.
 <p>
 
 <prgn/userv/ is free software; you can redistribute it and/or modify
diff --git a/userv.1 b/userv.1
index 9ad59c2..7987402 100644
--- a/userv.1
+++ b/userv.1
@@ -449,9 +449,8 @@ service.
 .%A Ian Jackson
 .Re
 .Sh COPYRIGHT
-GNU userv is Copyright (C)1996-2003,2006 Ian Jackson, except that this
-manpage is Copyright (C)2000 Ben Harris and Copyright (C)2003 Ian
-Jackson.
+GNU userv is Copyright 1996-2017 Ian Jackson; Copyright 2000 Ben
+Harris; and Copyright 2016-2017 Peter Benie.
 .Pp
 GNU userv is licensed under the terms of the GNU General Public
 Licence, version 2 or (at your option) any later version, and it comes
diff --git a/uservd.8 b/uservd.8
index b54e65a..ed70ed7 100644
--- a/uservd.8
+++ b/uservd.8
@@ -123,11 +123,9 @@ can modify the environment.  Consult the specification.)
 .%A Ian Jackson
 .Re
 .Sh COPYRIGHT
-GNU userv, including this manpage, is Copyright (C)1996-2003,2006 Ian
-Jackson, except that the
-.Xr userv 1
-manpage is Copyright (C)2000 Ben Harris and Copyright (C)2003 Ian
-Jackson.
+GNU userv is Copyright 1996-2017 Ian Jackson; Copyright 2000 Ben
+Harris; and Copyright 2016-2017 Peter Benie.
+.Pp
 .Pp
 GNU userv is licensed under the terms of the GNU General Public
 Licence, version 2 or (at your option) any later version, and it comes
-- 
2.30.2