Update GPL license and other related details

- Use the proper FSF address
- Use the new contact address for David Sommerseth
- Use a better wording for the GPLv2 only license

Signed-off-by: David Sommerseth <davids@redhat.com>

16 files changed, 72 insertions, 61 deletions

diff --git a/LogActio/Logger.py b/LogActio/Logger.py
index a160f12..52bd5e8 100644
--- a/LogActio/Logger.py
+++ b/LogActio/Logger.py
@@ -2,11 +2,12 @@
 #   logactio  -  simple framework for doing configured action on certain
 #                log file events
 #
-#   Copyright 2012   David Sommerseth <dazo@users.sourceforge.net>
+#   Copyright 2012 - 2015   David Sommerseth <dazo@eurephia.org>
 #
-#   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.
+#   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, version 2
+#   of the License.
 #
 #   This program is distributed in the hope that it will be useful,
 #   but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -15,7 +16,7 @@
 #
 #   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., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+#   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #
 #   For the avoidance of doubt the "preferred form" of this code is one which
 #   is in an open unpatent encumbered format. Where cryptographic key signing
diff --git a/LogActio/Message.py b/LogActio/Message.py
index 4ffb252..ffc89cd 100644
--- a/LogActio/Message.py
+++ b/LogActio/Message.py
@@ -2,11 +2,12 @@
 #   logactio  -  simple framework for doing configured action on certain
 #                log file events
 #
-#   Copyright 2012   David Sommerseth <dazo@users.sourceforge.net>
+#   Copyright 2012 - 2015   David Sommerseth <dazo@eurephia.org>
 #
-#   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.
+#   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, version 2
+#   of the License.
 #
 #   This program is distributed in the hope that it will be useful,
 #   but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -15,7 +16,7 @@
 #
 #   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., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+#   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #
 #   For the avoidance of doubt the "preferred form" of this code is one which
 #   is in an open unpatent encumbered format. Where cryptographic key signing
diff --git a/LogActio/ReporterQueue.py b/LogActio/ReporterQueue.py
index 1e87ece..077bbe4 100644
--- a/LogActio/ReporterQueue.py
+++ b/LogActio/ReporterQueue.py
@@ -2,11 +2,12 @@
 #   logactio  -  simple framework for doing configured action on certain
 #                log file events
 #
-#   Copyright 2012   David Sommerseth <dazo@users.sourceforge.net>
+#   Copyright 2012 - 2015   David Sommerseth <dazo@eurephia.org>
 #
-#   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.
+#   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, version 2
+#   of the License.
 #
 #   This program is distributed in the hope that it will be useful,
 #   but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -15,7 +16,7 @@
 #
 #   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., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+#   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #
 #   For the avoidance of doubt the "preferred form" of this code is one which
 #   is in an open unpatent encumbered format. Where cryptographic key signing
diff --git a/LogActio/Reporters/HTTPreporter.py b/LogActio/Reporters/HTTPreporter.py
index a006310..12dfca3 100644
--- a/LogActio/Reporters/HTTPreporter.py
+++ b/LogActio/Reporters/HTTPreporter.py
@@ -2,11 +2,12 @@
 #   logactio  -  simple framework for doing configured action on certain
 #                log file events
 #
-#   Copyright 2012   David Sommerseth <dazo@users.sourceforge.net>
+#   Copyright 2012 - 2015   David Sommerseth <dazo@eurephia.org>
 #
-#   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.
+#   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, version 2
+#   of the License.
 #
 #   This program is distributed in the hope that it will be useful,
 #   but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -15,7 +16,7 @@
 #
 #   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., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+#   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #
 #   For the avoidance of doubt the "preferred form" of this code is one which
 #   is in an open unpatent encumbered format. Where cryptographic key signing
diff --git a/LogActio/Reporters/IPTipset.py b/LogActio/Reporters/IPTipset.py
index 97539c9..182fc42 100644
--- a/LogActio/Reporters/IPTipset.py
+++ b/LogActio/Reporters/IPTipset.py
@@ -2,11 +2,12 @@
 #   logactio  -  simple framework for doing configured action on certain
 #                log file events
 #
-#   Copyright 2013   David Sommerseth <dazo@users.sourceforge.net>
+#   Copyright 2012 - 2015   David Sommerseth <dazo@eurephia.org>
 #
-#   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.
+#   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, version 2
+#   of the License.
 #
 #   This program is distributed in the hope that it will be useful,
 #   but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -15,7 +16,7 @@
 #
 #   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., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+#   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #
 #   For the avoidance of doubt the "preferred form" of this code is one which
 #   is in an open unpatent encumbered format. Where cryptographic key signing
diff --git a/LogActio/Reporters/QpidReporter.py b/LogActio/Reporters/QpidReporter.py
index 82c4b50..3295616 100644
--- a/LogActio/Reporters/QpidReporter.py
+++ b/LogActio/Reporters/QpidReporter.py
@@ -2,11 +2,12 @@
 #   logactio  -  simple framework for doing configured action on certain
 #                log file events
 #
-#   Copyright 2012   David Sommerseth <dazo@users.sourceforge.net>
+#   Copyright 2012 - 2015   David Sommerseth <dazo@eurephia.org>
 #
-#   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.
+#   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, version 2
+#   of the License.
 #
 #   This program is distributed in the hope that it will be useful,
 #   but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -15,7 +16,7 @@
 #
 #   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., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+#   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #
 #   For the avoidance of doubt the "preferred form" of this code is one which
 #   is in an open unpatent encumbered format. Where cryptographic key signing
diff --git a/LogActio/Reporters/SMTPreporter.py b/LogActio/Reporters/SMTPreporter.py
index 5ce5a0d..bf042f9 100644
--- a/LogActio/Reporters/SMTPreporter.py
+++ b/LogActio/Reporters/SMTPreporter.py
@@ -2,11 +2,12 @@
 #   logactio  -  simple framework for doing configured action on certain
 #                log file events
 #
-#   Copyright 2012   David Sommerseth <dazo@users.sourceforge.net>
+#   Copyright 2012 - 2015   David Sommerseth <dazo@eurephia.org>
 #
-#   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.
+#   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, version 2
+#   of the License.
 #
 #   This program is distributed in the hope that it will be useful,
 #   but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -15,7 +16,7 @@
 #
 #   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., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+#   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #
 #   For the avoidance of doubt the "preferred form" of this code is one which
 #   is in an open unpatent encumbered format. Where cryptographic key signing
diff --git a/LogActio/Reporters/__init__.py b/LogActio/Reporters/__init__.py
index 8b6d11b..7d47ab7 100644
--- a/LogActio/Reporters/__init__.py
+++ b/LogActio/Reporters/__init__.py
@@ -2,11 +2,12 @@
 #   logactio  -  simple framework for doing configured action on certain
 #                log file events
 #
-#   Copyright 2012   David Sommerseth <dazo@users.sourceforge.net>
+#   Copyright 2012 - 2015   David Sommerseth <dazo@eurephia.org>
 #
-#   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.
+#   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, version 2
+#   of the License.
 #
 #   This program is distributed in the hope that it will be useful,
 #   but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -15,7 +16,7 @@
 #
 #   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., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+#   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #
 #   For the avoidance of doubt the "preferred form" of this code is one which
 #   is in an open unpatent encumbered format. Where cryptographic key signing
diff --git a/LogActio/ThresholdWatch.py b/LogActio/ThresholdWatch.py
index 9c36c98..2fd7403 100644
--- a/LogActio/ThresholdWatch.py
+++ b/LogActio/ThresholdWatch.py
@@ -2,11 +2,12 @@
 #   logactio  -  simple framework for doing configured action on certain
 #                log file events
 #
-#   Copyright 2013   David Sommerseth <dazo@users.sourceforge.net>
+#   Copyright 2012 - 2015   David Sommerseth <dazo@eurephia.org>
 #
-#   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.
+#   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, version 2
+#   of the License.
 #
 #   This program is distributed in the hope that it will be useful,
 #   but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -15,7 +16,7 @@
 #
 #   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., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+#   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #
 #   For the avoidance of doubt the "preferred form" of this code is one which
 #   is in an open unpatent encumbered format. Where cryptographic key signing
diff --git a/LogActio/__init__.py b/LogActio/__init__.py
index 95aa66a..8e3582a 100644
--- a/LogActio/__init__.py
+++ b/LogActio/__init__.py
@@ -2,11 +2,12 @@
 #   logactio  -  simple framework for doing configured action on certain
 #                log file events
 #
-#   Copyright 2012 - 2013   David Sommerseth <dazo@users.sourceforge.net>
+#   Copyright 2012 - 2015   David Sommerseth <dazo@eurephia.org>
 #
-#   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.
+#   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, version 2
+#   of the License.
 #
 #   This program is distributed in the hope that it will be useful,
 #   but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -15,7 +16,7 @@
 #
 #   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., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+#   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #
 #   For the avoidance of doubt the "preferred form" of this code is one which
 #   is in an open unpatent encumbered format. Where cryptographic key signing
diff --git a/docs/source/configuration.rst b/docs/source/configuration.rst
index d107399..1f1fc39 100644
--- a/docs/source/configuration.rst
+++ b/docs/source/configuration.rst
@@ -1,4 +1,4 @@
-.. Copyright 2012 - 2013 David Sommerseth <dazo@users.sourceforge.net>
+.. Copyright 2012 - 2015 David Sommerseth <dazo@eurephia.org>
 
    This is free software: you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by
diff --git a/docs/source/installing.rst b/docs/source/installing.rst
index e0fe317..2d82ef7 100644
--- a/docs/source/installing.rst
+++ b/docs/source/installing.rst
@@ -1,4 +1,4 @@
-.. Copyright 2012 David Sommerseth <dazo@users.sourceforge.net>
+.. Copyright 2012 - 2015 David Sommerseth <dazo@eurephia.org>
 
    This is free software: you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by
diff --git a/docs/source/starting.rst b/docs/source/starting.rst
index 76f680a..13cf9ab 100644
--- a/docs/source/starting.rst
+++ b/docs/source/starting.rst
@@ -1,4 +1,4 @@
-.. Copyright 2012 David Sommerseth <dazo@users.sourceforge.net>
+.. Copyright 2012 - 2015 David Sommerseth <dazo@eurephia.org>
 
    This is free software: you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by
diff --git a/docs/source/writingreporters.rst b/docs/source/writingreporters.rst
index 18d9318..5cc8b78 100644
--- a/docs/source/writingreporters.rst
+++ b/docs/source/writingreporters.rst
@@ -1,4 +1,4 @@
-.. Copyright 2012 David Sommerseth <dazo@users.sourceforge.net>
+.. Copyright 2012 - 2015 David Sommerseth <dazo@eurephia.org>
 
    This is free software: you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by
diff --git a/examples/qpid-alert-watcher b/examples/qpid-alert-watcher
index 5e40ae7..deff4fc 100644
--- a/examples/qpid-alert-watcher
+++ b/examples/qpid-alert-watcher
@@ -3,7 +3,7 @@
 #   logactio  -  simple framework for doing configured action on certain
 #                log file events
 #
-#   Copyright 2012   David Sommerseth <dazo@users.sourceforge.net>
+#   Copyright 2012 - 2015   David Sommerseth <dazo@eurephia.org>
 #
 #   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
@@ -16,7 +16,7 @@
 #
 #   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., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+#   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #
 #   For the avoidance of doubt the "preferred form" of this code is one which
 #   is in an open unpatent encumbered format. Where cryptographic key signing
diff --git a/logactio b/logactio
index 58c1e7e..8983dfc 100755
--- a/logactio
+++ b/logactio
@@ -3,11 +3,12 @@
 #   logactio  -  simple framework for doing configured action on certain
 #                log file events
 #
-#   Copyright 2012   David Sommerseth <dazo@users.sourceforge.net>
+#   Copyright 2012 - 2015   David Sommerseth <dazo@eurephia.org>
 #
-#   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.
+#   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, version 2
+#   of the License.
 #
 #   This program is distributed in the hope that it will be useful,
 #   but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -16,7 +17,7 @@
 #
 #   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., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+#   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #
 #   For the avoidance of doubt the "preferred form" of this code is one which
 #   is in an open unpatent encumbered format. Where cryptographic key signing