diff options
author | Andras Timar <atimar@suse.com> | 2012-11-11 18:24:14 +0100 |
---|---|---|
committer | Andras Timar <atimar@suse.com> | 2012-11-11 18:24:14 +0100 |
commit | 06ec1c089519ef3249464aa09eadf03a8db93a39 (patch) | |
tree | 85b2eb6d8ba6ca95e18e1ff82151224cb14106f6 /readlicense_oo | |
parent | Add some check to renewpo (diff) | |
parent | oox: ZipStorage: better exception tracing (diff) | |
download | core-06ec1c089519ef3249464aa09eadf03a8db93a39.tar.gz core-06ec1c089519ef3249464aa09eadf03a8db93a39.zip |
Merge branch 'master' into feature/killsdf
Conflicts:
Repository.mk
RepositoryFixes.mk
connectivity/prj/build.lst
extensions/prj/build.lst
filter/prj/build.lst
fpicker/prj/build.lst
l10ntools/StaticLibrary_transex.mk
saxon/build.xml
shell/prj/build.lst
solenv/gbuild/AllLangResTarget.mk
solenv/gbuild/Configuration.mk
solenv/gbuild/UI.mk
ucb/source/ucp/webdav/webdavcontent.cxx
Diffstat (limited to 'readlicense_oo')
-rw-r--r-- | readlicense_oo/html/LICENSE.html | 116 | ||||
-rw-r--r-- | readlicense_oo/odt/LICENSE.odt | bin | 139824 -> 138052 bytes | |||
-rw-r--r-- | readlicense_oo/txt/NOTICE | 5 | ||||
-rw-r--r-- | readlicense_oo/txt/license.txt | 91 |
4 files changed, 12 insertions, 200 deletions
diff --git a/readlicense_oo/html/LICENSE.html b/readlicense_oo/html/LICENSE.html index 7753ed92fddc..d99e195e722f 100644 --- a/readlicense_oo/html/LICENSE.html +++ b/readlicense_oo/html/LICENSE.html @@ -542,70 +542,6 @@ latest development version and read online documentation.</P> can also contact us individually at:</P> <P CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm">David Turner<BR>Robert Wilhelm<BR>Werner Lemberg</P> -<H2 CLASS="western">gdk-pixbuf</H2> -<P CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm">The -following software may be included in this product: gdk-pixbuf. Use -of any of this software is governed by the terms of the license -below:</P> -<P CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm">© -Free Software Foundation, Inc.</P> -<P CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm">This -library is free software; you can redistribute it and/or modify it -under the terms of the GNU Library General Public License as -published by the Free Software Foundation; either version 2 of the -License, or (at your option) any later version. -</P> -<P CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"><A HREF="#9.GNU Library General Public License Version 2|outline">Jump -to LGPL Version 2</A></P> -<H2 CLASS="western">gettext-runtime</H2> -<P CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm">The -following software may be included in this product: gettext-runtime. -Use of any of this software is governed by the terms of the license -below:</P> -<P CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm">© -Free Software Foundation, Inc.</P> -<P CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm">The -gettext-runtime package is partially under the LGPL and partially -under<BR>the GPL.</P> -<P CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm">The -following parts are under the LGPL:</P> -<UL> - <LI><P CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> - the libintl and libasprintf libraries and their header files,</P> - <LI><P CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> - the libintl.jar Java library,</P> - <LI><P CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> - the GNU.Gettext.dll C# library,</P> - <LI><P CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> - the gettext.sh shells script function library.</P> -</UL> -<P CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm">The -following parts are under the GPL:</P> -<UL> - <LI><P CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> - the _programs_ gettext, ngettext, envsubst,</P> - <LI><P CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"> - the documentation. - </P> -</UL> -<P CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"><A HREF="#9.GNU General Public License Version 3|outline">Jump -to GPL Version 3</A></P> -<P CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"><A HREF="#9.GNU Library General Public License Version 2|outline">Jump -to LGPL Version 2</A></P> -<H2 CLASS="western">glib</H2> -<P CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm">The -following software may be included in this product: glib. Use of any -of this software is governed by the terms of the license below:</P> -<P CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm">© -Free Software Foundation, Inc.</P> -<P CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm">This -library is free software; you can redistribute it and/or modify it -under the terms of the GNU Library General Public License as -published by the Free Software Foundation; either version 2 of the -License, or (at your option) any later version. -</P> -<P CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"><A HREF="#9.GNU Library General Public License Version 2|outline">Jump -to LGPL Version 2</A></P> <H2 CLASS="western">GNU ISO C++ Library</H2> <P CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm">The following software may be included in this product: GNU ISO C++ @@ -1058,12 +994,6 @@ to GPL Version 2</A></P> to LGPL Version 2</A></P> <P CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"><A HREF="#8.Mozilla Public License Version 1.1|outline">Jump to MPL Version 1.1</A></P> -<H2 CLASS="western">libcroco</H2> -<P CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm">The -following software may be included in this product: libcroco. Use of -any of this software is governed by the terms of the license below:</P> -<P CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"><A HREF="#9.GNU Library General Public License Version 2|outline">Jump -to LGPL Version 2</A></P> <H2 CLASS="western">libcurl</H2> <P CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm">The following software may be included in this product: libcurl. Use of @@ -1125,12 +1055,13 @@ DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.</P> -<H2 CLASS="western">libgsf</H2> +<H2 CLASS="western">liblangtag</H2> <P CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm">The -following software may be included in this product: libgsf. Use of -any of this software is governed by the terms of the license below:</P> -<P CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"><A HREF="#5.GNU Lesser General Public License Version 2.1|outline">Jump -to LGPL Version 2.1</A></P> +following software may be included in this product: liblangtag +Grammar Checker. Use of any of this software is governed by the terms +of the license below:</P> +<P CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"><A HREF="#7.GNU Lesser General Public License Version 3|outline">Jump +to LGPL Version 3</A></P> <H2 CLASS="western">libpng</H2> <P CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm">The following software may be included in this product: libpng. Use of @@ -1206,12 +1137,6 @@ Certified Open Source is a<BR>certification mark of the Open Source Initiative.<BR><BR>Glenn Randers-Pehrson<BR>glennrp at users.sourceforge.net<BR>February 3, 2011 </P> -<H2 CLASS="western">librsvg</H2> -<P CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm">The -following software may be included in this product: librsvg. Use of -any of this software is governed by the terms of the license below:</P> -<P CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"><A HREF="#9.GNU Library General Public License Version 2|outline">Jump -to LGPL Version 2</A></P> <H2 CLASS="western">libvisio</H2> <P CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm">The following software may be included in this product: libvisio. Use of @@ -1707,21 +1632,6 @@ license and distribution terms for any publicly available version or derivative of this code cannot be changed. i.e. this code cannot simply be copied and put under another distribution license [including the GNU Public License.]</P> -<H2 CLASS="western">pango</H2> -<P CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm">The -following software may be included in this product: pango. Use of any -of this software is governed by the terms of the license below:</P> -<P CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"><A HREF="#9.GNU Library General Public License Version 2|outline">Jump -to LGPL Version 2</A></P> -<H2 CLASS="western">Pentaho Reporting Flow Engine</H2> -<P CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm">The -following software may be included in this product: Pentaho Reporting -Flow Engine (including core, flow-engine, libbase, libfonts, -libformula, liblayout, libloader, librepository, libserializer, and -libxml). Use of any of this software is governed by the terms of the -license below:</P> -<P CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"><A HREF="#5.GNU Lesser General Public License Version 2.1|outline">Jump -to LGPL Version 2.1</A></P> <H2 CLASS="western">Pixman</H2> <P CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm">The following software may be included in this product: Pixman @@ -2110,18 +2020,6 @@ FITNESS FOR A PARTICULAR PURPOSE.</P> <P CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm">This file declares SANE application interface. See the SANE standard for a detailed explanation of the interface.</P> -<H2 CLASS="western">Saxon (B)</H2> -<P CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm">The -following software may be included in this product: Saxon (B). Use of -any of this software is governed by the terms of the license below:</P> -<P CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"><A HREF="#10.Mozilla Public License Version 1.1|outline">Jump -to MPL Version 1.1</A></P> -<H2 CLASS="western">Stax</H2> -<P CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm">The -following software may be included in this product: Stax API. Use of -any of this software is governed by the terms of the license below:</P> -<P CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"><A HREF="#11.Apache License|outline">Jump -to Apache License Version 2.0</A></P> <H2 CLASS="western">STLPort</H2> <P CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm">The following software may be included in this product:STLport. Use of @@ -9471,4 +9369,4 @@ this trademark restriction does not form part of the License.</P> <P CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm">Creative Commons may be contacted at <A HREF="http://creativecommons.org/">http://creativecommons.org/</A>.</P> </BODY> -</HTML>
\ No newline at end of file +</HTML> diff --git a/readlicense_oo/odt/LICENSE.odt b/readlicense_oo/odt/LICENSE.odt Binary files differindex 456ce3da79fe..9690da48609c 100644 --- a/readlicense_oo/odt/LICENSE.odt +++ b/readlicense_oo/odt/LICENSE.odt diff --git a/readlicense_oo/txt/NOTICE b/readlicense_oo/txt/NOTICE index 181aea7be840..8edf0f009aa6 100644 --- a/readlicense_oo/txt/NOTICE +++ b/readlicense_oo/txt/NOTICE @@ -139,7 +139,6 @@ As part of the base system this product also includes code from the following projects which are licensed under the Apache license: - serf - redland -- StAX The notices from these projects are following: @@ -153,10 +152,6 @@ This product includes Redland software (http://librdf.org/) developed at the Institute for Learning and Research Technology, University of Bristol, UK (http://www.bristol.ac.uk/). - -StAX -[no notices] - ____ This product includes software developed by the OpenSSL Project diff --git a/readlicense_oo/txt/license.txt b/readlicense_oo/txt/license.txt index 8e06f1f25286..9741fb29196a 100644 --- a/readlicense_oo/txt/license.txt +++ b/readlicense_oo/txt/license.txt @@ -441,60 +441,6 @@ Flute Robert Wilhelm Werner Lemberg -gdk-pixbuf - - The following software may be included in this product: gdk-pixbuf. Use - of any of this software is governed by the terms of the license below: - - © Free Software Foundation, Inc. - - This library is free software; you can redistribute it and/or modify it - under the terms of the GNU Library General Public License as published - by the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - See LGPL Version 2 below - -gettext-runtime - - The following software may be included in this product: - gettext-runtime. Use of any of this software is governed by the terms - of the license below: - - © Free Software Foundation, Inc. - - The gettext-runtime package is partially under the LGPL and partially - under - the GPL. - - The following parts are under the LGPL: - * the libintl and libasprintf libraries and their header files, - * the libintl.jar Java library, - * the GNU.Gettext.dll C# library, - * the gettext.sh shells script function library. - - The following parts are under the GPL: - * the _programs_ gettext, ngettext, envsubst, - * the documentation. - - See GPL Version 3 below - - See LGPL Version 2 below - -glib - - The following software may be included in this product: glib. Use of - any of this software is governed by the terms of the license below: - - © Free Software Foundation, Inc. - - This library is free software; you can redistribute it and/or modify it - under the terms of the GNU Library General Public License as published - by the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - See LGPL Version 2 below - GNU ISO C++ Library The following software may be included in this product: GNU ISO C++ @@ -950,13 +896,6 @@ libcmis See MPL Version 1.1 below -libcroco - - The following software may be included in this product: libcroco. Use - of any of this software is governed by the terms of the license below: - - See LGPL Version 2 below - libcurl The following software may be included in this product: libcurl. Use of @@ -1021,12 +960,13 @@ libexttextcat (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -libgsf +liblangtag - The following software may be included in this product: libgsf. Use of - any of this software is governed by the terms of the license below: + The following software may be included in this product: liblangtag + Grammar Checker. Use of any of this software is governed by the terms + of the license below: - See LGPL Version 2.1 below + See LGPL Version 3 below libpng @@ -1132,13 +1072,6 @@ libpng glennrp at users.sourceforge.net February 3, 2011 -librsvg - - The following software may be included in this product: librsvg. Use of - any of this software is governed by the terms of the license below: - - See LGPL Version 2 below - libvisio The following software may be included in this product: libvisio. Use @@ -2057,20 +1990,6 @@ SANE This file declares SANE application interface. See the SANE standard for a detailed explanation of the interface. -Saxon (B) - - The following software may be included in this product: Saxon (B). Use - of any of this software is governed by the terms of the license below: - - See MPL Version 1.1 below - -Stax - - The following software may be included in this product: Stax API. Use - of any of this software is governed by the terms of the license below: - - See Apache License Version 2.0 below - STLPort The following software may be included in this product:STLport. Use of |