summaryrefslogtreecommitdiffstats
path: root/wallace
diff options
context:
space:
mode:
authorPaul Boddie <paul@boddie.org.uk>2013-12-05 17:03:42 +0100
committerJeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>2014-06-26 11:18:55 +0200
commit50b0c2a384bd2da1b210c156c8e6e138d8948b9c (patch)
tree60633201d97260dcb062a54642d09fcc18be2d35 /wallace
parent2c00aeadb07e396f78bad47329a167589727249c (diff)
downloadpykolab-50b0c2a384bd2da1b210c156c8e6e138d8948b9c.tar.gz
Updated the licensing information according to FSF recommendations.
Note that cyruslib.py is still "GPLv2 or a later version" unlike the other files.
Diffstat (limited to 'wallace')
-rw-r--r--wallace/__init__.py14
-rw-r--r--wallace/module_footer.py14
-rw-r--r--wallace/module_optout.py14
-rw-r--r--wallace/module_resources.py14
-rw-r--r--wallace/modules.py14
5 files changed, 35 insertions, 35 deletions
diff --git a/wallace/__init__.py b/wallace/__init__.py
index aeb1ccc..1108ead 100644
--- a/wallace/__init__.py
+++ b/wallace/__init__.py
@@ -3,18 +3,18 @@
#
# Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen a kolabsys.com>
#
-# This program is free software; you can redistribute it and/or modify
+# 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 3 or, at your option, any later version
-#
+# 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 Library General Public License for more details.
-#
+# GNU General Public License for more details.
+
# 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.
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
#
import asyncore
diff --git a/wallace/module_footer.py b/wallace/module_footer.py
index 40833a2..0e96751 100644
--- a/wallace/module_footer.py
+++ b/wallace/module_footer.py
@@ -3,18 +3,18 @@
#
# Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen a kolabsys.com>
#
-# This program is free software; you can redistribute it and/or modify
+# 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 3 or, at your option, any later version
-#
+# 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 Library General Public License for more details.
-#
+# GNU General Public License for more details.
+
# 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.
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
#
import os
diff --git a/wallace/module_optout.py b/wallace/module_optout.py
index 7fdeb6f..2df9677 100644
--- a/wallace/module_optout.py
+++ b/wallace/module_optout.py
@@ -3,18 +3,18 @@
#
# Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen a kolabsys.com>
#
-# This program is free software; you can redistribute it and/or modify
+# 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 3 or, at your option, any later version
-#
+# 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 Library General Public License for more details.
-#
+# GNU General Public License for more details.
+
# 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.
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
#
import json
diff --git a/wallace/module_resources.py b/wallace/module_resources.py
index 6a9e4ba..303252b 100644
--- a/wallace/module_resources.py
+++ b/wallace/module_resources.py
@@ -3,18 +3,18 @@
#
# Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen a kolabsys.com>
#
-# This program is free software; you can redistribute it and/or modify
+# 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 3 or, at your option, any later version
-#
+# 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 Library General Public License for more details.
-#
+# GNU General Public License for more details.
+
# 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.
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
#
import datetime
diff --git a/wallace/modules.py b/wallace/modules.py
index 461c41b..d4432d0 100644
--- a/wallace/modules.py
+++ b/wallace/modules.py
@@ -3,18 +3,18 @@
#
# Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen a kolabsys.com>
#
-# This program is free software; you can redistribute it and/or modify
+# 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 3 or, at your option, any later version
-#
+# 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 Library General Public License for more details.
-#
+# GNU General Public License for more details.
+
# 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.
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
#
import os