Merge pull request versae#15 from jezdez/master

Update license to MIT. Thanks to @jezdez
bocribbz · Jun 21, 2012 · 558c35b · 558c35b
2 parents 323c6dc + e6612d1
commit 558c35b
Show file tree

Hide file tree

Showing 6 changed files with 24 additions and 20 deletions.
diff --git a/AUTHORS.txt b/AUTHORS.txt
@@ -9,6 +9,7 @@ APPRECIATED CONTRIBUTORS:
     * Patrick Taylor <patricktaylor@mac.com> for reporting problems with the license.
     * Sebastián Magrí <sebasmagri@gmail.com> for reporting bugs.
     * Fidel Ramos <fidelramos@gmail.com> for compatibility code with Django 1.3 static files: https://github.com/versae/qbe/pull/11
+    * Olivier Larchevêque <olivier.larcheveque@gmail.com> for added a basis French translation.
 
 And a big THANK YOU goes to:
 

diff --git a/CHANGES.txt b/CHANGES.txt
@@ -17,6 +17,8 @@
 
 - Fixed packaging manifest template.
 
+- Changed license to MIT.
+
 0.1.6 (2011-04-20)
 ------------------
  - Added compatibility with Django 1.3 static files.

diff --git a/LICENSE-AGPL-ADDITIONAL.txt b/LICENSE-AGPL-ADDITIONAL.txt
diff --git a/LICENSE-AGPL.txt b/LICENSE-AGPL.txt
diff --git a/LICENSE.txt b/LICENSE.txt
@@ -0,0 +1,20 @@
+Copyright (C) 2010-2012 Javier de la Rosa and individual contributors
+
+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.
diff --git a/MANIFEST.in b/MANIFEST.in
@@ -1,7 +1,6 @@
 include AUTHORS.txt
 include CHANGES.txt
-include LICENSE-AGPL-ADDITIONAL.txt
-include LICENSE-AGPL.txt
+include LICENSE.txt
 include MANIFEST.in
 include README.rst
 recursive-include django_qbe/templates *