Change license to zlib (MIT sucks :()

25 files changed, 43 insertions, 62 deletions

diff --git a/COPYING b/COPYING
index 324436a5..762cc696 100644
--- a/COPYING
+++ b/COPYING
@@ -1,19 +1,20 @@
-Copyright (C) 2010-2011 by Florent Le Coz
+Copyright (c) 2010-2011 Florent Le Coz
 
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
+This software is provided 'as-is', without any express or implied
+warranty. In no event will the authors be held liable for any damages
+arising from the use of this software.
 
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
+Permission is granted to anyone to use this software for any purpose,
+including commercial applications, and to alter it and redistribute it
+freely, subject to the following restrictions:
 
-The software is provided "as is", without warranty of any kind, express or
-implied, including but not limited to the warranties of merchantability,
-fitness for a particular purpose and noninfringement. In no event shall the
-authors or copyright holders be liable for any claim, damages or other
-liability, whether in an action of contract, tort or otherwise, arising from,
-out of or in connection with the software or the use or other dealings in
-the software.
\ No newline at end of file
+   1. The origin of this software must not be misrepresented; you must not
+   claim that you wrote the original software. If you use this software
+   in a product, an acknowledgment in the product documentation would be
+   appreciated but is not required.
+
+   2. Altered source versions must be plainly marked as such, and must not be
+   misrepresented as being the original software.
+
+   3. This notice may not be removed or altered from any source
+   distribution.
diff --git a/README b/README
index cf2d188f..b3e2b2ec 100644
--- a/README
+++ b/README
@@ -73,7 +73,7 @@ Report a bug:      http://dev.louiz.org/project/poezio/bugs/add
 Poezio is Free Software.
 (learn more: http://www.gnu.org/philosophy/free-sw.html)
 
-Poezio is released under the MIT License.
+Poezio is released under the zlib License.
 Please read the COPYING file for details.
 
 The artwork logo was made by Gaëtan Ribémont and released under
diff --git a/src/atom_parser.py b/src/atom_parser.py
index 6b37cb7d..bd1de8d0 100644
--- a/src/atom_parser.py
+++ b/src/atom_parser.py
@@ -3,7 +3,7 @@
 # This file is part of Poezio.
 #
 # Poezio is free software: you can redistribute it and/or modify
-# it under the terms of the MIT license. See the COPYING file.
+# it under the terms of the zlib license. See the COPYING file.
 
 """
 Defines a function returning a dict containing the values from an
diff --git a/src/common.py b/src/common.py
index aa74e5c1..db750b30 100644
--- a/src/common.py
+++ b/src/common.py
@@ -3,7 +3,7 @@
 # This file is part of Poezio.
 #
 # Poezio is free software: you can redistribute it and/or modify
-# it under the terms of the MIT license. See the COPYING file.
+# it under the terms of the zlib license. See the COPYING file.
 
 """
 various useful functions
diff --git a/src/config.py b/src/config.py
index 9661158e..8bc0d863 100644
--- a/src/config.py
+++ b/src/config.py
@@ -3,7 +3,7 @@
 # This file is part of Poezio.
 #
 # Poezio is free software: you can redistribute it and/or modify
-# it under the terms of the MIT license. See the COPYING file.
+# it under the terms of the zlib license. See the COPYING file.
 
 """
 Defines the global config instance, used to get or set (and save) values
diff --git a/src/connection.py b/src/connection.py
index f35ec178..0b8e4c18 100644
--- a/src/connection.py
+++ b/src/connection.py
@@ -3,7 +3,7 @@
 # This file is part of Poezio.
 #
 # Poezio is free software: you can redistribute it and/or modify
-# it under the terms of the MIT license. See the COPYING file.
+# it under the terms of the zlib license. See the COPYING file.
 
 """
 Defines the Connection class
diff --git a/src/contact.py b/src/contact.py
index cf9163ab..9d2885be 100644
--- a/src/contact.py
+++ b/src/contact.py
@@ -3,7 +3,7 @@
 # This file is part of Poezio.
 #
 # Poezio is free software: you can redistribute it and/or modify
-# it under the terms of the MIT license. See the COPYING file.
+# it under the terms of the zlib license. See the COPYING file.
 
 """
 Defines the Resource and Contact classes, which are used in
diff --git a/src/core.py b/src/core.py
index 8d1fde3a..845c1e03 100644
--- a/src/core.py
+++ b/src/core.py
@@ -3,7 +3,7 @@
 # This file is part of Poezio.
 #
 # Poezio is free software: you can redistribute it and/or modify
-# it under the terms of the MIT license. See the COPYING file.
+# it under the terms of the zlib license. See the COPYING file.
 
 from gettext import gettext as _
 
diff --git a/src/data_forms.py b/src/data_forms.py
index 106b1f77..dc532b87 100644
--- a/src/data_forms.py
+++ b/src/data_forms.py
@@ -3,7 +3,7 @@
 # This file is part of Poezio.
 #
 # Poezio is free software: you can redistribute it and/or modify
-# it under the terms of the MIT license. See the COPYING file.
+# it under the terms of the zlib license. See the COPYING file.
 
 """
 Defines the data-forms Tab and all the Windows for it.
diff --git a/src/keyboard.py b/src/keyboard.py
index dce987e1..99173f40 100644
--- a/src/keyboard.py
+++ b/src/keyboard.py
@@ -3,7 +3,7 @@
 # This file is part of Poezio.
 #
 # Poezio is free software: you can redistribute it and/or modify
-# it under the terms of the MIT license. See the COPYING file.
+# it under the terms of the zlib license. See the COPYING file.
 
 """
 Functions to interact with the keyboard
diff --git a/src/logger.py b/src/logger.py
index 58e04b3b..e8a29a3f 100644
--- a/src/logger.py
+++ b/src/logger.py
@@ -3,7 +3,7 @@
 # This file is part of Poezio.
 #
 # Poezio is free software: you can redistribute it and/or modify
-# it under the terms of the MIT license. See the COPYING file.
+# it under the terms of the zlib license. See the COPYING file.
 
 import sys
 from os import environ, makedirs
diff --git a/src/multiuserchat.py b/src/multiuserchat.py
index 1c226553..10ea0daf 100644
--- a/src/multiuserchat.py
+++ b/src/multiuserchat.py
@@ -3,7 +3,7 @@
 # This file is part of Poezio.
 #
 # Poezio is free software: you can redistribute it and/or modify
-# it under the terms of the MIT license. See the COPYING file.
+# it under the terms of the zlib license. See the COPYING file.
 
 """
 Implementation of the XEP-0045: Multi-User Chat.
diff --git a/src/poezio.py b/src/poezio.py
index 24225c2e..dc877626 100644
--- a/src/poezio.py
+++ b/src/poezio.py
@@ -3,7 +3,7 @@
 # This file is part of Poezio.
 #
 # Poezio is free software: you can redistribute it and/or modify
-# it under the terms of the MIT license. See the COPYING file.
+# it under the terms of the zlib license. See the COPYING file.
 
 
 """
diff --git a/src/pooptmodule.c b/src/pooptmodule.c
index 289313f3..b314d21d 100644
--- a/src/pooptmodule.c
+++ b/src/pooptmodule.c
@@ -3,7 +3,7 @@
 /* This file is part of Poezio. */
 
 /* Poezio is free software: you can redistribute it and/or modify */
-/* it under the terms of the MIT license. See the COPYING file. */
+/* it under the terms of the zlib license. See the COPYING file. */
 
 /** The poopt python3 module
 **/
diff --git a/src/pubsub.py b/src/pubsub.py
index 0066265e..b07b5c85 100644
--- a/src/pubsub.py
+++ b/src/pubsub.py
@@ -3,7 +3,7 @@
 # This file is part of Poezio.
 #
 # Poezio is free software: you can redistribute it and/or modify
-# it under the terms of the MIT license. See the COPYING file.
+# it under the terms of the zlib license. See the COPYING file.
 
 import logging
 log = logging.getLogger(__name__)
diff --git a/src/room.py b/src/room.py
index 1ca3f599..674e2d65 100644
--- a/src/room.py
+++ b/src/room.py
@@ -3,7 +3,7 @@
 # This file is part of Poezio.
 #
 # Poezio is free software: you can redistribute it and/or modify
-# it under the terms of the MIT license. See the COPYING file.
+# it under the terms of the zlib license. See the COPYING file.
 
 from text_buffer import TextBuffer, Message
 from datetime import datetime
diff --git a/src/roster.py b/src/roster.py
index ed9b58f4..fe68584b 100644
--- a/src/roster.py
+++ b/src/roster.py
@@ -3,7 +3,7 @@
 # This file is part of Poezio.
 #
 # Poezio is free software: you can redistribute it and/or modify
-# it under the terms of the MIT license. See the COPYING file.
+# it under the terms of the zlib license. See the COPYING file.
 
 
 """
diff --git a/src/singleton.py b/src/singleton.py
index 66bfc933..9133012b 100644
--- a/src/singleton.py
+++ b/src/singleton.py
@@ -3,7 +3,7 @@
 # This file is part of Poezio.
 #
 # Poezio is free software: you can redistribute it and/or modify
-# it under the terms of the MIT license. See the COPYING file.
+# it under the terms of the zlib license. See the COPYING file.
 
 """
 Defines a Singleton function that initialize an object
diff --git a/src/tabs.py b/src/tabs.py
index c336adcd..dc20b65f 100644
--- a/src/tabs.py
+++ b/src/tabs.py
@@ -3,7 +3,7 @@
 # This file is part of Poezio.
 #
 # Poezio is free software: you can redistribute it and/or modify
-# it under the terms of the MIT license. See the COPYING file.
+# it under the terms of the zlib license. See the COPYING file.
 
 """
 a Tab object is a way to organize various Windows (see windows.py)
diff --git a/src/text_buffer.py b/src/text_buffer.py
index a6465da3..314b9896 100644
--- a/src/text_buffer.py
+++ b/src/text_buffer.py
@@ -1,18 +1,9 @@
-# Copyright 2010-2011 Le Coz Florent <louiz@louiz.org>
+# Copyright 2010-2011 Florent Le Coz <louiz@louiz.org>
 #
 # This file is part of Poezio.
 #
 # Poezio 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 of the License.
-#
-# Poezio 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.
-#
-# You should have received a copy of the GNU General Public License
-# along with Poezio.  If not, see <http://www.gnu.org/licenses/>.
+# it under the terms of the zlib license. See the COPYING file.
 
 """
 Define the TextBuffer class
diff --git a/src/theme.py b/src/theme.py
index e4a92cb3..244d6006 100644
--- a/src/theme.py
+++ b/src/theme.py
@@ -3,7 +3,7 @@
 # This file is part of Poezio.
 #
 # Poezio is free software: you can redistribute it and/or modify
-# it under the terms of the MIT license. See the COPYING file.
+# it under the terms of the zlib license. See the COPYING file.
 
 """
 Define the variables (colors and some other stuff) that are
diff --git a/src/timed_events.py b/src/timed_events.py
index fa6503df..5be2aba2 100644
--- a/src/timed_events.py
+++ b/src/timed_events.py
@@ -3,7 +3,7 @@
 # This file is part of Poezio.
 #
 # Poezio is free software: you can redistribute it and/or modify
-# it under the terms of the MIT license. See the COPYING file.
+# it under the terms of the zlib license. See the COPYING file.
 
 """
 To use these, just use core.add_timed_event(event)
diff --git a/src/user.py b/src/user.py
index e77be817..0fe0bad4 100644
--- a/src/user.py
+++ b/src/user.py
@@ -3,7 +3,7 @@
 # This file is part of Poezio.
 #
 # Poezio is free software: you can redistribute it and/or modify
-# it under the terms of the MIT license. See the COPYING file.
+# it under the terms of the zlib license. See the COPYING file.
 
 """
 Define the user class.
diff --git a/src/windows.py b/src/windows.py
index d2ff0a91..68e5df6a 100644
--- a/src/windows.py
+++ b/src/windows.py
@@ -3,7 +3,7 @@
 # This file is part of Poezio.
 #
 # Poezio is free software: you can redistribute it and/or modify
-# it under the terms of the MIT license. See the COPYING file.
+# it under the terms of the zlib license. See the COPYING file.
 
 """
 Define all the windows.
diff --git a/src/xhtml.py b/src/xhtml.py
index 79c1b82a..f8272e4f 100644
--- a/src/xhtml.py
+++ b/src/xhtml.py
@@ -1,20 +1,9 @@
-#!/usr/bin/env python3
-#
-# Copyright 2010-2011 Le Coz Florent <louiz@louiz.org>
+# Copyright 2010-2011 Florent Le Coz <louiz@louiz.org>
 #
 # This file is part of Poezio.
 #
 # Poezio 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 of the License.
-#
-# Poezio 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.
-#
-# You should have received a copy of the GNU General Public License
-# along with Poezio.  If not, see <http://www.gnu.org/licenses/>.
+# it under the terms of the zlib license. See the COPYING file.
 
 """
 Various methods to convert