Permalink
Browse files

Merge pull request #15 from jezdez/master

Update license to MIT.
Thanks to @jezdez
  • Loading branch information...
2 parents 323c6dc + e6612d1 commit 558c35b69cdf3f4f96d418eb179891bc16ff1c44 @versae committed Jun 21, 2012
Showing with 24 additions and 20 deletions.
  1. +1 −0 AUTHORS.txt
  2. +2 −0 CHANGES.txt
  3. +0 −3 LICENSE-AGPL-ADDITIONAL.txt
  4. +0 −15 LICENSE-AGPL.txt
  5. +20 −0 LICENSE.txt
  6. +1 −2 MANIFEST.in
View
@@ -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:
View
@@ -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.
@@ -1,3 +0,0 @@
-Additional permission under GNU GPL version 3 section 7 allows the use of
-django-qbe as part of a project while retaining the requirement to contribute
-back any changes or improvements to django-qbe.
View
@@ -1,15 +0,0 @@
-django-qbe is a Django implementantion for Query By Example proposal by IBM®.
-Copyright (C) 2011, Javier de la Rosa <versae@gmail.com>
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU Affero 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 Affero General Public License for more details.
-
-You should have received a copy of the GNU Affero General Public License
-along with this program. If not, see <http://www.gnu.org/licenses/>.
View
@@ -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.
View
@@ -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 *

0 comments on commit 558c35b

Please sign in to comment.