Fix copyright headers.v0.1.0bv0.1.0_beta

11 files changed, 76 insertions, 34 deletions

diff --git a/COPYRIGHT b/COPYRIGHT
index 60ecc1b9..c799e992 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -1,12 +1,35 @@
 Zeitgeist
+
 Copyright © 2008-2009 by the following:
 
-Markus Korn <thekorn@gmx.de>
-Mikkel Kamstrup Erlandsen <mikkel.kamstrup@gmail.com>
-Natan Yellin <aantny@gmail.com>
-Seif Lotfy <seif@lotfy.com>
-Siegfried-Angel Gevatter <rainct@ubuntu.com>
-Alex Graveley <alex@beatniksoftware.com>
+ Markus Korn <thekorn@gmx.de>
+ Mikkel Kamstrup Erlandsen <mikkel.kamstrup@gmail.com>
+ Natan Yellin <aantny@gmail.com>
+ Seif Lotfy <seif@lotfy.com>
+ Siegfried-Angel Gevatter <rainct@ubuntu.com>
+ 
+ Alex Graveley <alex@beatniksoftware.com>
+ Shane Fagan <shanepatrickfagan@yahoo.ie>
 
 If you have contributed to this project then you deserve to be on this list.
 Contact us (see: AUTHORS) and we'll add you.
+
+File zeitgeist/loggers/iso_strptime.py is part of wadllib, which is
+copyright © 2009 by Canonical Ltd.
+
+
+The following license applies to all the files included owned by the above
+copyright holders:
+
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU Lesser General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public License
+ along with this program.  If not, see <http://www.gnu.org/licenses/>.
diff --git a/extra/epiphany/zeitgeist-logger.py b/extra/epiphany/zeitgeist-logger.py
index 45604aab..3ba2c592 100644
--- a/extra/epiphany/zeitgeist-logger.py
+++ b/extra/epiphany/zeitgeist-logger.py
@@ -7,16 +7,16 @@
 # Copyright © 2009 Siegfried-Angel Gevatter Pujals <rainct@ubuntu.com>
 #
 # 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
+# it under the terms of the GNU Lesser General Public License as published by
 # the Free Software Foundation, either version 3 of the License, or
 # (at your option) any later version.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU Lesser General Public License for more details.
 #
-# You should have received a copy of the GNU General Public License
+# You should have received a copy of the GNU Lesser General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 import epiphany
diff --git a/zeitgeist/datamodel.py b/zeitgeist/datamodel.py
index ede7af69..50947810 100644
--- a/zeitgeist/datamodel.py
+++ b/zeitgeist/datamodel.py
@@ -1,3 +1,22 @@
+# -.- encoding: utf-8 -.-
+
+# Zeitgeist
+#
+# Copyright © 2009 Mikkel Kamstrup Erlandsen <mikkel.kamstrup@gmail.com>
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
 """
 This module provides the abstract datamodel used by the Zeitgeist framework.
 In addition to providing useful constructs for dealing with the Zeitgeist data
@@ -171,5 +190,3 @@ Source.SYSTEM_RESOURCE = Source("http://freedesktop.org/standards/xesam/1.0/core
 						   display_name=_("System Resources"),
 						   doc="An item available through the host operating system, such as an installed application or manual page"
 )
-
-
diff --git a/zeitgeist/dbusutils.py b/zeitgeist/dbusutils.py
index 77e1ae2c..743501a5 100644
--- a/zeitgeist/dbusutils.py
+++ b/zeitgeist/dbusutils.py
@@ -7,16 +7,16 @@
 # Copyright © 2009 Markus Korn <thekorn@gmx.de>
 #
 # 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
+# it under the terms of the GNU Lesser General Public License as published by
 # the Free Software Foundation, either version 3 of the License, or
 # (at your option) any later version.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU Lesser General Public License for more details.
 #
-# You should have received a copy of the GNU General Public License
+# You should have received a copy of the GNU Lesser General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 import sys
diff --git a/zeitgeist/engine/base.py b/zeitgeist/engine/base.py
index 7bab7da9..37fcd225 100644
--- a/zeitgeist/engine/base.py
+++ b/zeitgeist/engine/base.py
@@ -6,16 +6,16 @@
 # Copyright © 2009 Mikkel Kamstrup Erlandsen <mikkel.kamstrup@gmail.com>
 #
 # 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
+# it under the terms of the GNU Lesser General Public License as published by
 # the Free Software Foundation, either version 3 of the License, or
 # (at your option) any later version.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU Lesser General Public License for more details.
 #
-# You should have received a copy of the GNU General Public License
+# You should have received a copy of the GNU Lesser General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 import os
diff --git a/zeitgeist/engine/engine.py b/zeitgeist/engine/engine.py
index 1e0c0b20..827c9382 100644
--- a/zeitgeist/engine/engine.py
+++ b/zeitgeist/engine/engine.py
@@ -9,16 +9,16 @@
 # Copyright © 2009 Markus Korn <thekorn@gmx.de>
 #
 # 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
+# it under the terms of the GNU Lesser General Public License as published by
 # the Free Software Foundation, either version 3 of the License, or
 # (at your option) any later version.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU Lesser General Public License for more details.
 #
-# You should have received a copy of the GNU General Public License
+# You should have received a copy of the GNU Lesser General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 import time
diff --git a/zeitgeist/engine/remote.py b/zeitgeist/engine/remote.py
index 179f0d6d..f46d904a 100644
--- a/zeitgeist/engine/remote.py
+++ b/zeitgeist/engine/remote.py
@@ -5,16 +5,16 @@
 # Copyright © 2009 Siegfried-Angel Gevatter Pujals <rainct@ubuntu.com>
 #
 # 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
+# it under the terms of the GNU Lesser General Public License as published by
 # the Free Software Foundation, either version 3 of the License, or
 # (at your option) any later version.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU Lesser General Public License for more details.
 #
-# You should have received a copy of the GNU General Public License
+# You should have received a copy of the GNU Lesser General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 import dbus
diff --git a/zeitgeist/loggers/iso_strptime.py b/zeitgeist/loggers/iso_strptime.py
index de3b6992..851dd0f1 100644
--- a/zeitgeist/loggers/iso_strptime.py
+++ b/zeitgeist/loggers/iso_strptime.py
@@ -1,7 +1,9 @@
-# Copyright 2009 Canonical Ltd.  All rights reserved.
+# -.- encoding: utf-8 -.-
 
 # This file is part of wadllib.
 #
+# Copyright © 2009 Canonical Ltd.
+#
 # wadllib is free software: you can redistribute it and/or modify it under the
 # terms of the GNU Lesser General Public License as published by the Free
 # Software Foundation, version 3 of the License.
@@ -13,6 +15,7 @@
 #
 # You should have received a copy of the GNU Lesser General Public License
 # along with wadllib. If not, see <http://www.gnu.org/licenses/>.
+
 """
 Parser for ISO 8601 time strings
 ================================
@@ -34,7 +37,6 @@ datetime.datetime(2008, 1, 7, 5, 30, 30)
 datetime.datetime(2008, 1, 7, 5, 30, 30, tzinfo=TimeZone(7200))
 """
 
-
 import re
 import datetime
 
diff --git a/zeitgeist/loggers/zeitgeist_base.py b/zeitgeist/loggers/zeitgeist_base.py
index d3beddca..14a66569 100644
--- a/zeitgeist/loggers/zeitgeist_base.py
+++ b/zeitgeist/loggers/zeitgeist_base.py
@@ -9,16 +9,16 @@
 # Copyright © 2009 Markus Korn <thekorn@gmx.de>
 #
 # 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
+# it under the terms of the GNU Lesser General Public License as published by
 # the Free Software Foundation, either version 3 of the License, or
 # (at your option) any later version.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU Lesser General Public License for more details.
 #
-# You should have received a copy of the GNU General Public License
+# You should have received a copy of the GNU Lesser General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 import datetime
diff --git a/zeitgeist/loggers/zeitgeist_setup_service.py b/zeitgeist/loggers/zeitgeist_setup_service.py
index aaa762a6..661e3bac 100644
--- a/zeitgeist/loggers/zeitgeist_setup_service.py
+++ b/zeitgeist/loggers/zeitgeist_setup_service.py
@@ -5,16 +5,16 @@
 # Copyright © 2009 Markus Korn <thekorn@gmx.de>
 #
 # 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
+# it under the terms of the GNU Lesser General Public License as published by
 # the Free Software Foundation, either version 3 of the License, or
 # (at your option) any later version.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU Lesser General Public License for more details.
 #
-# You should have received a copy of the GNU General Public License
+# You should have received a copy of the GNU Lesser General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 import dbus
diff --git a/zeitgeist/singleton.py b/zeitgeist/singleton.py
index 7521e0c2..0586aba2 100644
--- a/zeitgeist/singleton.py
+++ b/zeitgeist/singleton.py
@@ -5,16 +5,16 @@
 # Copyright © 2009 Natan Yellin <aantny@gmail.com>
 #
 # 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
+# it under the terms of the GNU Lesser General Public License as published by
 # the Free Software Foundation, either version 3 of the License, or
 # (at your option) any later version.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU Lesser General Public License for more details.
 #
-# You should have received a copy of the GNU General Public License
+# You should have received a copy of the GNU Lesser General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 import logging