copyright and licensing issues: Artistic License _or_ GPL

git-svn-id: https://svn.code.sf.net/p/infobot/code/trunk@1944 c11ca15a-4712-0410-83d8-924469b57eb5

diff --git a/AUTHORS b/AUTHORS
index ec8e1ccfbecf00aba85029dde03cdfdf4b73dd87..b2d107b8d41909383ed19db1719044372566a258 100644 (file)
--- a/AUTHORS
+++ b/AUTHORS
@@ -6,13 +6,13 @@
 
 Infobot original:
 
-    License: As perl (GPL & Artistic)
+    License: As perl (GPL or Artistic)
         - Kevin A. Lenzo [oznoid] <lenzo@cs.cmu.edu>
         - Patrick Cold [ltd] <???>
 
 Later forked as Blootbot (and now remerged back):
 
-    License: Artistic
+    License: As perl (GPL or Artistic)
         Tim Riker [TimRiker] <Tim@Rikers.org>
 
 Is currently maintained by:

diff --git a/LICENSE b/LICENSE
index 5f221241e800cf54f0ab26ea1ca12799346bbd46..47d9fe5f12cf7d9e047bcc789608654a5a63b628 100644 (file)
--- a/LICENSE
+++ b/LICENSE
@@ -1,4 +1,11 @@
+Infobot is Copyright (C) 1997-2015, by Tim Riker <Tim@Rikers.org> and others.
 
+It is free software; you can redistribute it and/or modify it under the terms of either:
+
+a) the GNU General Public License as published by the Free Software Foundation;
+   either version 1, or (at your option) any later version, or
+
+b) the "Artistic License" as contained here:
 
 
 

diff --git a/infobot b/infobot
index ff2b0a0640de1ed44d92ca9df639732665232218..ffc3911387e33b9bd2554d97e8704b0e9257091d 100755 (executable)
--- a/infobot
+++ b/infobot
@@ -3,7 +3,7 @@
 # infobot
 # copyright kevin lenzo (c) 1997-1999
 # copyright david sobon (c) 1999-infinity
-# Copyright (c) 2001-2008 Tim Riker <Tim@Rikers.org>
+# Copyright (c) 2001-2014 Tim Riker <Tim@Rikers.org>
 
 use strict;
 use vars qw($bot_base_dir $bot_src_dir $bot_misc_dir $bot_state_dir