From a66282f40d37ea688f429452fd64ed0c93627c45 Mon Sep 17 00:00:00 2001 From: Wouter Scherphof Date: Fri, 6 Dec 2013 14:31:49 +0100 Subject: [PATCH 1/5] LGPL --- README.md | 2 +- doc/LICENSE | 17 ++++++++++++----- 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index 9014980..fa4bf5d 100644 --- a/README.md +++ b/README.md @@ -100,4 +100,4 @@ See `./doc/sample.lua` See `./tst/init.lua` ##License -MIT; see `./doc/LICENSE` +LGPL+; see `./doc/LICENSE` diff --git a/doc/LICENSE b/doc/LICENSE index c52c7f7..c40243b 100644 --- a/doc/LICENSE +++ b/doc/LICENSE @@ -1,9 +1,16 @@ -(The MIT license) +[GNU Lesser General Public License (LGPL)](http://www.gnu.org/licenses/lgpl-3.0.txt) -Copyright (c) 2013, Wouter Scherphof (wouter.scherphof@gmail.com) +And, as an exception to the LGPL: -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: +You are permitted to include a version of this library in your application, +without complying with section 4. d) 0) of LGPL 3.0 +(requiring recipients of your application to be able to relink against +modified versions of the library). -The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. +This permission is granted if and ONLY if the resulting application binary +issue is intended for execution in any one of the following environments: -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. \ No newline at end of file + * Apple Inc. iOS + +Additional environments may be added to this list in the future. +All other terms of the LGPL continue to apply. From 773ff4375d252d3df8084673a9709ba56e5a9cc7 Mon Sep 17 00:00:00 2001 From: Wouter Scherphof Date: Fri, 6 Dec 2013 14:33:14 +0100 Subject: [PATCH 2/5] v0.2 --- htmlparser-0.2-1.rockspec | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) create mode 100644 htmlparser-0.2-1.rockspec diff --git a/htmlparser-0.2-1.rockspec b/htmlparser-0.2-1.rockspec new file mode 100644 index 0000000..d602559 --- /dev/null +++ b/htmlparser-0.2-1.rockspec @@ -0,0 +1,28 @@ +package = "htmlparser" +version = "0.2-1" +source = { + url = "git://github.com/wscherphof/lua-htmlparser.git", + branch = "v0.2" +} +description = { + summary = "Parse HTML text into a tree of elements with selectors", + detailed = [[ + Call parse() to build up a tree of element nodes. Each node in the tree, including the root node that is returned by parse(), supports a basic set of jQuery-like selectors. Or you could walk the tree by hand. + ]], + homepage = "http://wscherphof.github.io/lua-htmlparser/", + license = "MIT" +} +dependencies = { + "lua >= 5.2", + "set >= 0.1", + "lunitx >= 0.6" +} +build = { + type = "builtin", + copy_directories = {"doc", "tst"}, + modules = { + htmlparser = "src/htmlparser.lua", + ["htmlparser.ElementNode"] = "src/htmlparser/ElementNode.lua", + ["htmlparser.voidelements"] = "src/htmlparser/voidelements.lua" + } +} \ No newline at end of file From e80948da9cde273e639d7ee9ac491b23d328bcc4 Mon Sep 17 00:00:00 2001 From: Wouter Scherphof Date: Fri, 6 Dec 2013 14:33:34 +0100 Subject: [PATCH 3/5] LGPL --- htmlparser-0.2-1.rockspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htmlparser-0.2-1.rockspec b/htmlparser-0.2-1.rockspec index d602559..36ab18a 100644 --- a/htmlparser-0.2-1.rockspec +++ b/htmlparser-0.2-1.rockspec @@ -10,7 +10,7 @@ description = { Call parse() to build up a tree of element nodes. Each node in the tree, including the root node that is returned by parse(), supports a basic set of jQuery-like selectors. Or you could walk the tree by hand. ]], homepage = "http://wscherphof.github.io/lua-htmlparser/", - license = "MIT" + license = "LGPL+" } dependencies = { "lua >= 5.2", From 23a19e3e4ecc8b39223124fa9c27b804b66457fb Mon Sep 17 00:00:00 2001 From: Wouter Scherphof Date: Fri, 6 Dec 2013 14:34:04 +0100 Subject: [PATCH 4/5] Set 0.2 (!) --- htmlparser-0.2-1.rockspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htmlparser-0.2-1.rockspec b/htmlparser-0.2-1.rockspec index 36ab18a..279920f 100644 --- a/htmlparser-0.2-1.rockspec +++ b/htmlparser-0.2-1.rockspec @@ -14,7 +14,7 @@ description = { } dependencies = { "lua >= 5.2", - "set >= 0.1", + "set >= 0.2", "lunitx >= 0.6" } build = { From eda892de333b08cd0dd36001a32536ff3cb548ac Mon Sep 17 00:00:00 2001 From: Wouter Scherphof Date: Fri, 6 Dec 2013 14:37:30 +0100 Subject: [PATCH 5/5] ending w/ newline --- htmlparser-0.2-1.rockspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htmlparser-0.2-1.rockspec b/htmlparser-0.2-1.rockspec index 279920f..39da275 100644 --- a/htmlparser-0.2-1.rockspec +++ b/htmlparser-0.2-1.rockspec @@ -25,4 +25,4 @@ build = { ["htmlparser.ElementNode"] = "src/htmlparser/ElementNode.lua", ["htmlparser.voidelements"] = "src/htmlparser/voidelements.lua" } -} \ No newline at end of file +}