summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Pitt <martin.pitt@ubuntu.com>2010-04-12 16:59:21 +0200
committerMartin Pitt <martin.pitt@ubuntu.com>2010-04-12 16:59:21 +0200
commit9084213940627e20ca255efc0c6ed1cd7268abd1 (patch)
treea54c03f14035dadb99ff92d0d4248b29985217f0
parenta3f0eeb052136584a5069d7ce3980fcdaf76eb92 (diff)
Dual-license fdi2mpi.py under X11, too
As per request from Dan Nicholson <dbn.lists@gmail.com>
-rwxr-xr-xtools/fdi2mpi.py23
1 files changed, 22 insertions, 1 deletions
diff --git a/tools/fdi2mpi.py b/tools/fdi2mpi.py
index 110adb1..c670686 100755
--- a/tools/fdi2mpi.py
+++ b/tools/fdi2mpi.py
@@ -10,7 +10,7 @@
# the Free Software Foundation; either version 2 of the License, or
# (at your option) any later version.
#
-# keymap is distributed in the hope that it will be useful, but
+# 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.
@@ -18,6 +18,27 @@
# You should have received a copy of the GNU General Public License
# along with keymap; if not, write to the Free Software Foundation,
# Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+#
+#
+# Alternatively this script can be distributed under the X11 license:
+#
+# 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 fur-
+# nished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FIT-
+# NESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# XFREE86 PROJECT BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+# IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CON-
+# NECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
import sys, os.path, xml.dom.minidom