Licensing uniformity: dual-license rbot core under MIT+acknowledgement and GPLv2

15 files changed, 0 insertions, 33 deletions

diff --git a/lib/rbot/botuser.rb b/lib/rbot/botuser.rb
index f9b882d8..a4bec708 100644
--- a/lib/rbot/botuser.rb
+++ b/lib/rbot/botuser.rb
@@ -4,8 +4,6 @@
 #
 # rbot user management
 # Author:: Giuseppe Bilotta (giuseppe.bilotta@gmail.com)
-# Copyright:: Copyright (c) 2006 Giuseppe Bilotta
-# License:: GPLv2
 
 require 'singleton'
 require 'set'
diff --git a/lib/rbot/config-compat.rb b/lib/rbot/config-compat.rb
index ee2cb613..43c50a02 100644
--- a/lib/rbot/config-compat.rb
+++ b/lib/rbot/config-compat.rb
@@ -7,8 +7,6 @@
 # so we have to handle this case.
 #
 # Author:: Giuseppe Bilotta (giuseppe.bilotta@gmail.com)
-# Copyright:: Copyright (c) 2006 Giuseppe Bilotta
-# License:: GPLv2
 
 module Irc
   Config = Bot::Config
diff --git a/lib/rbot/core/auth.rb b/lib/rbot/core/auth.rb
index 60f53544..f5745d0e 100644
--- a/lib/rbot/core/auth.rb
+++ b/lib/rbot/core/auth.rb
@@ -4,8 +4,6 @@
 # :title: rbot auth management from IRC
 #
 # Author:: Giuseppe "Oblomov" Bilotta <giuseppe.bilotta@gmail.com>
-# Copyright:: (C) 2006,2007 Giuseppe Bilotta
-# License:: GPL v2
 
 class AuthModule < CoreBotModule
 
diff --git a/lib/rbot/core/basics.rb b/lib/rbot/core/basics.rb
index d991e921..33614f36 100644
--- a/lib/rbot/core/basics.rb
+++ b/lib/rbot/core/basics.rb
@@ -4,8 +4,6 @@
 # :title: rbot basic management from IRC
 #
 # Author:: Giuseppe "Oblomov" Bilotta <giuseppe.bilotta@gmail.com>
-# Copyright:: (C) 2006,2007 Giuseppe Bilotta
-# License:: GPL v2
 
 class BasicsModule < CoreBotModule
 
diff --git a/lib/rbot/core/config.rb b/lib/rbot/core/config.rb
index 38140f18..de122dcd 100644
--- a/lib/rbot/core/config.rb
+++ b/lib/rbot/core/config.rb
@@ -4,8 +4,6 @@
 # :title: rbot config management from IRC
 #
 # Author:: Giuseppe "Oblomov" Bilotta <giuseppe.bilotta@gmail.com>
-# Copyright:: (C) 2006,2007 Giuseppe Bilotta
-# License:: GPL v2
 
 class ConfigModule < CoreBotModule
 
diff --git a/lib/rbot/core/filters_ui.rb b/lib/rbot/core/filters_ui.rb
index 6f5ecbb3..2ac258d6 100644
--- a/lib/rbot/core/filters_ui.rb
+++ b/lib/rbot/core/filters_ui.rb
@@ -4,8 +4,6 @@
 # :title: filters management from IRC
 #
 # Author:: Giuseppe "Oblomov" Bilotta <giuseppe.bilotta@gmail.com>
-# Copyright:: (C) 2008 Giuseppe Bilotta
-# License:: GPL v2
 
 class FiltersModule < CoreBotModule
 
diff --git a/lib/rbot/core/irclog.rb b/lib/rbot/core/irclog.rb
index b0c6e370..6ad2d4cc 100644
--- a/lib/rbot/core/irclog.rb
+++ b/lib/rbot/core/irclog.rb
@@ -4,8 +4,6 @@
 # :title: rbot IRC logging facilities
 #
 # Author:: Giuseppe "Oblomov" Bilotta <giuseppe.bilotta@gmail.com>
-# Copyright:: (C) 2008 Giuseppe Bilotta
-# License:: GPL v2
 
 class IrcLogModule < CoreBotModule
 
diff --git a/lib/rbot/core/remote.rb b/lib/rbot/core/remote.rb
index 8d6b0e08..7157195f 100644
--- a/lib/rbot/core/remote.rb
+++ b/lib/rbot/core/remote.rb
@@ -4,8 +4,6 @@
 # :title: Remote service provider for rbot
 #
 # Author:: Giuseppe Bilotta (giuseppe.bilotta@gmail.com)
-# Copyright:: Copyright (c) 2006 Giuseppe Bilotta
-# License:: GPLv2
 #
 # From an idea by halorgium <rbot@spork.in>.
 #
diff --git a/lib/rbot/core/unicode.rb b/lib/rbot/core/unicode.rb
index a24a1998..0c191226 100644
--- a/lib/rbot/core/unicode.rb
+++ b/lib/rbot/core/unicode.rb
@@ -4,8 +4,6 @@
 # :title: Unicode plugin
 #
 # Author:: jsn (Dmitry Kim) <dmitry dot kim at gmail dot org>
-# Copyright:: (C) 2007 Dmitry Kim
-# License:: public domain
 #
 # This plugin adds unicode-awareness to rbot. When it's loaded, all the
 # character strings inside of rbot are assumed to be in proper utf-8
diff --git a/lib/rbot/core/userdata.rb b/lib/rbot/core/userdata.rb
index f7c74a4a..a08285f4 100644
--- a/lib/rbot/core/userdata.rb
+++ b/lib/rbot/core/userdata.rb
@@ -4,8 +4,6 @@
 # :title: rbot user data management from IRC
 #
 # Author:: Giuseppe "Oblomov" Bilotta <giuseppe.bilotta@gmail.com>
-# Copyright:: (C) 2006,2007 Giuseppe Bilotta
-# License:: GPL v2
 
 module ::Irc
   class User
diff --git a/lib/rbot/core/utils/extends.rb b/lib/rbot/core/utils/extends.rb
index 19157009..e62e2f21 100644
--- a/lib/rbot/core/utils/extends.rb
+++ b/lib/rbot/core/utils/extends.rb
@@ -4,8 +4,6 @@
 # :title: Standard classes extensions
 #
 # Author:: Giuseppe "Oblomov" Bilotta <giuseppe.bilotta@gmail.com>
-# Copyright:: (C) 2006,2007 Giuseppe Bilotta
-# License:: GPL v2
 #
 # This file collects extensions to standard Ruby classes and to some core rbot
 # classes to be used by the various plugins
diff --git a/lib/rbot/core/utils/filters.rb b/lib/rbot/core/utils/filters.rb
index 69f6f876..bf8ac580 100644
--- a/lib/rbot/core/utils/filters.rb
+++ b/lib/rbot/core/utils/filters.rb
@@ -4,8 +4,6 @@
 # :title: Stream filters
 #
 # Author:: Giuseppe "Oblomov" Bilotta <giuseppe.bilotta@gmail.com>
-# Copyright:: (C) 2008 Giuseppe Bilotta
-# License:: GPL v2
 #
 # This file collects methods to handle 'stream filters', a generic mechanism
 # to transform text+attributes into other text+attributes
diff --git a/lib/rbot/core/utils/httputil.rb b/lib/rbot/core/utils/httputil.rb
index 573c6aca..9df8fc2c 100644
--- a/lib/rbot/core/utils/httputil.rb
+++ b/lib/rbot/core/utils/httputil.rb
@@ -6,10 +6,6 @@
 # Author:: Tom Gilbert <tom@linuxbrit.co.uk>
 # Author:: Giuseppe "Oblomov" Bilotta <giuseppe.bilotta@gmail.com>
 # Author:: Dmitry "jsn" Kim <dmitry point kim at gmail point com>
-#
-# Copyright:: (C) 2002-2005 Tom Gilbert
-# Copyright:: (C) 2006 Tom Gilbert, Giuseppe Bilotta
-# Copyright:: (C) 2007 Giuseppe Bilotta, Dmitry Kim
 
 require 'resolv'
 require 'net/http'
diff --git a/lib/rbot/core/utils/utils.rb b/lib/rbot/core/utils/utils.rb
index 22fcee37..b180a62a 100644
--- a/lib/rbot/core/utils/utils.rb
+++ b/lib/rbot/core/utils/utils.rb
@@ -6,9 +6,6 @@
 # Author:: Tom Gilbert <tom@linuxbrit.co.uk>
 # Author:: Giuseppe "Oblomov" Bilotta <giuseppe.bilotta@gmail.com>
 #
-# Copyright:: (C) 2002-2006 Tom Gilbert
-# Copyright:: (C) 2007 Giuseppe Bilotta
-#
 # TODO some of these Utils should be rewritten as extensions to the approriate
 # standard Ruby classes and accordingly be moved to extends.rb
 
diff --git a/lib/rbot/irc.rb b/lib/rbot/irc.rb
index fe1aa9fa..31d432fd 100644
--- a/lib/rbot/irc.rb
+++ b/lib/rbot/irc.rb
@@ -16,8 +16,6 @@
 # This module defines the fundamental building blocks for IRC
 #
 # Author:: Giuseppe Bilotta (giuseppe.bilotta@gmail.com)
-# Copyright:: Copyright (c) 2006 Giuseppe Bilotta
-# License:: GPLv2
 
 require 'singleton'