From 2aea9269b9a2b06c2d6cdb72ef04868998b5d98a Mon Sep 17 00:00:00 2001 From: Markus Armbruster Date: Thu, 5 Jan 2006 13:58:03 +0000 Subject: [PATCH] Streamline copyright notices. Clearly document Stephen Crane's in README. --- src/lib/lwp/README | 22 +++++++++++++++++++++ src/lib/lwp/arch.c | 4 +++- src/lib/lwp/lwp.c | 47 +++++++++++++++++++++++++++----------------- src/lib/lwp/lwpint.h | 47 +++++++++++++++++++++++++++----------------- src/lib/lwp/queue.c | 45 ++++++++++++++++++++++++++---------------- src/lib/lwp/sel.c | 3 ++- src/lib/lwp/sem.c | 45 ++++++++++++++++++++++++++---------------- src/lib/lwp/status.c | 3 ++- 8 files changed, 143 insertions(+), 73 deletions(-) diff --git a/src/lib/lwp/README b/src/lib/lwp/README index d8b18e1aa..e65ad0b5a 100644 --- a/src/lib/lwp/README +++ b/src/lib/lwp/README @@ -7,3 +7,25 @@ REX, described in: The original code may still float around on the web. Try to search for lwp-0.1.tar.gz. + +This is its original copyright notice: + +Copyright (C) 1991-3 Stephen Crane. + +This library is free software; you can redistribute it and/or +modify it under the terms of the GNU Library General Public +License as published by the Free Software Foundation; either +version 2 of the License, or (at your option) any later version. + +This library is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +Library General Public License for more details. + +You should have received a copy of the GNU Library General Public +License along with this library; if not, write to the Free +Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + +author: Stephen Crane, (jsc@doc.ic.ac.uk), Department of Computing, +Imperial College of Science, Technology and Medicine, 180 Queen's +Gate, London SW7 2BZ, England. diff --git a/src/lib/lwp/arch.c b/src/lib/lwp/arch.c index 6a67c1606..15688be6b 100644 --- a/src/lib/lwp/arch.c +++ b/src/lib/lwp/arch.c @@ -1,7 +1,8 @@ /* * Empire - A multi-player, client/server Internet based war game. - * Copyright (C) 1986-2006, Dave Pare, Jeff Bailey, Thomas Ruschak, + * Copyright (C) 1994-2006, Dave Pare, Jeff Bailey, Thomas Ruschak, * Ken Stevens, Steve McClure + * Copyright (C) 1991-3 Stephen Crane * * 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 @@ -30,6 +31,7 @@ * Known contributors to this file: * Dave Pare, 1994 * Steve McClure, 1994-2000 + * Markus Armbruster, 2004-2006 */ #include diff --git a/src/lib/lwp/lwp.c b/src/lib/lwp/lwp.c index a3a3e47b8..9dbcf646e 100644 --- a/src/lib/lwp/lwp.c +++ b/src/lib/lwp/lwp.c @@ -1,24 +1,35 @@ /* - * lwp.c -- lightweight process creation, destruction and manipulation. - * Copyright (C) 1991-3 Stephen Crane. + * Empire - A multi-player, client/server Internet based war game. + * Copyright (C) 1994-2006, Dave Pare, Jeff Bailey, Thomas Ruschak, + * Ken Stevens, Steve McClure + * Copyright (C) 1991-3 Stephen Crane * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Library General Public - * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Library General Public License for more details. - * - * You should have received a copy of the GNU Library General Public - * License along with this library; if not, write to the Free - * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + * 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 + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * - * author: Stephen Crane, (jsc@doc.ic.ac.uk), Department of Computing, - * Imperial College of Science, Technology and Medicine, 180 Queen's - * Gate, London SW7 2BZ, England. + * --- + * + * See the "LEGAL", "LICENSE", "CREDITS" and "README" files for all the + * related information and legal notices. It is expected that any future + * projects/authors will amend these files as needed. + * + * --- + * + * lwp.c: lightweight process creation, destruction and manipulation + * + * Known contributors to this file: + * Markus Armbruster, 2004-2006 */ #include diff --git a/src/lib/lwp/lwpint.h b/src/lib/lwp/lwpint.h index 2db453b47..29a2aaa18 100644 --- a/src/lib/lwp/lwpint.h +++ b/src/lib/lwp/lwpint.h @@ -1,26 +1,37 @@ /* - * lwpint.h -- lwp internal structures + * Empire - A multi-player, client/server Internet based war game. + * Copyright (C) 1994-2006, Dave Pare, Jeff Bailey, Thomas Ruschak, + * Ken Stevens, Steve McClure + * Copyright (C) 1991-3 Stephen Crane * - * Copyright (C) 1991-3 Stephen Crane. + * 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 + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Library General Public - * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Library General Public License for more details. - * - * You should have received a copy of the GNU Library General Public - * License along with this library; if not, write to the Free - * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * + * --- * - * author: Stephen Crane, (jsc@doc.ic.ac.uk), Department of Computing, - * Imperial College of Science, Technology and Medicine, 180 Queen's - * Gate, London SW7 2BZ, England. + * See the "LEGAL", "LICENSE", "CREDITS" and "README" files for all the + * related information and legal notices. It is expected that any future + * projects/authors will amend these files as needed. + * + * --- + * + * lwpint.h: lwp internal structures + * + * Known contributors to this file: + * Markus Armbruster, 2004-2006 */ + #ifndef LWPINT_H #define LWPINT_H diff --git a/src/lib/lwp/queue.c b/src/lib/lwp/queue.c index 98b84ed56..6ee0fde7f 100644 --- a/src/lib/lwp/queue.c +++ b/src/lib/lwp/queue.c @@ -1,24 +1,35 @@ /* - * queue.c -- queue manipulation routines. - * Copyright (C) 1991-3 Stephen Crane. + * Empire - A multi-player, client/server Internet based war game. + * Copyright (C) 1994-2006, Dave Pare, Jeff Bailey, Thomas Ruschak, + * Ken Stevens, Steve McClure + * Copyright (C) 1991-3 Stephen Crane * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Library General Public - * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Library General Public License for more details. + * 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 + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * + * --- + * + * See the "LEGAL", "LICENSE", "CREDITS" and "README" files for all the + * related information and legal notices. It is expected that any future + * projects/authors will amend these files as needed. + * + * --- + * + * queue.c: queue manipulation routines * - * You should have received a copy of the GNU Library General Public - * License along with this library; if not, write to the Free - * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + * Known contributors to this file: * - * author: Stephen Crane, (jsc@doc.ic.ac.uk), Department of Computing, - * Imperial College of Science, Technology and Medicine, 180 Queen's - * Gate, London SW7 2BZ, England. */ #include diff --git a/src/lib/lwp/sel.c b/src/lib/lwp/sel.c index ce3c3c6e9..3a234b10d 100644 --- a/src/lib/lwp/sel.c +++ b/src/lib/lwp/sel.c @@ -1,7 +1,8 @@ /* * Empire - A multi-player, client/server Internet based war game. - * Copyright (C) 1986-2006, Dave Pare, Jeff Bailey, Thomas Ruschak, + * Copyright (C) 1994-2006, Dave Pare, Jeff Bailey, Thomas Ruschak, * Ken Stevens, Steve McClure + * Copyright (C) 1991-3 Stephen Crane * * 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 diff --git a/src/lib/lwp/sem.c b/src/lib/lwp/sem.c index 5ae076d32..39a582d40 100644 --- a/src/lib/lwp/sem.c +++ b/src/lib/lwp/sem.c @@ -1,24 +1,35 @@ /* - * lwpSem.c -- lwpSemaphore manipulation. - * Copyright (C) 1991-3 Stephen Crane. + * Empire - A multi-player, client/server Internet based war game. + * Copyright (C) 1994-2006, Dave Pare, Jeff Bailey, Thomas Ruschak, + * Ken Stevens, Steve McClure + * Copyright (C) 1991-3 Stephen Crane * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Library General Public - * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Library General Public License for more details. + * 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 + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * + * --- + * + * See the "LEGAL", "LICENSE", "CREDITS" and "README" files for all the + * related information and legal notices. It is expected that any future + * projects/authors will amend these files as needed. + * + * --- + * + * lwpSem.c: lwpSemaphore manipulation * - * You should have received a copy of the GNU Library General Public - * License along with this library; if not, write to the Free - * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + * Known contributors to this file: * - * author: Stephen Crane, (jsc@doc.ic.ac.uk), Department of Computing, - * Imperial College of Science, Technology and Medicine, 180 Queen's - * Gate, London SW7 2BZ, England. */ #include diff --git a/src/lib/lwp/status.c b/src/lib/lwp/status.c index 269c0c619..9d3b35e96 100644 --- a/src/lib/lwp/status.c +++ b/src/lib/lwp/status.c @@ -1,7 +1,8 @@ /* * Empire - A multi-player, client/server Internet based war game. - * Copyright (C) 1986-2006, Dave Pare, Jeff Bailey, Thomas Ruschak, + * Copyright (C) 1994-2006, Dave Pare, Jeff Bailey, Thomas Ruschak, * Ken Stevens, Steve McClure + * Copyright (C) 1991-3 Stephen Crane * * 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 -- 2.43.0