You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@calcite.apache.org by jh...@apache.org on 2015/09/13 09:08:25 UTC
incubator-calcite git commit: [CALCITE-860] Correct LICENSE file for
generated web site
Repository: incubator-calcite
Updated Branches:
refs/heads/master ad4bdca33 -> 6c81b869d
[CALCITE-860] Correct LICENSE file for generated web site
Project: http://git-wip-us.apache.org/repos/asf/incubator-calcite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-calcite/commit/6c81b869
Tree: http://git-wip-us.apache.org/repos/asf/incubator-calcite/tree/6c81b869
Diff: http://git-wip-us.apache.org/repos/asf/incubator-calcite/diff/6c81b869
Branch: refs/heads/master
Commit: 6c81b869de56423aaef3ed276ebdf0a692711c26
Parents: ad4bdca
Author: Julian Hyde <jh...@apache.org>
Authored: Sat Sep 12 23:44:45 2015 -0700
Committer: Julian Hyde <jh...@apache.org>
Committed: Sat Sep 12 23:44:45 2015 -0700
----------------------------------------------------------------------
LICENSE | 42 ++++++++++++++++++++++++++++++++++++------
1 file changed, 36 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-calcite/blob/6c81b869/LICENSE
----------------------------------------------------------------------
diff --git a/LICENSE b/LICENSE
index 5d678e8..f7b9863 100644
--- a/LICENSE
+++ b/LICENSE
@@ -205,6 +205,7 @@
+-----------------------------------------------------------------------
APACHE CALCITE SUBCOMPONENTS:
@@ -213,11 +214,30 @@ notices and license terms. Your use of the source code for the these
subcomponents is subject to the terms and conditions of the following
licenses.
-For parts of the site:
-
-The MIT License (MIT)
-
-Copyright (c) 2008-2015 Tom Preston-Werner
+-----------------------------------------------------------------------
+ The MIT License
+-----------------------------------------------------------------------
+
+The Apache Calcite project bundles the following files under the MIT License:
+
+- site
+ Parts of the web site generated by Jekyll (http://jekyllrb.com/)
+ Copyright (c) 2008-2015 Tom Preston-Werner
+- site/_sass/_font-awesome.scss
+ Font-awesome css files v4.1.0 (http://fortawesome.github.io/Font-Awesome/)
+ Copyright (c) 2013 Dave Gandy
+- site/_sass/_normalize.scss
+ normalize.css v3.0.2 | git.io/normalize
+ Copyright (c) Nicolas Gallagher and Jonathan Neal
+- site/_sass/_gridism.scss
+ Gridism: A simple, responsive, and handy CSS grid by @cobyism
+ https://github.com/cobyism/gridism
+ Copyright (c) 2013 Coby Chapple
+- site/js/html5shiv.min.js
+ HTML5 Shiv 3.7.2 | @afarkas @jdalton @jon_neal @rem
+- site/js/respond.min.js
+ Respond.js v1.4.2: min/max-width media query polyfill
+ Copyright 2013 Scott Jehl
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
@@ -235,4 +255,14 @@ 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
+SOFTWARE.
+
+-----------------------------------------------------------------------
+ The Open Font License
+-----------------------------------------------------------------------
+
+The Apache Calcite project bundles the following fonts under the
+SIL Open Font License (OFL) - http://scripts.sil.org/OFL/
+
+- site/fonts/fontawesome-webfont.*
+ Font-awesome font files v4.0.3 (http://fortawesome.github.io/Font-Awesome/)