incubator-callback-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pmue...@apache.org
Subject weinre commit: updates to LICENSE
Date Wed, 29 Feb 2012 16:00:03 GMT
Updated Branches:
  refs/heads/master f4a798cfb -> 2598e97f6


updates to LICENSE

bug: https://issues.apache.org/jira/browse/CB-100
     fix issues regarding pre-req licenses for weinre distribution

Fixed LICENSE per comments in the bug.

Also, drive-by fixes for some image cruft in the docs.


Project: http://git-wip-us.apache.org/repos/asf/incubator-cordova-weinre/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-cordova-weinre/commit/2598e97f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cordova-weinre/tree/2598e97f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cordova-weinre/diff/2598e97f

Branch: refs/heads/master
Commit: 2598e97f6db7a6d6dc2d667fbaf0045faf705e54
Parents: f4a798c
Author: Patrick Mueller <pmuellr@apache.org>
Authored: Wed Feb 29 10:57:59 2012 -0500
Committer: Patrick Mueller <pmuellr@apache.org>
Committed: Wed Feb 29 10:57:59 2012 -0500

----------------------------------------------------------------------
 LICENSE                     |   53 ++++++++++++++++++++++++-------------
 weinre.build/build.xml      |    2 +
 weinre.doc/images/shell.png |  Bin 63942 -> 0 bytes
 3 files changed, 36 insertions(+), 19 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-cordova-weinre/blob/2598e97f/LICENSE
----------------------------------------------------------------------
diff --git a/LICENSE b/LICENSE
index 8d776b4..116d2b9 100644
--- a/LICENSE
+++ b/LICENSE
@@ -207,23 +207,46 @@ This product also include the following software:
 
 ------------------------------------------
 WebKit Web Inspector
-Copyright multiple authors
+http://webkit.org
 ------------------------------------------
 
+Copyright (C) 2006, 2007, 2008, 2009, 2010 Apple Inc.  All rights reserved.
+Copyright (C) 2007, 2008 Matt Lilek (pe...@gmail.com).
+Copyright (C) 2008, 2009 Anthony Ricaud <ri...@webkit.org>
+Copyright (C) 2008 Nokia Inc.  All rights reserved.
+Copyright (C) 2009 IBM Corp. All rights reserved.
+Copyright (C) 2009, 2010, 2011 Google Inc. All rights reserved.
+Copyright (C) 2009, 2010 Joseph Pecoraro
+Copyright (C) 2009 280 North Inc. All Rights Reserved.
+Copyright (C) 2010 Nikita Vasilyev. All rights reserved.
+
 Note that although WebKit in general contains both BSD and LGPL
 licensed code, the WebKit Web Inspector code is all BSD licensed
 with no LGPL code.  
 
-WebKit is available at
+The wording of the license comments in the source files is not consistent,
+but corresponds to traditional BSD licenses. The license in some files also 
+include one of the following conditions:
+
+* Neither the name of Google Inc. nor the names of its
+  contributors may be used to endorse or promote products derived from
+  this software without specific prior written permission.
 
-    http://www.webkit.org/
+* Neither the name of Apple Computer, Inc. ("Apple") nor the names of
+  its contributors may be used to endorse or promote products derived
+  from this software without specific prior written permission.
 
+* Neither the name of IBM Corp. nor the names of its
+  contributors may be used to endorse or promote products derived from
+  this software without specific prior written permission.
 
 ------------------------------------------
-Uglify is shipped with WebKit Web Inspector
-Copyright Mihai Bazon
+UglifyJS
+https://github.com/mishoo/UglifyJS
 ------------------------------------------
 
+Note that UglifyJS is shipped with WebKit Web Inspector.
+
                          Author: Mihai Bazon
                        <mihai.bazon@gmail.com>
                      http://mihai.bazon.net/blog
@@ -261,7 +284,6 @@ SUCH DAMAGE.
 
 ------------------------------------------
 coffee-script 1.2.0 via npmjs.org
-
 https://github.com/jashkenas/coffee-script
 ------------------------------------------
 
@@ -290,7 +312,6 @@ OTHER DEALINGS IN THE SOFTWARE.
 
 ------------------------------------------
 express 2.5.7 via npmjs.org
-
 https://github.com/visionmedia/express
 ------------------------------------------
 
@@ -319,7 +340,6 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 ------------------------------------------
 connect 1.8.5 via npmjs.org
-
 https://github.com/senchalabs/connect
 ------------------------------------------
 
@@ -349,16 +369,16 @@ TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
 SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 ------------------------------------------
-formidable 1.0.8 via npmjs.org
-
+formidable 1.0.9 via npmjs.org
 https://github.com/felixge/node-formidable
 ------------------------------------------
 
-Formidable is licensed under the MIT license.
+According to the Readme.md file in the Formidable library:
 
-------------------------------------------
-mime 1.2.4 via npmjs.org
+   "Formidable is licensed under the MIT license."
 
+------------------------------------------
+mime 1.2.5 via npmjs.org
 https://github.com/bentomas/node-mime
 ------------------------------------------
 
@@ -384,7 +404,6 @@ THE SOFTWARE.
 
 ------------------------------------------
 mkdirp 0.0.7 via npmjs.org
-
 https://github.com/substack/node-mkdirp
 ------------------------------------------
 
@@ -411,8 +430,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
IN
 THE SOFTWARE.
 
 ------------------------------------------
-qs 0.4.1 via npmjs.org
-
+qs 0.4.2 via npmjs.org
 https://github.com/visionmedia/node-querystring
 ------------------------------------------
 
@@ -441,7 +459,6 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 ------------------------------------------
 nopt 1.0.10 via npmjs.org
-
 https://github.com/isaacs/nopt
 ------------------------------------------
 
@@ -471,7 +488,6 @@ OTHER DEALINGS IN THE SOFTWARE.
 
 ------------------------------------------
 abbrev 1.0.3 via npmjs.org
-
 https://github.com/isaacs/abbrev-js
 ------------------------------------------
 
@@ -501,7 +517,6 @@ OTHER DEALINGS IN THE SOFTWARE.
 
 ------------------------------------------
 underscore 1.3.1 via npmjs.org
-
 https://github.com/documentcloud/underscore
 ------------------------------------------
 

http://git-wip-us.apache.org/repos/asf/incubator-cordova-weinre/blob/2598e97f/weinre.build/build.xml
----------------------------------------------------------------------
diff --git a/weinre.build/build.xml b/weinre.build/build.xml
index ce07ac3..f5305c3 100644
--- a/weinre.build/build.xml
+++ b/weinre.build/build.xml
@@ -261,6 +261,8 @@
         <copy todir="${WEB}/doc/images">  <fileset dir="../${PROJECT_DOC}/images"/>
 </copy>
         <copy todir="${WEB}/doc/scripts"> <fileset dir="../${PROJECT_DOC}/scripts"/>
</copy>
 
+        <delete dir="${WEB}/doc/images/orig" />
+
     </target>
 
     <!-- ============================================================

http://git-wip-us.apache.org/repos/asf/incubator-cordova-weinre/blob/2598e97f/weinre.doc/images/shell.png
----------------------------------------------------------------------
diff --git a/weinre.doc/images/shell.png b/weinre.doc/images/shell.png
deleted file mode 100644
index d43f51c..0000000
Binary files a/weinre.doc/images/shell.png and /dev/null differ


Mime
View raw message