You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by ar...@apache.org on 2012/09/24 04:59:18 UTC
svn commit: r1389189 [1/2] - in /incubator/ooo/trunk/main: LICENSE
LICENSE_category_b
Author: arielch
Date: Mon Sep 24 02:59:18 2012
New Revision: 1389189
URL: http://svn.apache.org/viewvc?rev=1389189&view=rev
Log:
Fix license encoding
Convert to UTF-8 encoding, fix line endings mixed up while copying and
pasting licenses.
Modified:
incubator/ooo/trunk/main/LICENSE
incubator/ooo/trunk/main/LICENSE_category_b
Modified: incubator/ooo/trunk/main/LICENSE
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/LICENSE?rev=1389189&r1=1389188&r2=1389189&view=diff
==============================================================================
--- incubator/ooo/trunk/main/LICENSE (original)
+++ incubator/ooo/trunk/main/LICENSE Mon Sep 24 02:59:18 2012
@@ -257,9 +257,9 @@ ____
For main/MathMLDTD/math.dtd:
- W3C license
-W3C® SOFTWARE NOTICE AND LICENSE
+W3C® SOFTWARE NOTICE AND LICENSE
-Copyright © 1994-2001 World Wide Web Consortium, (Massachusetts Institute of
+Copyright © 1994-2001 World Wide Web Consortium, (Massachusetts Institute of
Technology, Institut National de Recherche en Informatique et en Automatique,
Keio University). All Rights Reserved. http://www.w3.org/Consortium/Legal/
@@ -279,7 +279,7 @@ modifications, that you make:
Any pre-existing intellectual property disclaimers, notices, or terms and
conditions. If none exist, a short notice of the following form (hypertext
is preferred, text is permitted) should be used within the body of any
- redistributed or derivative code: "Copyright © [$date-of-software] World
+ redistributed or derivative code: "Copyright © [$date-of-software] World
Wide Web Consortium, (Massachusetts Institute of Technology, Institut
National de Recherche en Informatique et en Automatique, Keio University).
All Rights Reserved. http://www.w3.org/Consortium/Legal/"
@@ -651,14 +651,14 @@ Copyright (C) 1997 TWAIN Working Group:
Fujitsu, Genoa Technology, Hewlett-Packard, Kofax Imaging Products, and
Ricoh Corporation. All rights reserved.
-Copyright © 1998 TWAIN Working Group: Adobe Systems Incorporated,
+Copyright © 1998 TWAIN Working Group: Adobe Systems Incorporated,
Canon Information Systems, Eastman Kodak Company,
Fujitsu Computer Products of America, Genoa Technology,
Hewlett-Packard Company, Intel Corporation, Kofax Image Products,
JFL Peripheral Solutions Inc., Ricoh Corporation, and Xerox Corporation.
All rights reserved.
-Copyright © 2000 TWAIN Working Group: Adobe Systems Incorporated,
+Copyright © 2000 TWAIN Working Group: Adobe Systems Incorporated,
Canon Information Systems, Digimarc Corporation, Eastman Kodak Company,
Fujitsu Computer Products of America, Hewlett-Packard Company,
JFL Peripheral Solutions Inc., Ricoh Corporation, and Xerox Corporation.
@@ -812,7 +812,7 @@ For main/ucb/source/ucp/odma/odma.h:
ODMA 2.0 SPECIFICATIONS AND SOFTWARE
-----------------------------------
- Copyright © 1994-1998 AIIM International
+ Copyright © 1994-1998 AIIM International
LICENSE:
@@ -862,7 +862,7 @@ For main/x11_extensions/inc/Xrender.h,
main/x11_extensions/inc/renderproto.h:
- license equal to MIT license
-Copyright © 2000 SuSE, Inc.
+Copyright © 2000 SuSE, Inc.
Permission to use, copy, modify, distribute, and sell this software and its
documentation for any purpose is hereby granted without fee, provided that
@@ -890,8 +890,8 @@ For main/x11_extensions/inc/Xrandr.h,
main/x11_extensions/inc/randrproto.h
- license equal to MIT license
-Copyright © 2000 Compaq Computer Corporation, Inc.
-Copyright © 2002 Hewlett-Packard Company, Inc.
+Copyright © 2000 Compaq Computer Corporation, Inc.
+Copyright © 2002 Hewlett-Packard Company, Inc.
Permission to use, copy, modify, distribute, and sell this software and its
documentation for any purpose is hereby granted without fee, provided that
@@ -1966,50 +1966,50 @@ ____
For XSLT MathML Library 2.1.2 - built in main/xsltml/:
- MIT license
-Copyright
----------
-
-Copyright (C) 2001-2003 Vasil Yaroshevich
-
-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.
-
-Except as contained in this notice, the names of individuals
-credited with contribution to this software shall not be used in
-advertising or otherwise to promote the sale, use or other
-dealings in this Software without prior written authorization
-from the individuals in question.
-
-Any stylesheet derived from this Software that is publically
-distributed will be identified with a different name and the
-version strings in any derived Software will be changed so that
-no possibility of confusion between the derived package and this
-Software will exist.
-
-Warranty
---------
-
-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 NORMAN WALSH OR ANY OTHER
-CONTRIBUTOR 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.
-
-Contacting the Author
----------------------
-
+Copyright
+---------
+
+Copyright (C) 2001-2003 Vasil Yaroshevich
+
+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.
+
+Except as contained in this notice, the names of individuals
+credited with contribution to this software shall not be used in
+advertising or otherwise to promote the sale, use or other
+dealings in this Software without prior written authorization
+from the individuals in question.
+
+Any stylesheet derived from this Software that is publically
+distributed will be identified with a different name and the
+version strings in any derived Software will be changed so that
+no possibility of confusion between the derived package and this
+Software will exist.
+
+Warranty
+--------
+
+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 NORMAN WALSH OR ANY OTHER
+CONTRIBUTOR 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.
+
+Contacting the Author
+---------------------
+
These stylesheets are maintained by Vasil Yaroshevich, <ya...@raleigh.ru>.
____