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

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

7 files changed, 19 insertions, 27 deletions

diff --git a/include/Makefile.am b/include/Makefile.am
index 9217f6d..bb2a455 100644
--- a/include/Makefile.am
+++ b/include/Makefile.am
@@ -2,9 +2,9 @@
 ##
 ## include/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/>.
 
 EXTRA_DIST =\
  api.h\
@@ -23,4 +22,3 @@ EXTRA_DIST =\
  main.h\
  grobot.h\
  userinterface.h
-
diff --git a/include/api.h b/include/api.h
index 7ca15ad..8bb3b29 100644
--- a/include/api.h
+++ b/include/api.h
@@ -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/>.
  */
 
 #ifndef _API_H
diff --git a/include/configs.h b/include/configs.h
index 58330cd..2447b15 100644
--- a/include/configs.h
+++ b/include/configs.h
@@ -2,9 +2,9 @@
  *
  * 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,
@@ -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/>.
  */
 
 #ifndef CONFIGS_H
diff --git a/include/grobot.h b/include/grobot.h
index 1aeafb2..fd7f794 100644
--- a/include/grobot.h
+++ b/include/grobot.h
@@ -2,9 +2,9 @@
  *
  * Robot object for 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,
@@ -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/>.
  */
 
 #ifndef __G_ROBOT_H__
diff --git a/include/main.h b/include/main.h
index 4cbca0f..c93751b 100644
--- a/include/main.h
+++ b/include/main.h
@@ -2,9 +2,9 @@
  *
  * 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,
@@ -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/>.
  */
 
 #include <glib.h>
diff --git a/include/map.h b/include/map.h
index d807f7d..64389bb 100644
--- a/include/map.h
+++ b/include/map.h
@@ -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/>.
  */
 
 #ifndef __MAP_H__
diff --git a/include/userinterface.h b/include/userinterface.h
index e8c7665..fc92e9c 100644
--- a/include/userinterface.h
+++ b/include/userinterface.h
@@ -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/>.
  */
 
 #ifndef __USER_INTERFACE_H__