Corrected all copyright headers, and misc cleanups.

Signed-off-by: Bradley Smith <brad@brad-smith.co.uk>

8 files changed, 84 insertions, 95 deletions

diff --git a/lib/Makefile.am b/lib/Makefile.am
index 0386a82..0712921 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -1,3 +1,4 @@
+## Copyright (C) 2008 Bradley Smith <brad@brad-smith.co.uk>
 ##
 ## lib/Makefile.am
 ##
@@ -14,7 +15,6 @@
 ## You should have received a copy of the GNU General Public License
 ## along with GNU Robots; if not, write to the Free Software
 ## Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-##
 
 SUBDIRS = xpm
 
diff --git a/lib/cursesplugin.c b/lib/cursesplugin.c
index 06b1cba..3fb6e47 100644
--- a/lib/cursesplugin.c
+++ b/lib/cursesplugin.c
@@ -1,23 +1,21 @@
-/* $Id: cursesplugin.c,v 1.1 2004/10/21 19:24:30 zeenix Exp $ */
-
-/* GNU Robots game engine. */
-
-/* Copyright (C) 1998 Jim Hall, jhall1@isd.net */
-
-/*
-   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., 675 Mass Ave, Cambridge, MA 02139, USA.
+/* Copyright (C) 1998 Jim Hall <jhall1@isd.net>
+ * Copyright (C) 2008 Bradley Smith <brad@brad-smith.co.uk>
+ *
+ * GNU Robots game engine.
+ *
+ * GNU Robots 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.
+ *
+ * GNU Robots 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 GNU Robots; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include <glib.h>
diff --git a/lib/cursesplugin.h b/lib/cursesplugin.h
index 7f72d0e..3f6beba 100644
--- a/lib/cursesplugin.h
+++ b/lib/cursesplugin.h
@@ -1,23 +1,21 @@
-/* $Id: cursesplugin.h,v 1.1 2004/10/21 19:24:30 zeenix Exp $ */
-
-/* GNU Robots game engine. */
-
-/* Copyright (C) 1998 Jim Hall, jhall1@isd.net */
-
-/*
-   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., 675 Mass Ave, Cambridge, MA 02139, USA.
+/* Copyright (C) 1998 Jim Hall <jhall1@isd.net>
+ * Copyright (C) 2008 Bradley Smith <brad@brad-smith.co.uk>
+ *
+ * GNU Robots game engine.
+ *
+ * GNU Robots 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.
+ *
+ * GNU Robots 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 GNU Robots; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #ifndef __CURSES_PLUGIN_H__
diff --git a/lib/textplugin.c b/lib/textplugin.c
index 0c3059c..75a6800 100644
--- a/lib/textplugin.c
+++ b/lib/textplugin.c
@@ -1,23 +1,21 @@
-/* $Id: textplugin.c,v 1.1 2004/10/21 19:24:30 zeenix Exp $ */
-
-/* GNU Robots game engine. */
-
-/* Copyright (C) 1998 Jim Hall, jhall1@isd.net */
-
-/*
-   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., 675 Mass Ave, Cambridge, MA 02139, USA.
+/* Copyright (C) 1998 Jim Hall <jhall1@isd.net>
+ * Copyright (C) 2008 Bradley Smith <brad@brad-smith.co.uk>
+ *
+ * GNU Robots game engine.
+ *
+ * GNU Robots 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.
+ *
+ * GNU Robots 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 GNU Robots; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include <glib.h>
diff --git a/lib/textplugin.h b/lib/textplugin.h
index fd9eb7b..f720b2a 100644
--- a/lib/textplugin.h
+++ b/lib/textplugin.h
@@ -1,23 +1,21 @@
-/* $Id: textplugin.h,v 1.1 2004/10/21 19:24:30 zeenix Exp $ */
-
-/* GNU Robots game engine. */
-
-/* Copyright (C) 1998 Jim Hall, jhall1@isd.net */
-
-/*
-   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., 675 Mass Ave, Cambridge, MA 02139, USA.
+/* Copyright (C) 1998 Jim Hall <jhall1@isd.net>
+ * Copyright (C) 2008 Bradley Smith <brad@brad-smith.co.uk>
+ *
+ * GNU Robots game engine.
+ *
+ * GNU Robots 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.
+ *
+ * GNU Robots 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 GNU Robots; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #ifndef __TEXT_PLUGIN_H__
diff --git a/lib/x11plugin.c b/lib/x11plugin.c
index 9145784..f259606 100644
--- a/lib/x11plugin.c
+++ b/lib/x11plugin.c
@@ -1,16 +1,14 @@
-/* $Id: x11plugin.c,v 1.1 2004/10/21 19:24:30 zeenix Exp $ */
-/*
- * GNU Robots game engine.
- *
- * Copyright (C) 1998 Jim Hall <jhall1@isd.net>
+/* Copyright (C) 1998 Jim Hall <jhall1@isd.net>
  * Copyright (C) 2008 Bradley Smith <brad@brad-smith.co.uk>
  *
- * This program is free software; you can redistribute it and/or modify
+ * GNU Robots game engine.
+ *
+ * GNU Robots 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,
+ * GNU Robots 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.
diff --git a/lib/x11plugin.h b/lib/x11plugin.h
index 4419bdc..8c9b01e 100644
--- a/lib/x11plugin.h
+++ b/lib/x11plugin.h
@@ -1,15 +1,14 @@
-/* $Id: x11plugin.h,v 1.1 2004/10/21 19:24:30 zeenix Exp $ */
-/* GNU Robots game engine.
- *
- * Copyright (C) 1998 Jim Hall <jhall1@isd.net>
+/* Copyright (C) 1998 Jim Hall <jhall1@isd.net>
  * Copyright (C) 2008 Bradley Smith <brad@brad-smith.co.uk>
  *
- * This program is free software; you can redistribute it and/or modify
+ * GNU Robots game engine.
+ *
+ * GNU Robots 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,
+ * GNU Robots 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.
diff --git a/lib/xpm/Makefile.am b/lib/xpm/Makefile.am
index 60cb556..069cada 100644
--- a/lib/xpm/Makefile.am
+++ b/lib/xpm/Makefile.am
@@ -1,3 +1,4 @@
+## Copyright (C) 2008 Bradley Smith <brad@brad-smith.co.uk>
 ##
 ## xpm/Makefile.am
 ##
@@ -14,7 +15,6 @@
 ## You should have received a copy of the GNU General Public License
 ## along with GNU Robots; if not, write to the Free Software
 ## Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-##
 
 EXTRA_DIST =\
  baddie.xpm\