Switched to a dual MIT/GPL license

README

@@ -3,3 +3,4 @@ Sozi is a presentation tool using the SVG standard.
 
 Sozi is delivered as an extension for the SVG editor Inkscape.
 
+Installation and licensing details are provided in the doc/ folder.

compress.sh

@@ -1,5 +1,16 @@
 #!/bin/bash
 
+# Sozi - A presentation tool using the SVG standard
+#
+# Copyright (C) 2010-2011 Guillaume Savaton
+#
+# This program is dual licensed under the terms of the MIT license
+# or the GNU General Public License (GPL) version 3.
+# A copy of both licenses is provided in the doc/ folder of the
+# official release of Sozi.
+# 
+# See http://sozi.baierouge.fr/wiki/en:license for details.
+
 JSMIN=`which jsmin`
 YUI1=`which yui-compressor`
 YUI2=`which yuicompressor`

doc/MIT-license.txt

@@ -0,0 +1,21 @@
+Copyright (c) 2011 Guillaume Savaton, http://senshu.baierouge.fr
+
+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:
+
+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, 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.
+

editor/sozi.inx

@@ -2,20 +2,14 @@
 <!--
    Sozi - A presentation tool using the SVG standard
 
-   Copyright (C) 2010 Guillaume Savaton
+   Copyright (C) 2010-2011 Guillaume Savaton
 
-   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, 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.
-
-   You should have received a copy of the GNU General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.
+   This program is dual licensed under the terms of the MIT license
+   or the GNU General Public License (GPL) version 3.
+   A copy of both licenses is provided in the doc/ folder of the
+   official release of Sozi.
+   
+   See http://sozi.baierouge.fr/wiki/en:license for details.
 -->
 <inkscape-extension xmlns="http://www.inkscape.org/namespace/inkscape/extension">
   <_name>Sozi</_name>

editor/sozi.py

@@ -1,22 +1,16 @@
 #!/usr/bin/env python
 
 # Sozi - A presentation tool using the SVG standard
+#
+# Copyright (C) 2010-2011 Guillaume Savaton
+#
+# This program is dual licensed under the terms of the MIT license
+# or the GNU General Public License (GPL) version 3.
+# A copy of both licenses is provided in the doc/ folder of the
+# official release of Sozi.
 # 
-# Copyright (C) 2010 Guillaume Savaton
-# 
-# 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, 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.
-# 
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
+# See http://sozi.baierouge.fr/wiki/en:license for details.
+
 import os
 
 # These lines are only needed if you don't put the script directly into

extras/sozi_extras_addvideo.inx

@@ -2,20 +2,14 @@
 <!--
    Sozi - A presentation tool using the SVG standard
 
-   Copyright (C) 2010 Guillaume Savaton
+   Copyright (C) 2010-2011 Guillaume Savaton
 
-   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, 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.
-
-   You should have received a copy of the GNU General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.
+   This program is dual licensed under the terms of the MIT license
+   or the GNU General Public License (GPL) version 3.
+   A copy of both licenses is provided in the doc/ folder of the
+   official release of Sozi.
+   
+   See http://sozi.baierouge.fr/wiki/en:license for details.
 -->
 <inkscape-extension xmlns="http://www.inkscape.org/namespace/inkscape/extension">
   <_name>Add video</_name>

extras/sozi_extras_addvideo.js

@@ -1,3 +1,15 @@
+/*
+ * Sozi - A presentation tool using the SVG standard
+ *
+ * Copyright (C) 2010-2011 Guillaume Savaton
+ *
+ * This program is dual licensed under the terms of the MIT license
+ * or the GNU General Public License (GPL) version 3.
+ * A copy of both licenses is provided in the doc/ folder of the
+ * official release of Sozi.
+ * 
+ * See http://sozi.baierouge.fr/wiki/en:license for details.
+ */
 
 window.addEventListener("load", function() {
 	var	svgNs = "http://www.w3.org/2000/svg",

extras/sozi_extras_addvideo.py

@@ -1,21 +1,15 @@
 #!/usr/bin/env python
 
 # Sozi - A presentation tool using the SVG standard
+#
+# Copyright (C) 2010-2011 Guillaume Savaton
+#
+# This program is dual licensed under the terms of the MIT license
+# or the GNU General Public License (GPL) version 3.
+# A copy of both licenses is provided in the doc/ folder of the
+# official release of Sozi.
 # 
-# Copyright (C) 2010 Guillaume Savaton
-# 
-# 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, 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.
-# 
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+# See http://sozi.baierouge.fr/wiki/en:license for details.
 
 import os
 

player/animator.js

@@ -1,20 +1,14 @@
 /*
  * Sozi - A presentation tool using the SVG standard
+ *
+ * Copyright (C) 2010-2011 Guillaume Savaton
+ *
+ * This program is dual licensed under the terms of the MIT license
+ * or the GNU General Public License (GPL) version 3.
+ * A copy of both licenses is provided in the doc/ folder of the
+ * official release of Sozi.
  * 
- * Copyright (C) 2010 Guillaume Savaton
- * 
- * 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, 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.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * See http://sozi.baierouge.fr/wiki/en:license for details.
  */
 
 /*jslint plusplus: false, indent: 3, browser: true */

player/common.js

@@ -1,20 +1,14 @@
 /*
  * Sozi - A presentation tool using the SVG standard
+ *
+ * Copyright (C) 2010-2011 Guillaume Savaton
+ *
+ * This program is dual licensed under the terms of the MIT license
+ * or the GNU General Public License (GPL) version 3.
+ * A copy of both licenses is provided in the doc/ folder of the
+ * official release of Sozi.
  * 
- * Copyright (C) 2010 Guillaume Savaton
- * 
- * 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, 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.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * See http://sozi.baierouge.fr/wiki/en:license for details.
  */
 
 /*jslint plusplus: false, indent: 3, browser: true */

player/display.js

@@ -1,20 +1,14 @@
 /*
  * Sozi - A presentation tool using the SVG standard
+ *
+ * Copyright (C) 2010-2011 Guillaume Savaton
+ *
+ * This program is dual licensed under the terms of the MIT license
+ * or the GNU General Public License (GPL) version 3.
+ * A copy of both licenses is provided in the doc/ folder of the
+ * official release of Sozi.
  * 
- * Copyright (C) 2010 Guillaume Savaton
- * 
- * 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, 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.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * See http://sozi.baierouge.fr/wiki/en:license for details.
  */
 
 /*jslint plusplus: false, indent: 3, browser: true */

player/player.js

@@ -1,20 +1,14 @@
 /*
  * Sozi - A presentation tool using the SVG standard
+ *
+ * Copyright (C) 2010-2011 Guillaume Savaton
+ *
+ * This program is dual licensed under the terms of the MIT license
+ * or the GNU General Public License (GPL) version 3.
+ * A copy of both licenses is provided in the doc/ folder of the
+ * official release of Sozi.
  * 
- * Copyright (C) 2010 Guillaume Savaton
- * 
- * 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, 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.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * See http://sozi.baierouge.fr/wiki/en:license for details.
  */
 
 /*jslint plusplus: false, indent: 3, browser: true */

player/sozi.css

@@ -1,3 +1,15 @@
+/*
+ * Sozi - A presentation tool using the SVG standard
+ *
+ * Copyright (C) 2010-2011 Guillaume Savaton
+ *
+ * This program is dual licensed under the terms of the MIT license
+ * or the GNU General Public License (GPL) version 3.
+ * A copy of both licenses is provided in the doc/ folder of the
+ * official release of Sozi.
+ * 
+ * See http://sozi.baierouge.fr/wiki/en:license for details.
+ */
 
 #sozi-toc text {
    fill: #eff;

release.sh

@@ -1,5 +1,16 @@
 #!/bin/bash
 
+# Sozi - A presentation tool using the SVG standard
+#
+# Copyright (C) 2010-2011 Guillaume Savaton
+#
+# This program is dual licensed under the terms of the MIT license
+# or the GNU General Public License (GPL) version 3.
+# A copy of both licenses is provided in the doc/ folder of the
+# official release of Sozi.
+# 
+# See http://sozi.baierouge.fr/wiki/en:license for details.
+
 VERSION=`date +%y.%m-%d%H%M%S`
 SOURCE='README doc/install*.html doc/LICENSE editor/sozi.inx editor/sozi.py extras/sozi_extras_addvideo.inx extras/sozi_extras_addvideo.py'
 TARGET=sozi-release-$VERSION.zip