[Libreoffice-commits] .: Branch 'libreoffice-3-4' - readlicense_oo/html readlicense_oo/odt readlicense_oo/txt

Andras Timar timar at kemper.freedesktop.org
Mon Mar 19 05:27:38 PDT 2012


 readlicense_oo/html/THIRDPARTYLICENSEREADME.html |   65 +++++++++++++++++++++++
 readlicense_oo/odt/LICENSE.odt                   |binary
 readlicense_oo/txt/license.txt                   |   65 +++++++++++++++++++++++
 3 files changed, 130 insertions(+)

New commits:
commit 00fb6dcf450599aece31ec8ab3a46f63eb842bac
Author: Andras Timar <atimar at suse.com>
Date:   Mon Mar 19 13:26:28 2012 +0100

    update of license document
    
    added Info-ZIP license
    
    Signed-off-by: Michael Meeks <mmeeks at suse.com>

diff --git a/readlicense_oo/html/THIRDPARTYLICENSEREADME.html b/readlicense_oo/html/THIRDPARTYLICENSEREADME.html
index c32b3a3..3e26461 100644
--- a/readlicense_oo/html/THIRDPARTYLICENSEREADME.html
+++ b/readlicense_oo/html/THIRDPARTYLICENSEREADME.html
@@ -2443,6 +2443,71 @@ not be misrepresented as being the original software.</P>
 <P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm">
 3. This notice may not be removed or altered from any source
 distribution.</P>
+<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm">
+LibreOffice uses unzip.c from zlib's contrib/minizip directory. This file
+was derived from Info-ZIP's unzip.c, which is under the Info-ZIP License:</P>
+<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm">
+This is version 2007-Mar-4 of the Info-ZIP license.
+The definitive version of this document should be available at
+<a href="ftp://ftp.info-zip.org/pub/infozip/license.html">ftp://ftp.info-zip.org/pub/infozip/license.html</a> indefinitely and
+a copy at http://www.info-zip.org/pub/infozip/license.html.</P>
+<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm">
+Copyright (c) 1990-2007 Info-ZIP.  All rights reserved.</P>
+<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm">
+For the purposes of this copyright and license, "Info-ZIP" is defined as
+the following set of individuals:</P>
+<BLOCKQUOTE><P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm">
+Mark Adler, John Bush, Karl Davis, Harald Denker, Jean-Michel Dubois,
+Jean-loup Gailly, Hunter Goatley, Ed Gordon, Ian Gorman, Chris Herborth,
+Dirk Haase, Greg Hartwig, Robert Heath, Jonathan Hudson, Paul Kienitz,
+David Kirschbaum, Johnny Lee, Onno van der Linden, Igor Mandrichenko,
+Steve P. Miller, Sergio Monesi, Keith Owens, George Petrov, Greg Roelofs,
+Kai Uwe Rommel, Steve Salisbury, Dave Smith, Steven M. Schweda,
+Christian Spieler, Cosmin Truta, Antoine Verheijen, Paul von Behren,
+Rich Wales, Mike White.</P></BLOCKQUOTE>
+<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm">
+This software is provided "as is," without warranty of any kind, express
+or implied.  In no event shall Info-ZIP or its contributors be held liable
+for any direct, indirect, incidental, special or consequential damages
+arising out of the use of or inability to use this software.</P>
+<P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm">
+Permission is granted to anyone to use this software for any purpose,
+including commercial applications, and to alter it and redistribute it
+freely, subject to the above disclaimer and the following restrictions:</P>
+<OL>
+<LI><P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm">
+Redistributions of source code (in whole or in part) must retain
+the above copyright notice, definition, disclaimer, and this list
+of conditions.</P></LI>
+<LI><P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm">
+Redistributions in binary form (compiled executables and libraries)
+must reproduce the above copyright notice, definition, disclaimer,
+and this list of conditions in documentation and/or other materials
+provided with the distribution.  The sole exception to this condition
+is redistribution of a standard UnZipSFX binary (including SFXWiz) as
+part of a self-extracting archive; that is permitted without inclusion
+of this license, as long as the normal SFX banner has not been removed
+from the binary or disabled.</P></LI>
+<LI><P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm">
+Altered versions--including, but not limited to, ports to new operating
+systems, existing ports with new graphical interfaces, versions with
+modified or added functionality, and dynamic, shared, or static library
+versions not from Info-ZIP--must be plainly marked as such and must not
+be misrepresented as being the original source or, if binaries,
+compiled from the original source.  Such altered versions also must not
+be misrepresented as being Info-ZIP releases--including, but not
+limited to, labeling of the altered versions with the names "Info-ZIP"
+(or any variation thereof, including, but not limited to, different
+capitalizations), "Pocket UnZip," "WiZ" or "MacZip" without the
+explicit permission of Info-ZIP.  Such altered versions are further
+prohibited from misrepresentative use of the Zip-Bugs or Info-ZIP
+e-mail addresses or the Info-ZIP URL(s), such as to imply Info-ZIP
+will provide support for the altered versions.</P></LI>
+<LI><P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm">
+Info-ZIP retains the right to use the names "Info-ZIP," "Zip," "UnZip,"
+"UnZipSFX," "WiZ," "Pocket UnZip," "Pocket Zip," and "MacZip" for its
+own source and binary releases.</P></LI>
+</OL>
 <H1 LANG="en-US" CLASS="western" STYLE="page-break-before: always"><A NAME="__RefHeading__12191_1300998327"></A>
 Extensions</H1>
 <P LANG="en-US" CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm">
diff --git a/readlicense_oo/odt/LICENSE.odt b/readlicense_oo/odt/LICENSE.odt
index c9cd5a2..c34e358 100644
Binary files a/readlicense_oo/odt/LICENSE.odt and b/readlicense_oo/odt/LICENSE.odt differ
diff --git a/readlicense_oo/txt/license.txt b/readlicense_oo/txt/license.txt
index 2aa5554..3d3f6d8 100755
--- a/readlicense_oo/txt/license.txt
+++ b/readlicense_oo/txt/license.txt
@@ -2323,6 +2323,71 @@ zlib
    3. This notice may not be removed or altered from any source
    distribution.
 
+   LibreOffice uses unzip.c from zlib's contrib/minizip directory. This file
+   was derived from Info-ZIP's unzip.c, which is under the Info-ZIP License:
+   
+   This is version 2007-Mar-4 of the Info-ZIP license.
+   The definitive version of this document should be available at
+   ftp://ftp.info-zip.org/pub/infozip/license.html indefinitely and
+   a copy at http://www.info-zip.org/pub/infozip/license.html.
+
+
+   Copyright (c) 1990-2007 Info-ZIP.  All rights reserved.
+
+   For the purposes of this copyright and license, "Info-ZIP" is defined as
+   the following set of individuals:
+
+      Mark Adler, John Bush, Karl Davis, Harald Denker, Jean-Michel Dubois,
+      Jean-loup Gailly, Hunter Goatley, Ed Gordon, Ian Gorman, Chris Herborth,
+      Dirk Haase, Greg Hartwig, Robert Heath, Jonathan Hudson, Paul Kienitz,
+      David Kirschbaum, Johnny Lee, Onno van der Linden, Igor Mandrichenko,
+      Steve P. Miller, Sergio Monesi, Keith Owens, George Petrov, Greg Roelofs,
+      Kai Uwe Rommel, Steve Salisbury, Dave Smith, Steven M. Schweda,
+      Christian Spieler, Cosmin Truta, Antoine Verheijen, Paul von Behren,
+      Rich Wales, Mike White.
+
+   This software is provided "as is," without warranty of any kind, express
+   or implied.  In no event shall Info-ZIP or its contributors be held liable
+   for any direct, indirect, incidental, special or consequential damages
+   arising out of the use of or inability to use this software.
+
+   Permission is granted to anyone to use this software for any purpose,
+   including commercial applications, and to alter it and redistribute it
+   freely, subject to the above disclaimer and the following restrictions:
+
+    1. Redistributions of source code (in whole or in part) must retain
+       the above copyright notice, definition, disclaimer, and this list
+       of conditions.
+
+    2. Redistributions in binary form (compiled executables and libraries)
+       must reproduce the above copyright notice, definition, disclaimer,
+       and this list of conditions in documentation and/or other materials
+       provided with the distribution.  The sole exception to this condition
+       is redistribution of a standard UnZipSFX binary (including SFXWiz) as
+       part of a self-extracting archive; that is permitted without inclusion
+       of this license, as long as the normal SFX banner has not been removed
+       from the binary or disabled.
+
+    3. Altered versions--including, but not limited to, ports to new operating
+       systems, existing ports with new graphical interfaces, versions with
+       modified or added functionality, and dynamic, shared, or static library
+       versions not from Info-ZIP--must be plainly marked as such and must not
+       be misrepresented as being the original source or, if binaries,
+       compiled from the original source.  Such altered versions also must not
+       be misrepresented as being Info-ZIP releases--including, but not
+       limited to, labeling of the altered versions with the names "Info-ZIP"
+       (or any variation thereof, including, but not limited to, different
+       capitalizations), "Pocket UnZip," "WiZ" or "MacZip" without the
+       explicit permission of Info-ZIP.  Such altered versions are further
+       prohibited from misrepresentative use of the Zip-Bugs or Info-ZIP
+       e-mail addresses or the Info-ZIP URL(s), such as to imply Info-ZIP
+       will provide support for the altered versions.
+
+    4. Info-ZIP retains the right to use the names "Info-ZIP," "Zip," "UnZip,"
+       "UnZipSFX," "WiZ," "Pocket UnZip," "Pocket Zip," and "MacZip" for its
+       own source and binary releases.
+
+
                                   Extensions
 
    Only third party extensions are listed here whose source code is not


More information about the Libreoffice-commits mailing list