Skip to content

Commit

Permalink
Update license from LGPL to MIT
Browse files Browse the repository at this point in the history
Closes GH-6.
  • Loading branch information
wooorm committed Oct 23, 2014
1 parent 8caa10b commit 3588883
Show file tree
Hide file tree
Showing 6 changed files with 33 additions and 51 deletions.
26 changes: 25 additions & 1 deletion LICENSE
Original file line number Diff line number Diff line change
@@ -1 +1,25 @@
LGPL
(The MIT License)

Copyright (c) 2014 Titus Wormer <[email protected]>
Copyright (c) 2008 Kent S Johnson
Copyright (c) 2006 Jacob R Rideout <[email protected]>
Copyright (c) 2004 Maciej Ceglowski

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.
6 changes: 5 additions & 1 deletion Readme.md
Original file line number Diff line number Diff line change
Expand Up @@ -112,6 +112,10 @@ On a MacBook Air, it runs 175 paragraphs 2 times per second (total: 350 op/s).

(I’ll work on a better benchmark soon)

## Derivation

Franc is a derivative work from [guess-language](http://code.google.com/p/guess-language/) (Python, LGPL), [guesslanguage](http://websvn.kde.org/branches/work/sonnet-refactoring/common/nlp/guesslanguage.cpp?view=markup) (C++, LGPL), and [Language::Guess](http://web.archive.org/web/20090228163219/http://languid.cantbedone.org/) (Perl, GPL). Their creators granted me the rights to distribute franc under the MIT license: respectively, [Maciej Ceglowski](https://github.com/wooorm/franc/issues/6#issuecomment-59669191), [Jacob R. Rideout](https://github.com/wooorm/franc/issues/6#issuecomment-60196819), and [Kent S. Johnson](https://github.com/wooorm/franc/issues/6#issuecomment-59936827).

## License

LGPL © Titus Wormer
MIT © Titus Wormer
2 changes: 1 addition & 1 deletion bower.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"name": "franc",
"main": "index.js",
"description": "Detect the language of text",
"license": "LGPL",
"license": "MIT",
"keywords": [
"natural",
"language",
Expand Down
2 changes: 1 addition & 1 deletion component.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"name": "franc",
"version": "0.3.0",
"description": "Detect the language of text",
"license": "LGPL",
"license": "MIT",
"keywords": [
"natural",
"language",
Expand Down
46 changes: 0 additions & 46 deletions lib/franc.js
Original file line number Diff line number Diff line change
@@ -1,49 +1,3 @@
/**
* Franc:
*
* Copyright (c) 2014 Titus Wormer <[email protected]>
* https://github.com/wooorm/franc/
*
* Original Python package:
*
* Copyright (c) 2008, Kent S Johnson
* http://code.google.com/p/guess-language/
*
* Original C++ version for KDE:
*
* Copyright (c) 2006 Jacob R Rideout <[email protected]>
* http://websvn.kde.org/branches/work/sonnet-refactoring/
* common/nlp/guesslanguage.cpp?view=markup
*
* Original Language::Guess Perl module:
*
* Copyright (c) 2004-2006 Maciej Ceglowski
* http://web.archive.org/web/20090228163219/http://
* languid.cantbedone.org/
*
* Note: Language::Guess is GPL-licensed. KDE developers
* received permission from the author to distribute
* their port under LGPL:
*
* http://lists.kde.org/?l=kde-sonnet&m=116910092228811&w=2
*
* 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 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 Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser
* General Public License along with this program. If
* not, see <http://www.gnu.org/licenses/>.
*/

'use strict';

var data,
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"name": "franc",
"version": "0.3.0",
"description": "Detect the language of text",
"license": "LGPL",
"license": "MIT",
"keywords": [
"natural",
"language",
Expand Down

0 comments on commit 3588883

Please sign in to comment.