Upgrade license to GPLv3 or later. Bump version to 1.1.1.

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

6 files changed, 31 insertions, 37 deletions

diff --git a/src/Makefile.am b/src/Makefile.am
index fc510f8..b839875 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -2,9 +2,9 @@
 ##
 ## src/Makefile.am
 ##
-## GNU Robots is free software; you can redistribute it and/or modify
+## 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
+## the Free Software Foundation, either version 3 of the License, or
 ## (at your option) any later version.
 ##
 ## GNU Robots is distributed in the hope that it will be useful,
@@ -13,8 +13,7 @@
 ## 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
+## along with GNU Robots.  If not, see <http://www.gnu.org/licenses/>.
 
 bin_PROGRAMS = gnurobots
 
diff --git a/src/api.c b/src/api.c
index bd8a566..ee62e32 100644
--- a/src/api.c
+++ b/src/api.c
@@ -3,9 +3,9 @@
  *
  * Robot API for the GNU Robots game
  *
- * GNU Robots is free software; you can redistribute it and/or modify
+ * 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
+ * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
  * GNU Robots is distributed in the hope that it will be useful,
@@ -14,8 +14,7 @@
  * 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
+ * along with GNU Robots.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <stdio.h>
diff --git a/src/grobot.c b/src/grobot.c
index d39ea91..22eb777 100644
--- a/src/grobot.c
+++ b/src/grobot.c
@@ -3,9 +3,9 @@
  *
  * Robot object for the GNU Robots game
  *
- * GNU Robots is free software; you can redistribute it and/or modify
+ * 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
+ * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
  * GNU Robots is distributed in the hope that it will be useful,
@@ -14,8 +14,7 @@
  * 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
+ * along with GNU Robots.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "grobot.h"
diff --git a/src/main.c b/src/main.c
index 313329c..16dfaf1 100644
--- a/src/main.c
+++ b/src/main.c
@@ -4,9 +4,9 @@
  * GNU Robots game engine. This is the main() program, using GNU
  * Guile as the backend to handle the language.
  *
- * GNU Robots is free software; you can redistribute it and/or modify
+ * 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
+ * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
  * GNU Robots is distributed in the hope that it will be useful,
@@ -15,8 +15,7 @@
  * 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
+ * along with GNU Robots.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <stdio.h>
@@ -102,22 +101,22 @@ main (gint argc, gchar *argv[])
     {
     case 'V':
       /* Display version, then quit */
-      g_printf ("\n%s\n", PKGINFO);
-      g_printf ("%s\n", COPYRIGHT);
+      g_printf ("%s\n\n", PKGINFO);
+      g_printf ("%s\n\n", COPYRIGHT);
       g_printf
-    ("\nGNU Robots is free software; you can redistribute it and/or modify\n"
-     "it under the terms of the GNU General Public License as published by\n"
-     "the Free Software Foundation; either version 2 of the License, or\n"
-     "(at your option) any later version.\n");
+  ("GNU Robots is free software: you can redistribute it and/or modify\n"
+   "it under the terms of the GNU General Public License as published by\n"
+   "the Free Software Foundation, either version 3 of the License, or\n"
+   "(at your option) any later version.\n");
       g_printf
-    ("\nGNU Robots is distributed in the hope that it will be useful,\n"
-     "but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
-     "MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n"
-     "GNU General Public License for more details.\n");
+  ("\nGNU Robots is distributed in the hope that it will be useful,\n"
+   "but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
+   "MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n"
+   "GNU General Public License for more details.\n");
       g_printf
-    ("\nYou should have received a copy of the GNU General Public License\n"
-     "along with GNU Robots; if not, write to the Free Software\n"
-     "Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA\n\n");
+  ("\nYou should have received a copy of the GNU General Public License\n"
+   "along with GNU Robots.  If not, see <http://www.gnu.org/licenses/>.\n");
+
       exit (0);
       break;
 
diff --git a/src/map.c b/src/map.c
index 01d6cc9..857ac48 100644
--- a/src/map.c
+++ b/src/map.c
@@ -3,9 +3,9 @@
  *
  * GNU Robots Map object.
  *
- * GNU Robots is free software; you can redistribute it and/or modify
+ * 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
+ * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
  * GNU Robots is distributed in the hope that it will be useful,
@@ -14,8 +14,7 @@
  * 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
+ * along with GNU Robots.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <unistd.h>     /* for getopt */
diff --git a/src/userinterface.c b/src/userinterface.c
index 577cb7a..ca14ee6 100644
--- a/src/userinterface.c
+++ b/src/userinterface.c
@@ -3,9 +3,9 @@
  *
  * GNU Robots game engine.
  *
- * GNU Robots is free software; you can redistribute it and/or modify
+ * 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
+ * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
  * GNU Robots is distributed in the hope that it will be useful,
@@ -14,8 +14,7 @@
  * 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
+ * along with GNU Robots.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <glib.h>