summaryrefslogtreecommitdiff
path: root/dbus/bus.py
diff options
context:
space:
mode:
authorSimon McVittie <simon.mcvittie@collabora.co.uk>2007-09-27 13:57:49 +0100
committerSimon McVittie <simon.mcvittie@collabora.co.uk>2007-09-27 13:57:49 +0100
commitd8c154284ca464f493c81a4d3b5a37890d68acec (patch)
treef26e806b7211217e0d399f2ca780529ba42e19d1 /dbus/bus.py
parent003204b6a58faad7bc937ba029a99204cfa417e1 (diff)
downloaddbus-python-d8c154284ca464f493c81a4d3b5a37890d68acec.tar.gz
Relicense Collabora code under the MIT/X11 license proposed for dbus core, removing all references to the LGPL as a result
Diffstat (limited to 'dbus/bus.py')
-rw-r--r--dbus/bus.py30
1 files changed, 17 insertions, 13 deletions
diff --git a/dbus/bus.py b/dbus/bus.py
index 553a4a9..edd5ef7 100644
--- a/dbus/bus.py
+++ b/dbus/bus.py
@@ -1,20 +1,24 @@
# Copyright (C) 2007 Collabora Ltd. <http://www.collabora.co.uk/>
#
-# Licensed under the Academic Free License version 2.1
+# 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 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 2.1 of the License, or
-# (at your option) any later version.
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
#
-# 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.
-#
-# 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
+# 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.
__all__ = ('BusConnection',)
__docformat__ = 'reStructuredText'