From 11a43e5303fc470fb92b7a3e4d3faf79a009047c Mon Sep 17 00:00:00 2001 From: Vladimir Glazounov Date: Tue, 20 Jan 2009 10:06:44 +0000 Subject: [PATCH] CWS-TOOLING: integrate CWS cloph12 2009-01-13 18:36:51 +0100 cloph r266245 : #i98008# add back the XSLTLIB exports - used when using the internal libxslt (patched xslt-config that uses that var) 2009-01-13 01:51:56 +0100 cloph r266186 : #i97928# missed hu_HU in the initial commit 2009-01-12 22:45:02 +0100 cloph r266183 : #i98008# remove unused XSLTLIB exports 2009-01-12 00:30:16 +0100 cloph r266130 : #i97928# silence timestamp has not been update warning, reduce number of unzip calls 2009-01-11 22:02:28 +0100 cloph r266129 : #i80368# fix ambiguous inference chains, remove duplicated license files, minor other cleanup --- readlicense_oo/conv.pl | 98 -- readlicense_oo/makefile.mk | 26 +- readlicense_oo/prj/d.lst | 1 - readlicense_oo/source/cinema/oo_product.bmp | Bin 396434 -> 0 bytes .../license/{wnt => }/license_en-US.html | 17 +- .../license/{wnt => }/license_en-US.rtf | 0 .../license/{wnt => }/license_en-US.txt | 0 .../source/license/unx/LICENSE_en-US | 856 ----------------- .../source/license/unx/LICENSE_en-US.html | 877 ------------------ readlicense_oo/util/makefile.pmk | 86 +- 10 files changed, 53 insertions(+), 1908 deletions(-) delete mode 100755 readlicense_oo/conv.pl delete mode 100644 readlicense_oo/source/cinema/oo_product.bmp rename readlicense_oo/source/license/{wnt => }/license_en-US.html (99%) rename readlicense_oo/source/license/{wnt => }/license_en-US.rtf (100%) rename readlicense_oo/source/license/{wnt => }/license_en-US.txt (100%) delete mode 100644 readlicense_oo/source/license/unx/LICENSE_en-US delete mode 100644 readlicense_oo/source/license/unx/LICENSE_en-US.html diff --git a/readlicense_oo/conv.pl b/readlicense_oo/conv.pl deleted file mode 100755 index 4f2780c9dc77..000000000000 --- a/readlicense_oo/conv.pl +++ /dev/null @@ -1,98 +0,0 @@ -#!/usr/bin/perl - -use strict; -use File::Find (); -use File::Basename (); -use File::Path (); -use Getopt::Std; -use Cwd; - -my ($startdir,$outdir,$pfx); -my $verbose = 0; - -sub usage() { - print STDERR "usage: $0 -o [-f ]\n" -} - -$startdir=cwd(); - -# for the convenience of &wanted calls, including -eval statements: -use vars qw/*name *dir *prune/; -*name = *File::Find::name; -*dir = *File::Find::dir; -*prune = *File::Find::prune; - -if ( !getopts('o:f:') ) { - usage(); - exit(1); -} - -if ( defined($Getopt::Std::opt_o) ) { - $outdir=$Getopt::Std::opt_o; - $outdir=~s%\\%/%g; -} else { - usage(); - exit(1); -} - -if ( defined($Getopt::Std::opt_f) ) { - convertfile($outdir,$Getopt::Std::opt_f); -} else { - # Traverse desired filesystems - $pfx="source"; - File::Find::find({wanted => \&wanted}, 'source'); -} -exit; - - -sub wanted { - my ($dev,$ino,$mode,$nlink,$uid,$gid); - - ( - /^.*\.html\z/s - || - /^license.*\.txt\z/s - || - /^LICENSE.*\z/s - || - /^readme\.txt\z/s - || - /^README\z/s - ) && - ($nlink || (($dev,$ino,$mode,$nlink,$uid,$gid) = lstat($_))) && - eval {&doconv}; -} - -sub doconv { - my($dest); - $dest=$dir; - $dest=~s/^$pfx//g; - $dest=$outdir.$dest; - convertfile($dest,$name) if $name =~ /\/$ENV{GUI}\//i; -} - -sub convertfile { - my ($dest,$file,$destfile); - $dest=shift; - $file=shift; - $dest=~s%^./%%g; - $dest=$startdir . "/" . $dest; - $file=$startdir . "/" . $file; - - $destfile=$dest . "/" . File::Basename::basename($file); - - File::Path::mkpath($dest,0,0775); - - open(IN,"<$file") || die "can not open $file"; - open(OUT,">$destfile") || die "can not open $destfile"; - print "converting: $file -> $destfile\n" if $verbose; - while ( ) { - chop while ( /\n$/ || /\r$/ ); - print OUT "$_\n"; - } - close(IN); - close(OUT); -} - - - diff --git a/readlicense_oo/makefile.mk b/readlicense_oo/makefile.mk index 139c6a842463..da48f89bae60 100755 --- a/readlicense_oo/makefile.mk +++ b/readlicense_oo/makefile.mk @@ -14,29 +14,35 @@ SYSLICBASE=LICENSE LICENSE.html SYSLICDEST=$(MISC)$/license$/unx .ENDIF # "$(GUI)"=="WNT" +SOURCELICENCES=$(foreach,i,$(SYSLICBASE) $(SYSLICDEST)$/$(i:b)_en-US$(i:e)) + fallbacklicenses=$(foreach,i,{$(subst,$(defaultlangiso), $(alllangiso))} $(foreach,j,$(SYSLICBASE) $(SYSLICDEST)$/$(j:b)_$i$(j:e))) # ------------------------------------------------------------------ .INCLUDE: target.mk # ------------------------------------------------------------------ -ALLTAR: convert $(fallbacklicenses) just_for_nice_optics +ALLTAR: $(SOURCELICENCES) $(fallbacklicenses) just_for_nice_optics .IF "$(fallbacklicenses)"!="" -$(fallbacklicenses) : convert +$(fallbacklicenses) : $(SOURCELICENCES) @$(ECHON) . @$(COPY) $(@:d)$(@:b:s/_/./:b)_$(defaultlangiso)$(@:e) $@ .ENDIF # "$(fallbacklicenses)"!="" just_for_nice_optics: $(fallbacklicenses) @$(ECHONL) - @echo done. -convert: - @echo converting license files - @-$(PERL) conv.pl -o $(MISC) -# no conversion for *.rtf -.IF "$(GUI)"=="WNT" - @$(COPY) source$/license$/wnt$/*.rtf $(SYSLICDEST) -.ENDIF # "$(GUI)"=="WNT" +# for windows, convert linends to DOS +$(SYSLICDEST)$/license_en-US.% : source$/license$/license_en-US.% + @$(MKDIRHIER) $(SYSLICDEST) + $(PERL) -p -e 's/\r?\n$$/\r\n/' < $< > $@ +# for others just copy +$(SYSLICDEST)$/LICENSE_en-US : source$/license$/license_en-US.txt + @$(MKDIRHIER) $(SYSLICDEST) + $(COPY) $< $@ + +$(SYSLICDEST)$/LICENSE_en-US.html : source$/license$/license_en-US.html + @$(MKDIRHIER) $(SYSLICDEST) + $(COPY) $< $@ diff --git a/readlicense_oo/prj/d.lst b/readlicense_oo/prj/d.lst index e6e3d4f8646c..4c0ab675d6b1 100644 --- a/readlicense_oo/prj/d.lst +++ b/readlicense_oo/prj/d.lst @@ -28,7 +28,6 @@ dos: echo ===================================================================== dos: echo Delivering README files dos: echo ===================================================================== -..\source\cinema\* %_DEST%\pck%_EXT%\* ..\%__SRC%\misc\WNT\readme_*.txt %_DEST%\bin%_EXT%\osl ..\%__SRC%\misc\WNT\readme_*.html %_DEST%\bin%_EXT%\osl ..\%__SRC%\misc\UNX\README_* %_DEST%\bin%_EXT%\osl diff --git a/readlicense_oo/source/cinema/oo_product.bmp b/readlicense_oo/source/cinema/oo_product.bmp deleted file mode 100644 index a6265ea2b23437b690b44ea2445c34f685e46038..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 396434 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

<_eU%fXi~Akr{H2eimtLypi8+a$ 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 z2{-{K-~^n26L11fzzH}3C*TB}fD>>6PQVE`0Vm)DoPZN>0#3jQH~}Z%1e|~qZ~{)i z2{-{K-~^n26L11fzzH}3C*TB}fD>>6PQVE`0Vm)DoPZN>0#3jQH~}Z%1e|~qZ~{)i z2{-{K-~^n26L11fzzH}3C*TB}fD>>6PQVE`0Vm)DoPZN>0#3jQH~}Z%1e|~qZ~{)i z2{-{K-~^n26L11fzzH}3C*TB}fD>>6PQVE`0Vm)DoPZN>0#3jQH~}Z%1e|~qZ~{)i z2{-{K-~^n26L11fzzH}3C*TB}fD>>6PQVE`0Vm)DoPZN>0#3jQH~}Z%1e|~qZ~{)i z2{-{K-~^n26L11fzzH}3C*TB}fD>>6PQVE`0Vm)DoPZN>0#3jQH~}Z%1e|~qZ~{)i z2{-{K-~^n26L11fzzH}3C*TB}fD>>6PQVE`0Vm)DoPZN>0#3jQH~}Z%1e|~qZ~{)i z2{-{K-~^n26L11fzzH}3C*TB}fD>>6PQVE`0Vm)DoPZN>0#3jQH~}Z%1e|~qZ~{)i z2{-{K-~^n26L11fzzH}3C*TB}fD>>6PQVE`0Vm)DoPZN>0#3jQH~}Z%1e|~qZ~{)i M2{-{KuuB5}KWPt+nE(I) diff --git a/readlicense_oo/source/license/wnt/license_en-US.html b/readlicense_oo/source/license/license_en-US.html similarity index 99% rename from readlicense_oo/source/license/wnt/license_en-US.html rename to readlicense_oo/source/license/license_en-US.html index 7789dfa9fa14..58ff87790434 100644 --- a/readlicense_oo/source/license/wnt/license_en-US.html +++ b/readlicense_oo/source/license/license_en-US.html @@ -7,21 +7,17 @@

(License text)

-

-This product is made available subject to the terms of GNU Lesser +

This product is made available subject to the terms of GNU Lesser General Public License Version 3. A copy of the LGPL license can be found at http://www.openoffice.org/license.html

-

Third Party Code Additional copyright notices and license -terms -applicable to portions of the Software are set forth in the -THIRDPARTYLICENSEREADME.html file. -

+

Third Party Code Additional copyright notices and license +terms applicable to portions of the Software are set forth +in the THIRDPARTYLICENSEREADME.html file.

All trademarks and registered trademarks mentioned herein are the -property -of their respective owners.

+property of their respective owners.

Copyright 2002-2008 Sun Microsystems, Inc.

This product has been created with contributions from the @@ -29,8 +25,7 @@ OpenOffice.org community, of which Sun Microsystems Inc. is the founding member. OpenOffice.org acknowledges all community members, especially those mentioned at http://www.openoffice.org/welcome/credits.html.

-

-

+
 
 		   GNU LESSER GENERAL PUBLIC LICENSE
diff --git a/readlicense_oo/source/license/wnt/license_en-US.rtf b/readlicense_oo/source/license/license_en-US.rtf
similarity index 100%
rename from readlicense_oo/source/license/wnt/license_en-US.rtf
rename to readlicense_oo/source/license/license_en-US.rtf
diff --git a/readlicense_oo/source/license/wnt/license_en-US.txt b/readlicense_oo/source/license/license_en-US.txt
similarity index 100%
rename from readlicense_oo/source/license/wnt/license_en-US.txt
rename to readlicense_oo/source/license/license_en-US.txt
diff --git a/readlicense_oo/source/license/unx/LICENSE_en-US b/readlicense_oo/source/license/unx/LICENSE_en-US
deleted file mode 100644
index 378e03dd840e..000000000000
--- a/readlicense_oo/source/license/unx/LICENSE_en-US
+++ /dev/null
@@ -1,856 +0,0 @@
-This product is made available subject to the terms of GNU Lesser General Public License Version 3. A copy of the LGPL license can be found at http://www.openoffice.org/license.html
-
-------------------------------------
-Third Party Code. Additional copyright notices and license terms applicable to portions of the Software are set forth in the THIRDPARTYLICENSEREADME.html file.
-
-------------------------------------
-All trademarks and registered trademarks mentioned herein are the property of their respective owners.  
-
-------------------------------------
-Copyright 2002,2008 Sun Microsystems, Inc.
-
-------------------------------------
-
-
-		   GNU LESSER GENERAL PUBLIC LICENSE
-                       Version 3, 29 June 2007
-
- Copyright (C) 2007 Free Software Foundation, Inc. 
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-
-  This version of the GNU Lesser General Public License incorporates
-the terms and conditions of version 3 of the GNU General Public
-License, supplemented by the additional permissions listed below.
-
-  0. Additional Definitions. 
-
-  As used herein, "this License" refers to version 3 of the GNU Lesser
-General Public License, and the "GNU GPL" refers to version 3 of the GNU
-General Public License.
-
-  "The Library" refers to a covered work governed by this License,
-other than an Application or a Combined Work as defined below.
-
-  An "Application" is any work that makes use of an interface provided
-by the Library, but which is not otherwise based on the Library.
-Defining a subclass of a class defined by the Library is deemed a mode
-of using an interface provided by the Library.
-
-  A "Combined Work" is a work produced by combining or linking an
-Application with the Library.  The particular version of the Library
-with which the Combined Work was made is also called the "Linked
-Version".
-
-  The "Minimal Corresponding Source" for a Combined Work means the
-Corresponding Source for the Combined Work, excluding any source code
-for portions of the Combined Work that, considered in isolation, are
-based on the Application, and not on the Linked Version.
-
-  The "Corresponding Application Code" for a Combined Work means the
-object code and/or source code for the Application, including any data
-and utility programs needed for reproducing the Combined Work from the
-Application, but excluding the System Libraries of the Combined Work.
-
-  1. Exception to Section 3 of the GNU GPL.
-
-  You may convey a covered work under sections 3 and 4 of this License
-without being bound by section 3 of the GNU GPL.
-
-  2. Conveying Modified Versions.
-
-  If you modify a copy of the Library, and, in your modifications, a
-facility refers to a function or data to be supplied by an Application
-that uses the facility (other than as an argument passed when the
-facility is invoked), then you may convey a copy of the modified
-version:
-
-   a) under this License, provided that you make a good faith effort to
-   ensure that, in the event an Application does not supply the
-   function or data, the facility still operates, and performs
-   whatever part of its purpose remains meaningful, or
-
-   b) under the GNU GPL, with none of the additional permissions of
-   this License applicable to that copy.
-
-  3. Object Code Incorporating Material from Library Header Files.
-
-  The object code form of an Application may incorporate material from
-a header file that is part of the Library.  You may convey such object
-code under terms of your choice, provided that, if the incorporated
-material is not limited to numerical parameters, data structure
-layouts and accessors, or small macros, inline functions and templates
-(ten or fewer lines in length), you do both of the following:
-
-   a) Give prominent notice with each copy of the object code that the
-   Library is used in it and that the Library and its use are
-   covered by this License.
-
-   b) Accompany the object code with a copy of the GNU GPL and this license
-   document.
-
-  4. Combined Works.
-
-  You may convey a Combined Work under terms of your choice that,
-taken together, effectively do not restrict modification of the
-portions of the Library contained in the Combined Work and reverse
-engineering for debugging such modifications, if you also do each of
-the following:
-
-   a) Give prominent notice with each copy of the Combined Work that
-   the Library is used in it and that the Library and its use are
-   covered by this License.
-
-   b) Accompany the Combined Work with a copy of the GNU GPL and this license
-   document.
-
-   c) For a Combined Work that displays copyright notices during
-   execution, include the copyright notice for the Library among
-   these notices, as well as a reference directing the user to the
-   copies of the GNU GPL and this license document.
-
-   d) Do one of the following:
-
-       0) Convey the Minimal Corresponding Source under the terms of this
-       License, and the Corresponding Application Code in a form
-       suitable for, and under terms that permit, the user to
-       recombine or relink the Application with a modified version of
-       the Linked Version to produce a modified Combined Work, in the
-       manner specified by section 6 of the GNU GPL for conveying
-       Corresponding Source.
-
-       1) Use a suitable shared library mechanism for linking with the
-       Library.  A suitable mechanism is one that (a) uses at run time
-       a copy of the Library already present on the user's computer
-       system, and (b) will operate properly with a modified version
-       of the Library that is interface-compatible with the Linked
-       Version. 
-
-   e) Provide Installation Information, but only if you would otherwise
-   be required to provide such information under section 6 of the
-   GNU GPL, and only to the extent that such information is
-   necessary to install and execute a modified version of the
-   Combined Work produced by recombining or relinking the
-   Application with a modified version of the Linked Version. (If
-   you use option 4d0, the Installation Information must accompany
-   the Minimal Corresponding Source and Corresponding Application
-   Code. If you use option 4d1, you must provide the Installation
-   Information in the manner specified by section 6 of the GNU GPL
-   for conveying Corresponding Source.)
-
-  5. Combined Libraries.
-
-  You may place library facilities that are a work based on the
-Library side by side in a single library together with other library
-facilities that are not Applications and are not covered by this
-License, and convey such a combined library under terms of your
-choice, if you do both of the following:
-
-   a) Accompany the combined library with a copy of the same work based
-   on the Library, uncombined with any other library facilities,
-   conveyed under the terms of this License.
-
-   b) Give prominent notice with the combined library that part of it
-   is a work based on the Library, and explaining where to find the
-   accompanying uncombined form of the same work.
-
-  6. Revised Versions of the GNU Lesser General Public License.
-
-  The Free Software Foundation may publish revised and/or new versions
-of the GNU Lesser General Public License from time to time. Such new
-versions will be similar in spirit to the present version, but may
-differ in detail to address new problems or concerns.
-
-  Each version is given a distinguishing version number. If the
-Library as you received it specifies that a certain numbered version
-of the GNU Lesser General Public License "or any later version"
-applies to it, you have the option of following the terms and
-conditions either of that published version or of any later version
-published by the Free Software Foundation. If the Library as you
-received it does not specify a version number of the GNU Lesser
-General Public License, you may choose any version of the GNU Lesser
-General Public License ever published by the Free Software Foundation.
-
-  If the Library as you received it specifies that a proxy can decide
-whether future versions of the GNU Lesser General Public License shall
-apply, that proxy's public statement of acceptance of any version is
-permanent authorization for you to choose that version for the
-Library.
-
-
-
-                    GNU GENERAL PUBLIC LICENSE
-                       Version 3, 29 June 2007
-
- Copyright (C) 2007 Free Software Foundation, Inc. 
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-                            Preamble
-
-  The GNU General Public License is a free, copyleft license for
-software and other kinds of works.
-
-  The licenses for most software and other practical works are designed
-to take away your freedom to share and change the works.  By contrast,
-the GNU General Public License is intended to guarantee your freedom to
-share and change all versions of a program--to make sure it remains free
-software for all its users.  We, the Free Software Foundation, use the
-GNU General Public License for most of our software; it applies also to
-any other work released this way by its authors.  You can apply it to
-your programs, too.
-
-  When we speak of free software, we are referring to freedom, not
-price.  Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-them if you wish), that you receive source code or can get it if you
-want it, that you can change the software or use pieces of it in new
-free programs, and that you know you can do these things.
-
-  To protect your rights, we need to prevent others from denying you
-these rights or asking you to surrender the rights.  Therefore, you have
-certain responsibilities if you distribute copies of the software, or if
-you modify it: responsibilities to respect the freedom of others.
-
-  For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must pass on to the recipients the same
-freedoms that you received.  You must make sure that they, too, receive
-or can get the source code.  And you must show them these terms so they
-know their rights.
-
-  Developers that use the GNU GPL protect your rights with two steps:
-(1) assert copyright on the software, and (2) offer you this License
-giving you legal permission to copy, distribute and/or modify it.
-
-  For the developers' and authors' protection, the GPL clearly explains
-that there is no warranty for this free software.  For both users' and
-authors' sake, the GPL requires that modified versions be marked as
-changed, so that their problems will not be attributed erroneously to
-authors of previous versions.
-
-  Some devices are designed to deny users access to install or run
-modified versions of the software inside them, although the manufacturer
-can do so.  This is fundamentally incompatible with the aim of
-protecting users' freedom to change the software.  The systematic
-pattern of such abuse occurs in the area of products for individuals to
-use, which is precisely where it is most unacceptable.  Therefore, we
-have designed this version of the GPL to prohibit the practice for those
-products.  If such problems arise substantially in other domains, we
-stand ready to extend this provision to those domains in future versions
-of the GPL, as needed to protect the freedom of users.
-
-  Finally, every program is threatened constantly by software patents.
-States should not allow patents to restrict development and use of
-software on general-purpose computers, but in those that do, we wish to
-avoid the special danger that patents applied to a free program could
-make it effectively proprietary.  To prevent this, the GPL assures that
-patents cannot be used to render the program non-free.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.
-
-                       TERMS AND CONDITIONS
-
-  0. Definitions.
-
-  "This License" refers to version 3 of the GNU General Public License.
-
-  "Copyright" also means copyright-like laws that apply to other kinds of
-works, such as semiconductor masks.
-
-  "The Program" refers to any copyrightable work licensed under this
-License.  Each licensee is addressed as "you".  "Licensees" and
-"recipients" may be individuals or organizations.
-
-  To "modify" a work means to copy from or adapt all or part of the work
-in a fashion requiring copyright permission, other than the making of an
-exact copy.  The resulting work is called a "modified version" of the
-earlier work or a work "based on" the earlier work.
-
-  A "covered work" means either the unmodified Program or a work based
-on the Program.
-
-  To "propagate" a work means to do anything with it that, without
-permission, would make you directly or secondarily liable for
-infringement under applicable copyright law, except executing it on a
-computer or modifying a private copy.  Propagation includes copying,
-distribution (with or without modification), making available to the
-public, and in some countries other activities as well.
-
-  To "convey" a work means any kind of propagation that enables other
-parties to make or receive copies.  Mere interaction with a user through
-a computer network, with no transfer of a copy, is not conveying.
-
-  An interactive user interface displays "Appropriate Legal Notices"
-to the extent that it includes a convenient and prominently visible
-feature that (1) displays an appropriate copyright notice, and (2)
-tells the user that there is no warranty for the work (except to the
-extent that warranties are provided), that licensees may convey the
-work under this License, and how to view a copy of this License.  If
-the interface presents a list of user commands or options, such as a
-menu, a prominent item in the list meets this criterion.
-
-  1. Source Code.
-
-  The "source code" for a work means the preferred form of the work
-for making modifications to it.  "Object code" means any non-source
-form of a work.
-
-  A "Standard Interface" means an interface that either is an official
-standard defined by a recognized standards body, or, in the case of
-interfaces specified for a particular programming language, one that
-is widely used among developers working in that language.
-
-  The "System Libraries" of an executable work include anything, other
-than the work as a whole, that (a) is included in the normal form of
-packaging a Major Component, but which is not part of that Major
-Component, and (b) serves only to enable use of the work with that
-Major Component, or to implement a Standard Interface for which an
-implementation is available to the public in source code form.  A
-"Major Component", in this context, means a major essential component
-(kernel, window system, and so on) of the specific operating system
-(if any) on which the executable work runs, or a compiler used to
-produce the work, or an object code interpreter used to run it.
-
-  The "Corresponding Source" for a work in object code form means all
-the source code needed to generate, install, and (for an executable
-work) run the object code and to modify the work, including scripts to
-control those activities.  However, it does not include the work's
-System Libraries, or general-purpose tools or generally available free
-programs which are used unmodified in performing those activities but
-which are not part of the work.  For example, Corresponding Source
-includes interface definition files associated with source files for
-the work, and the source code for shared libraries and dynamically
-linked subprograms that the work is specifically designed to require,
-such as by intimate data communication or control flow between those
-subprograms and other parts of the work.
-
-  The Corresponding Source need not include anything that users
-can regenerate automatically from other parts of the Corresponding
-Source.
-
-  The Corresponding Source for a work in source code form is that
-same work.
-
-  2. Basic Permissions.
-
-  All rights granted under this License are granted for the term of
-copyright on the Program, and are irrevocable provided the stated
-conditions are met.  This License explicitly affirms your unlimited
-permission to run the unmodified Program.  The output from running a
-covered work is covered by this License only if the output, given its
-content, constitutes a covered work.  This License acknowledges your
-rights of fair use or other equivalent, as provided by copyright law.
-
-  You may make, run and propagate covered works that you do not
-convey, without conditions so long as your license otherwise remains
-in force.  You may convey covered works to others for the sole purpose
-of having them make modifications exclusively for you, or provide you
-with facilities for running those works, provided that you comply with
-the terms of this License in conveying all material for which you do
-not control copyright.  Those thus making or running the covered works
-for you must do so exclusively on your behalf, under your direction
-and control, on terms that prohibit them from making any copies of
-your copyrighted material outside their relationship with you.
-
-  Conveying under any other circumstances is permitted solely under
-the conditions stated below.  Sublicensing is not allowed; section 10
-makes it unnecessary.
-
-  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
-
-  No covered work shall be deemed part of an effective technological
-measure under any applicable law fulfilling obligations under article
-11 of the WIPO copyright treaty adopted on 20 December 1996, or
-similar laws prohibiting or restricting circumvention of such
-measures.
-
-  When you convey a covered work, you waive any legal power to forbid
-circumvention of technological measures to the extent such circumvention
-is effected by exercising rights under this License with respect to
-the covered work, and you disclaim any intention to limit operation or
-modification of the work as a means of enforcing, against the work's
-users, your or third parties' legal rights to forbid circumvention of
-technological measures.
-
-  4. Conveying Verbatim Copies.
-
-  You may convey verbatim copies of the Program's source code as you
-receive it, in any medium, provided that you conspicuously and
-appropriately publish on each copy an appropriate copyright notice;
-keep intact all notices stating that this License and any
-non-permissive terms added in accord with section 7 apply to the code;
-keep intact all notices of the absence of any warranty; and give all
-recipients a copy of this License along with the Program.
-
-  You may charge any price or no price for each copy that you convey,
-and you may offer support or warranty protection for a fee.
-
-  5. Conveying Modified Source Versions.
-
-  You may convey a work based on the Program, or the modifications to
-produce it from the Program, in the form of source code under the
-terms of section 4, provided that you also meet all of these conditions:
-
-    a) The work must carry prominent notices stating that you modified
-    it, and giving a relevant date.
-
-    b) The work must carry prominent notices stating that it is
-    released under this License and any conditions added under section
-    7.  This requirement modifies the requirement in section 4 to
-    "keep intact all notices".
-
-    c) You must license the entire work, as a whole, under this
-    License to anyone who comes into possession of a copy.  This
-    License will therefore apply, along with any applicable section 7
-    additional terms, to the whole of the work, and all its parts,
-    regardless of how they are packaged.  This License gives no
-    permission to license the work in any other way, but it does not
-    invalidate such permission if you have separately received it.
-
-    d) If the work has interactive user interfaces, each must display
-    Appropriate Legal Notices; however, if the Program has interactive
-    interfaces that do not display Appropriate Legal Notices, your
-    work need not make them do so.
-
-  A compilation of a covered work with other separate and independent
-works, which are not by their nature extensions of the covered work,
-and which are not combined with it such as to form a larger program,
-in or on a volume of a storage or distribution medium, is called an
-"aggregate" if the compilation and its resulting copyright are not
-used to limit the access or legal rights of the compilation's users
-beyond what the individual works permit.  Inclusion of a covered work
-in an aggregate does not cause this License to apply to the other
-parts of the aggregate.
-
-  6. Conveying Non-Source Forms.
-
-  You may convey a covered work in object code form under the terms
-of sections 4 and 5, provided that you also convey the
-machine-readable Corresponding Source under the terms of this License,
-in one of these ways:
-
-    a) Convey the object code in, or embodied in, a physical product
-    (including a physical distribution medium), accompanied by the
-    Corresponding Source fixed on a durable physical medium
-    customarily used for software interchange.
-
-    b) Convey the object code in, or embodied in, a physical product
-    (including a physical distribution medium), accompanied by a
-    written offer, valid for at least three years and valid for as
-    long as you offer spare parts or customer support for that product
-    model, to give anyone who possesses the object code either (1) a
-    copy of the Corresponding Source for all the software in the
-    product that is covered by this License, on a durable physical
-    medium customarily used for software interchange, for a price no
-    more than your reasonable cost of physically performing this
-    conveying of source, or (2) access to copy the
-    Corresponding Source from a network server at no charge.
-
-    c) Convey individual copies of the object code with a copy of the
-    written offer to provide the Corresponding Source.  This
-    alternative is allowed only occasionally and noncommercially, and
-    only if you received the object code with such an offer, in accord
-    with subsection 6b.
-
-    d) Convey the object code by offering access from a designated
-    place (gratis or for a charge), and offer equivalent access to the
-    Corresponding Source in the same way through the same place at no
-    further charge.  You need not require recipients to copy the
-    Corresponding Source along with the object code.  If the place to
-    copy the object code is a network server, the Corresponding Source
-    may be on a different server (operated by you or a third party)
-    that supports equivalent copying facilities, provided you maintain
-    clear directions next to the object code saying where to find the
-    Corresponding Source.  Regardless of what server hosts the
-    Corresponding Source, you remain obligated to ensure that it is
-    available for as long as needed to satisfy these requirements.
-
-    e) Convey the object code using peer-to-peer transmission, provided
-    you inform other peers where the object code and Corresponding
-    Source of the work are being offered to the general public at no
-    charge under subsection 6d.
-
-  A separable portion of the object code, whose source code is excluded
-from the Corresponding Source as a System Library, need not be
-included in conveying the object code work.
-
-  A "User Product" is either (1) a "consumer product", which means any
-tangible personal property which is normally used for personal, family,
-or household purposes, or (2) anything designed or sold for incorporation
-into a dwelling.  In determining whether a product is a consumer product,
-doubtful cases shall be resolved in favor of coverage.  For a particular
-product received by a particular user, "normally used" refers to a
-typical or common use of that class of product, regardless of the status
-of the particular user or of the way in which the particular user
-actually uses, or expects or is expected to use, the product.  A product
-is a consumer product regardless of whether the product has substantial
-commercial, industrial or non-consumer uses, unless such uses represent
-the only significant mode of use of the product.
-
-  "Installation Information" for a User Product means any methods,
-procedures, authorization keys, or other information required to install
-and execute modified versions of a covered work in that User Product from
-a modified version of its Corresponding Source.  The information must
-suffice to ensure that the continued functioning of the modified object
-code is in no case prevented or interfered with solely because
-modification has been made.
-
-  If you convey an object code work under this section in, or with, or
-specifically for use in, a User Product, and the conveying occurs as
-part of a transaction in which the right of possession and use of the
-User Product is transferred to the recipient in perpetuity or for a
-fixed term (regardless of how the transaction is characterized), the
-Corresponding Source conveyed under this section must be accompanied
-by the Installation Information.  But this requirement does not apply
-if neither you nor any third party retains the ability to install
-modified object code on the User Product (for example, the work has
-been installed in ROM).
-
-  The requirement to provide Installation Information does not include a
-requirement to continue to provide support service, warranty, or updates
-for a work that has been modified or installed by the recipient, or for
-the User Product in which it has been modified or installed.  Access to a
-network may be denied when the modification itself materially and
-adversely affects the operation of the network or violates the rules and
-protocols for communication across the network.
-
-  Corresponding Source conveyed, and Installation Information provided,
-in accord with this section must be in a format that is publicly
-documented (and with an implementation available to the public in
-source code form), and must require no special password or key for
-unpacking, reading or copying.
-
-  7. Additional Terms.
-
-  "Additional permissions" are terms that supplement the terms of this
-License by making exceptions from one or more of its conditions.
-Additional permissions that are applicable to the entire Program shall
-be treated as though they were included in this License, to the extent
-that they are valid under applicable law.  If additional permissions
-apply only to part of the Program, that part may be used separately
-under those permissions, but the entire Program remains governed by
-this License without regard to the additional permissions.
-
-  When you convey a copy of a covered work, you may at your option
-remove any additional permissions from that copy, or from any part of
-it.  (Additional permissions may be written to require their own
-removal in certain cases when you modify the work.)  You may place
-additional permissions on material, added by you to a covered work,
-for which you have or can give appropriate copyright permission.
-
-  Notwithstanding any other provision of this License, for material you
-add to a covered work, you may (if authorized by the copyright holders of
-that material) supplement the terms of this License with terms:
-
-    a) Disclaiming warranty or limiting liability differently from the
-    terms of sections 15 and 16 of this License; or
-
-    b) Requiring preservation of specified reasonable legal notices or
-    author attributions in that material or in the Appropriate Legal
-    Notices displayed by works containing it; or
-
-    c) Prohibiting misrepresentation of the origin of that material, or
-    requiring that modified versions of such material be marked in
-    reasonable ways as different from the original version; or
-
-    d) Limiting the use for publicity purposes of names of licensors or
-    authors of the material; or
-
-    e) Declining to grant rights under trademark law for use of some
-    trade names, trademarks, or service marks; or
-
-    f) Requiring indemnification of licensors and authors of that
-    material by anyone who conveys the material (or modified versions of
-    it) with contractual assumptions of liability to the recipient, for
-    any liability that these contractual assumptions directly impose on
-    those licensors and authors.
-
-  All other non-permissive additional terms are considered "further
-restrictions" within the meaning of section 10.  If the Program as you
-received it, or any part of it, contains a notice stating that it is
-governed by this License along with a term that is a further
-restriction, you may remove that term.  If a license document contains
-a further restriction but permits relicensing or conveying under this
-License, you may add to a covered work material governed by the terms
-of that license document, provided that the further restriction does
-not survive such relicensing or conveying.
-
-  If you add terms to a covered work in accord with this section, you
-must place, in the relevant source files, a statement of the
-additional terms that apply to those files, or a notice indicating
-where to find the applicable terms.
-
-  Additional terms, permissive or non-permissive, may be stated in the
-form of a separately written license, or stated as exceptions;
-the above requirements apply either way.
-
-  8. Termination.
-
-  You may not propagate or modify a covered work except as expressly
-provided under this License.  Any attempt otherwise to propagate or
-modify it is void, and will automatically terminate your rights under
-this License (including any patent licenses granted under the third
-paragraph of section 11).
-
-  However, if you cease all violation of this License, then your
-license from a particular copyright holder is reinstated (a)
-provisionally, unless and until the copyright holder explicitly and
-finally terminates your license, and (b) permanently, if the copyright
-holder fails to notify you of the violation by some reasonable means
-prior to 60 days after the cessation.
-
-  Moreover, your license from a particular copyright holder is
-reinstated permanently if the copyright holder notifies you of the
-violation by some reasonable means, this is the first time you have
-received notice of violation of this License (for any work) from that
-copyright holder, and you cure the violation prior to 30 days after
-your receipt of the notice.
-
-  Termination of your rights under this section does not terminate the
-licenses of parties who have received copies or rights from you under
-this License.  If your rights have been terminated and not permanently
-reinstated, you do not qualify to receive new licenses for the same
-material under section 10.
-
-  9. Acceptance Not Required for Having Copies.
-
-  You are not required to accept this License in order to receive or
-run a copy of the Program.  Ancillary propagation of a covered work
-occurring solely as a consequence of using peer-to-peer transmission
-to receive a copy likewise does not require acceptance.  However,
-nothing other than this License grants you permission to propagate or
-modify any covered work.  These actions infringe copyright if you do
-not accept this License.  Therefore, by modifying or propagating a
-covered work, you indicate your acceptance of this License to do so.
-
-  10. Automatic Licensing of Downstream Recipients.
-
-  Each time you convey a covered work, the recipient automatically
-receives a license from the original licensors, to run, modify and
-propagate that work, subject to this License.  You are not responsible
-for enforcing compliance by third parties with this License.
-
-  An "entity transaction" is a transaction transferring control of an
-organization, or substantially all assets of one, or subdividing an
-organization, or merging organizations.  If propagation of a covered
-work results from an entity transaction, each party to that
-transaction who receives a copy of the work also receives whatever
-licenses to the work the party's predecessor in interest had or could
-give under the previous paragraph, plus a right to possession of the
-Corresponding Source of the work from the predecessor in interest, if
-the predecessor has it or can get it with reasonable efforts.
-
-  You may not impose any further restrictions on the exercise of the
-rights granted or affirmed under this License.  For example, you may
-not impose a license fee, royalty, or other charge for exercise of
-rights granted under this License, and you may not initiate litigation
-(including a cross-claim or counterclaim in a lawsuit) alleging that
-any patent claim is infringed by making, using, selling, offering for
-sale, or importing the Program or any portion of it.
-
-  11. Patents.
-
-  A "contributor" is a copyright holder who authorizes use under this
-License of the Program or a work on which the Program is based.  The
-work thus licensed is called the contributor's "contributor version".
-
-  A contributor's "essential patent claims" are all patent claims
-owned or controlled by the contributor, whether already acquired or
-hereafter acquired, that would be infringed by some manner, permitted
-by this License, of making, using, or selling its contributor version,
-but do not include claims that would be infringed only as a
-consequence of further modification of the contributor version.  For
-purposes of this definition, "control" includes the right to grant
-patent sublicenses in a manner consistent with the requirements of
-this License.
-
-  Each contributor grants you a non-exclusive, worldwide, royalty-free
-patent license under the contributor's essential patent claims, to
-make, use, sell, offer for sale, import and otherwise run, modify and
-propagate the contents of its contributor version.
-
-  In the following three paragraphs, a "patent license" is any express
-agreement or commitment, however denominated, not to enforce a patent
-(such as an express permission to practice a patent or covenant not to
-sue for patent infringement).  To "grant" such a patent license to a
-party means to make such an agreement or commitment not to enforce a
-patent against the party.
-
-  If you convey a covered work, knowingly relying on a patent license,
-and the Corresponding Source of the work is not available for anyone
-to copy, free of charge and under the terms of this License, through a
-publicly available network server or other readily accessible means,
-then you must either (1) cause the Corresponding Source to be so
-available, or (2) arrange to deprive yourself of the benefit of the
-patent license for this particular work, or (3) arrange, in a manner
-consistent with the requirements of this License, to extend the patent
-license to downstream recipients.  "Knowingly relying" means you have
-actual knowledge that, but for the patent license, your conveying the
-covered work in a country, or your recipient's use of the covered work
-in a country, would infringe one or more identifiable patents in that
-country that you have reason to believe are valid.
-
-  If, pursuant to or in connection with a single transaction or
-arrangement, you convey, or propagate by procuring conveyance of, a
-covered work, and grant a patent license to some of the parties
-receiving the covered work authorizing them to use, propagate, modify
-or convey a specific copy of the covered work, then the patent license
-you grant is automatically extended to all recipients of the covered
-work and works based on it.
-
-  A patent license is "discriminatory" if it does not include within
-the scope of its coverage, prohibits the exercise of, or is
-conditioned on the non-exercise of one or more of the rights that are
-specifically granted under this License.  You may not convey a covered
-work if you are a party to an arrangement with a third party that is
-in the business of distributing software, under which you make payment
-to the third party based on the extent of your activity of conveying
-the work, and under which the third party grants, to any of the
-parties who would receive the covered work from you, a discriminatory
-patent license (a) in connection with copies of the covered work
-conveyed by you (or copies made from those copies), or (b) primarily
-for and in connection with specific products or compilations that
-contain the covered work, unless you entered into that arrangement,
-or that patent license was granted, prior to 28 March 2007.
-
-  Nothing in this License shall be construed as excluding or limiting
-any implied license or other defenses to infringement that may
-otherwise be available to you under applicable patent law.
-
-  12. No Surrender of Others' Freedom.
-
-  If conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot convey a
-covered work so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you may
-not convey it at all.  For example, if you agree to terms that obligate you
-to collect a royalty for further conveying from those to whom you convey
-the Program, the only way you could satisfy both those terms and this
-License would be to refrain entirely from conveying the Program.
-
-  13. Use with the GNU Affero General Public License.
-
-  Notwithstanding any other provision of this License, you have
-permission to link or combine any covered work with a work licensed
-under version 3 of the GNU Affero General Public License into a single
-combined work, and to convey the resulting work.  The terms of this
-License will continue to apply to the part which is the covered work,
-but the special requirements of the GNU Affero General Public License,
-section 13, concerning interaction through a network will apply to the
-combination as such.
-
-  14. Revised Versions of this License.
-
-  The Free Software Foundation may publish revised and/or new versions of
-the GNU General Public License from time to time.  Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-  Each version is given a distinguishing version number.  If the
-Program specifies that a certain numbered version of the GNU General
-Public License "or any later version" applies to it, you have the
-option of following the terms and conditions either of that numbered
-version or of any later version published by the Free Software
-Foundation.  If the Program does not specify a version number of the
-GNU General Public License, you may choose any version ever published
-by the Free Software Foundation.
-
-  If the Program specifies that a proxy can decide which future
-versions of the GNU General Public License can be used, that proxy's
-public statement of acceptance of a version permanently authorizes you
-to choose that version for the Program.
-
-  Later license versions may give you additional or different
-permissions.  However, no additional obligations are imposed on any
-author or copyright holder as a result of your choosing to follow a
-later version.
-
-  15. Disclaimer of Warranty.
-
-  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
-APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
-HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
-OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
-THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
-IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
-ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-
-  16. Limitation of Liability.
-
-  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
-THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
-GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
-USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
-DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
-PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
-EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
-SUCH DAMAGES.
-
-  17. Interpretation of Sections 15 and 16.
-
-  If the disclaimer of warranty and limitation of liability provided
-above cannot be given local legal effect according to their terms,
-reviewing courts shall apply local law that most closely approximates
-an absolute waiver of all civil liability in connection with the
-Program, unless a warranty or assumption of liability accompanies a
-copy of the Program in return for a fee.
-
-                     END OF TERMS AND CONDITIONS
-
-            How to Apply These Terms to Your New Programs
-
-  If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
-  To do so, attach the following notices to the program.  It is safest
-to attach them to the start of each source file to most effectively
-state the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
-    
-    Copyright (C)   
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see .
-
-Also add information on how to contact you by electronic and paper mail.
-
-  If the program does terminal interaction, make it output a short
-notice like this when it starts in an interactive mode:
-
-      Copyright (C)   
-    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
-    This is free software, and you are welcome to redistribute it
-    under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License.  Of course, your program's commands
-might be different; for a GUI interface, you would use an "about box".
-
-  You should also get your employer (if you work as a programmer) or school,
-if any, to sign a "copyright disclaimer" for the program, if necessary.
-For more information on this, and how to apply and follow the GNU GPL, see
-.
-
-  The GNU General Public License does not permit incorporating your program
-into proprietary programs.  If your program is a subroutine library, you
-may consider it more useful to permit linking proprietary applications with
-the library.  If this is what you want to do, use the GNU Lesser General
-Public License instead of this License.  But first, please read
-.
diff --git a/readlicense_oo/source/license/unx/LICENSE_en-US.html b/readlicense_oo/source/license/unx/LICENSE_en-US.html
deleted file mode 100644
index 6ebec8ffcd91..000000000000
--- a/readlicense_oo/source/license/unx/LICENSE_en-US.html
+++ /dev/null
@@ -1,877 +0,0 @@
-
-
-
-  
-  
-
-
-
(License text)

-
This product is made available subject to the terms of GNU Lesser
-General Public License Version 3. A copy of the LGPL license can be
-found at http://www.openoffice.org/license.html

-

-

-
Third Party Code Additional copyright
-notices and license terms applicable to portions of the Software are
-set forth in the THIRDPARTYLICENSEREADME.html file. 

-

-
All trademarks and registered trademarks mentioned herein are the
-property of their respective owners.

-

-
Copyright 2002,2008 Sun Microsystems, Inc.

-
This product has been created with contributions from the
-OpenOffice.org community, of which Sun Microsystems Inc. is the
-founding member. OpenOffice.org acknowledges all community members,
-especially those mentioned at
-http://www.openoffice.org/welcome/credits.html.

-

-

-
-
-		   GNU LESSER GENERAL PUBLIC LICENSE
-                       Version 3, 29 June 2007
-
- Copyright (C) 2007 Free Software Foundation, Inc. 
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-
-  This version of the GNU Lesser General Public License incorporates
-the terms and conditions of version 3 of the GNU General Public
-License, supplemented by the additional permissions listed below.
-
-  0. Additional Definitions. 
-
-  As used herein, "this License" refers to version 3 of the GNU Lesser
-General Public License, and the "GNU GPL" refers to version 3 of the GNU
-General Public License.
-
-  "The Library" refers to a covered work governed by this License,
-other than an Application or a Combined Work as defined below.
-
-  An "Application" is any work that makes use of an interface provided
-by the Library, but which is not otherwise based on the Library.
-Defining a subclass of a class defined by the Library is deemed a mode
-of using an interface provided by the Library.
-
-  A "Combined Work" is a work produced by combining or linking an
-Application with the Library.  The particular version of the Library
-with which the Combined Work was made is also called the "Linked
-Version".
-
-  The "Minimal Corresponding Source" for a Combined Work means the
-Corresponding Source for the Combined Work, excluding any source code
-for portions of the Combined Work that, considered in isolation, are
-based on the Application, and not on the Linked Version.
-
-  The "Corresponding Application Code" for a Combined Work means the
-object code and/or source code for the Application, including any data
-and utility programs needed for reproducing the Combined Work from the
-Application, but excluding the System Libraries of the Combined Work.
-
-  1. Exception to Section 3 of the GNU GPL.
-
-  You may convey a covered work under sections 3 and 4 of this License
-without being bound by section 3 of the GNU GPL.
-
-  2. Conveying Modified Versions.
-
-  If you modify a copy of the Library, and, in your modifications, a
-facility refers to a function or data to be supplied by an Application
-that uses the facility (other than as an argument passed when the
-facility is invoked), then you may convey a copy of the modified
-version:
-
-   a) under this License, provided that you make a good faith effort to
-   ensure that, in the event an Application does not supply the
-   function or data, the facility still operates, and performs
-   whatever part of its purpose remains meaningful, or
-
-   b) under the GNU GPL, with none of the additional permissions of
-   this License applicable to that copy.
-
-  3. Object Code Incorporating Material from Library Header Files.
-
-  The object code form of an Application may incorporate material from
-a header file that is part of the Library.  You may convey such object
-code under terms of your choice, provided that, if the incorporated
-material is not limited to numerical parameters, data structure
-layouts and accessors, or small macros, inline functions and templates
-(ten or fewer lines in length), you do both of the following:
-
-   a) Give prominent notice with each copy of the object code that the
-   Library is used in it and that the Library and its use are
-   covered by this License.
-
-   b) Accompany the object code with a copy of the GNU GPL and this license
-   document.
-
-  4. Combined Works.
-
-  You may convey a Combined Work under terms of your choice that,
-taken together, effectively do not restrict modification of the
-portions of the Library contained in the Combined Work and reverse
-engineering for debugging such modifications, if you also do each of
-the following:
-
-   a) Give prominent notice with each copy of the Combined Work that
-   the Library is used in it and that the Library and its use are
-   covered by this License.
-
-   b) Accompany the Combined Work with a copy of the GNU GPL and this license
-   document.
-
-   c) For a Combined Work that displays copyright notices during
-   execution, include the copyright notice for the Library among
-   these notices, as well as a reference directing the user to the
-   copies of the GNU GPL and this license document.
-
-   d) Do one of the following:
-
-       0) Convey the Minimal Corresponding Source under the terms of this
-       License, and the Corresponding Application Code in a form
-       suitable for, and under terms that permit, the user to
-       recombine or relink the Application with a modified version of
-       the Linked Version to produce a modified Combined Work, in the
-       manner specified by section 6 of the GNU GPL for conveying
-       Corresponding Source.
-
-       1) Use a suitable shared library mechanism for linking with the
-       Library.  A suitable mechanism is one that (a) uses at run time
-       a copy of the Library already present on the user's computer
-       system, and (b) will operate properly with a modified version
-       of the Library that is interface-compatible with the Linked
-       Version. 
-
-   e) Provide Installation Information, but only if you would otherwise
-   be required to provide such information under section 6 of the
-   GNU GPL, and only to the extent that such information is
-   necessary to install and execute a modified version of the
-   Combined Work produced by recombining or relinking the
-   Application with a modified version of the Linked Version. (If
-   you use option 4d0, the Installation Information must accompany
-   the Minimal Corresponding Source and Corresponding Application
-   Code. If you use option 4d1, you must provide the Installation
-   Information in the manner specified by section 6 of the GNU GPL
-   for conveying Corresponding Source.)
-
-  5. Combined Libraries.
-
-  You may place library facilities that are a work based on the
-Library side by side in a single library together with other library
-facilities that are not Applications and are not covered by this
-License, and convey such a combined library under terms of your
-choice, if you do both of the following:
-
-   a) Accompany the combined library with a copy of the same work based
-   on the Library, uncombined with any other library facilities,
-   conveyed under the terms of this License.
-
-   b) Give prominent notice with the combined library that part of it
-   is a work based on the Library, and explaining where to find the
-   accompanying uncombined form of the same work.
-
-  6. Revised Versions of the GNU Lesser General Public License.
-
-  The Free Software Foundation may publish revised and/or new versions
-of the GNU Lesser General Public License from time to time. Such new
-versions will be similar in spirit to the present version, but may
-differ in detail to address new problems or concerns.
-
-  Each version is given a distinguishing version number. If the
-Library as you received it specifies that a certain numbered version
-of the GNU Lesser General Public License "or any later version"
-applies to it, you have the option of following the terms and
-conditions either of that published version or of any later version
-published by the Free Software Foundation. If the Library as you
-received it does not specify a version number of the GNU Lesser
-General Public License, you may choose any version of the GNU Lesser
-General Public License ever published by the Free Software Foundation.
-
-  If the Library as you received it specifies that a proxy can decide
-whether future versions of the GNU Lesser General Public License shall
-apply, that proxy's public statement of acceptance of any version is
-permanent authorization for you to choose that version for the
-Library.
-
-
-
-                    GNU GENERAL PUBLIC LICENSE
-                       Version 3, 29 June 2007
-
- Copyright (C) 2007 Free Software Foundation, Inc. 
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-                            Preamble
-
-  The GNU General Public License is a free, copyleft license for
-software and other kinds of works.
-
-  The licenses for most software and other practical works are designed
-to take away your freedom to share and change the works.  By contrast,
-the GNU General Public License is intended to guarantee your freedom to
-share and change all versions of a program--to make sure it remains free
-software for all its users.  We, the Free Software Foundation, use the
-GNU General Public License for most of our software; it applies also to
-any other work released this way by its authors.  You can apply it to
-your programs, too.
-
-  When we speak of free software, we are referring to freedom, not
-price.  Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-them if you wish), that you receive source code or can get it if you
-want it, that you can change the software or use pieces of it in new
-free programs, and that you know you can do these things.
-
-  To protect your rights, we need to prevent others from denying you
-these rights or asking you to surrender the rights.  Therefore, you have
-certain responsibilities if you distribute copies of the software, or if
-you modify it: responsibilities to respect the freedom of others.
-
-  For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must pass on to the recipients the same
-freedoms that you received.  You must make sure that they, too, receive
-or can get the source code.  And you must show them these terms so they
-know their rights.
-
-  Developers that use the GNU GPL protect your rights with two steps:
-(1) assert copyright on the software, and (2) offer you this License
-giving you legal permission to copy, distribute and/or modify it.
-
-  For the developers' and authors' protection, the GPL clearly explains
-that there is no warranty for this free software.  For both users' and
-authors' sake, the GPL requires that modified versions be marked as
-changed, so that their problems will not be attributed erroneously to
-authors of previous versions.
-
-  Some devices are designed to deny users access to install or run
-modified versions of the software inside them, although the manufacturer
-can do so.  This is fundamentally incompatible with the aim of
-protecting users' freedom to change the software.  The systematic
-pattern of such abuse occurs in the area of products for individuals to
-use, which is precisely where it is most unacceptable.  Therefore, we
-have designed this version of the GPL to prohibit the practice for those
-products.  If such problems arise substantially in other domains, we
-stand ready to extend this provision to those domains in future versions
-of the GPL, as needed to protect the freedom of users.
-
-  Finally, every program is threatened constantly by software patents.
-States should not allow patents to restrict development and use of
-software on general-purpose computers, but in those that do, we wish to
-avoid the special danger that patents applied to a free program could
-make it effectively proprietary.  To prevent this, the GPL assures that
-patents cannot be used to render the program non-free.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.
-
-                       TERMS AND CONDITIONS
-
-  0. Definitions.
-
-  "This License" refers to version 3 of the GNU General Public License.
-
-  "Copyright" also means copyright-like laws that apply to other kinds of
-works, such as semiconductor masks.
-
-  "The Program" refers to any copyrightable work licensed under this
-License.  Each licensee is addressed as "you".  "Licensees" and
-"recipients" may be individuals or organizations.
-
-  To "modify" a work means to copy from or adapt all or part of the work
-in a fashion requiring copyright permission, other than the making of an
-exact copy.  The resulting work is called a "modified version" of the
-earlier work or a work "based on" the earlier work.
-
-  A "covered work" means either the unmodified Program or a work based
-on the Program.
-
-  To "propagate" a work means to do anything with it that, without
-permission, would make you directly or secondarily liable for
-infringement under applicable copyright law, except executing it on a
-computer or modifying a private copy.  Propagation includes copying,
-distribution (with or without modification), making available to the
-public, and in some countries other activities as well.
-
-  To "convey" a work means any kind of propagation that enables other
-parties to make or receive copies.  Mere interaction with a user through
-a computer network, with no transfer of a copy, is not conveying.
-
-  An interactive user interface displays "Appropriate Legal Notices"
-to the extent that it includes a convenient and prominently visible
-feature that (1) displays an appropriate copyright notice, and (2)
-tells the user that there is no warranty for the work (except to the
-extent that warranties are provided), that licensees may convey the
-work under this License, and how to view a copy of this License.  If
-the interface presents a list of user commands or options, such as a
-menu, a prominent item in the list meets this criterion.
-
-  1. Source Code.
-
-  The "source code" for a work means the preferred form of the work
-for making modifications to it.  "Object code" means any non-source
-form of a work.
-
-  A "Standard Interface" means an interface that either is an official
-standard defined by a recognized standards body, or, in the case of
-interfaces specified for a particular programming language, one that
-is widely used among developers working in that language.
-
-  The "System Libraries" of an executable work include anything, other
-than the work as a whole, that (a) is included in the normal form of
-packaging a Major Component, but which is not part of that Major
-Component, and (b) serves only to enable use of the work with that
-Major Component, or to implement a Standard Interface for which an
-implementation is available to the public in source code form.  A
-"Major Component", in this context, means a major essential component
-(kernel, window system, and so on) of the specific operating system
-(if any) on which the executable work runs, or a compiler used to
-produce the work, or an object code interpreter used to run it.
-
-  The "Corresponding Source" for a work in object code form means all
-the source code needed to generate, install, and (for an executable
-work) run the object code and to modify the work, including scripts to
-control those activities.  However, it does not include the work's
-System Libraries, or general-purpose tools or generally available free
-programs which are used unmodified in performing those activities but
-which are not part of the work.  For example, Corresponding Source
-includes interface definition files associated with source files for
-the work, and the source code for shared libraries and dynamically
-linked subprograms that the work is specifically designed to require,
-such as by intimate data communication or control flow between those
-subprograms and other parts of the work.
-
-  The Corresponding Source need not include anything that users
-can regenerate automatically from other parts of the Corresponding
-Source.
-
-  The Corresponding Source for a work in source code form is that
-same work.
-
-  2. Basic Permissions.
-
-  All rights granted under this License are granted for the term of
-copyright on the Program, and are irrevocable provided the stated
-conditions are met.  This License explicitly affirms your unlimited
-permission to run the unmodified Program.  The output from running a
-covered work is covered by this License only if the output, given its
-content, constitutes a covered work.  This License acknowledges your
-rights of fair use or other equivalent, as provided by copyright law.
-
-  You may make, run and propagate covered works that you do not
-convey, without conditions so long as your license otherwise remains
-in force.  You may convey covered works to others for the sole purpose
-of having them make modifications exclusively for you, or provide you
-with facilities for running those works, provided that you comply with
-the terms of this License in conveying all material for which you do
-not control copyright.  Those thus making or running the covered works
-for you must do so exclusively on your behalf, under your direction
-and control, on terms that prohibit them from making any copies of
-your copyrighted material outside their relationship with you.
-
-  Conveying under any other circumstances is permitted solely under
-the conditions stated below.  Sublicensing is not allowed; section 10
-makes it unnecessary.
-
-  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
-
-  No covered work shall be deemed part of an effective technological
-measure under any applicable law fulfilling obligations under article
-11 of the WIPO copyright treaty adopted on 20 December 1996, or
-similar laws prohibiting or restricting circumvention of such
-measures.
-
-  When you convey a covered work, you waive any legal power to forbid
-circumvention of technological measures to the extent such circumvention
-is effected by exercising rights under this License with respect to
-the covered work, and you disclaim any intention to limit operation or
-modification of the work as a means of enforcing, against the work's
-users, your or third parties' legal rights to forbid circumvention of
-technological measures.
-
-  4. Conveying Verbatim Copies.
-
-  You may convey verbatim copies of the Program's source code as you
-receive it, in any medium, provided that you conspicuously and
-appropriately publish on each copy an appropriate copyright notice;
-keep intact all notices stating that this License and any
-non-permissive terms added in accord with section 7 apply to the code;
-keep intact all notices of the absence of any warranty; and give all
-recipients a copy of this License along with the Program.
-
-  You may charge any price or no price for each copy that you convey,
-and you may offer support or warranty protection for a fee.
-
-  5. Conveying Modified Source Versions.
-
-  You may convey a work based on the Program, or the modifications to
-produce it from the Program, in the form of source code under the
-terms of section 4, provided that you also meet all of these conditions:
-
-    a) The work must carry prominent notices stating that you modified
-    it, and giving a relevant date.
-
-    b) The work must carry prominent notices stating that it is
-    released under this License and any conditions added under section
-    7.  This requirement modifies the requirement in section 4 to
-    "keep intact all notices".
-
-    c) You must license the entire work, as a whole, under this
-    License to anyone who comes into possession of a copy.  This
-    License will therefore apply, along with any applicable section 7
-    additional terms, to the whole of the work, and all its parts,
-    regardless of how they are packaged.  This License gives no
-    permission to license the work in any other way, but it does not
-    invalidate such permission if you have separately received it.
-
-    d) If the work has interactive user interfaces, each must display
-    Appropriate Legal Notices; however, if the Program has interactive
-    interfaces that do not display Appropriate Legal Notices, your
-    work need not make them do so.
-
-  A compilation of a covered work with other separate and independent
-works, which are not by their nature extensions of the covered work,
-and which are not combined with it such as to form a larger program,
-in or on a volume of a storage or distribution medium, is called an
-"aggregate" if the compilation and its resulting copyright are not
-used to limit the access or legal rights of the compilation's users
-beyond what the individual works permit.  Inclusion of a covered work
-in an aggregate does not cause this License to apply to the other
-parts of the aggregate.
-
-  6. Conveying Non-Source Forms.
-
-  You may convey a covered work in object code form under the terms
-of sections 4 and 5, provided that you also convey the
-machine-readable Corresponding Source under the terms of this License,
-in one of these ways:
-
-    a) Convey the object code in, or embodied in, a physical product
-    (including a physical distribution medium), accompanied by the
-    Corresponding Source fixed on a durable physical medium
-    customarily used for software interchange.
-
-    b) Convey the object code in, or embodied in, a physical product
-    (including a physical distribution medium), accompanied by a
-    written offer, valid for at least three years and valid for as
-    long as you offer spare parts or customer support for that product
-    model, to give anyone who possesses the object code either (1) a
-    copy of the Corresponding Source for all the software in the
-    product that is covered by this License, on a durable physical
-    medium customarily used for software interchange, for a price no
-    more than your reasonable cost of physically performing this
-    conveying of source, or (2) access to copy the
-    Corresponding Source from a network server at no charge.
-
-    c) Convey individual copies of the object code with a copy of the
-    written offer to provide the Corresponding Source.  This
-    alternative is allowed only occasionally and noncommercially, and
-    only if you received the object code with such an offer, in accord
-    with subsection 6b.
-
-    d) Convey the object code by offering access from a designated
-    place (gratis or for a charge), and offer equivalent access to the
-    Corresponding Source in the same way through the same place at no
-    further charge.  You need not require recipients to copy the
-    Corresponding Source along with the object code.  If the place to
-    copy the object code is a network server, the Corresponding Source
-    may be on a different server (operated by you or a third party)
-    that supports equivalent copying facilities, provided you maintain
-    clear directions next to the object code saying where to find the
-    Corresponding Source.  Regardless of what server hosts the
-    Corresponding Source, you remain obligated to ensure that it is
-    available for as long as needed to satisfy these requirements.
-
-    e) Convey the object code using peer-to-peer transmission, provided
-    you inform other peers where the object code and Corresponding
-    Source of the work are being offered to the general public at no
-    charge under subsection 6d.
-
-  A separable portion of the object code, whose source code is excluded
-from the Corresponding Source as a System Library, need not be
-included in conveying the object code work.
-
-  A "User Product" is either (1) a "consumer product", which means any
-tangible personal property which is normally used for personal, family,
-or household purposes, or (2) anything designed or sold for incorporation
-into a dwelling.  In determining whether a product is a consumer product,
-doubtful cases shall be resolved in favor of coverage.  For a particular
-product received by a particular user, "normally used" refers to a
-typical or common use of that class of product, regardless of the status
-of the particular user or of the way in which the particular user
-actually uses, or expects or is expected to use, the product.  A product
-is a consumer product regardless of whether the product has substantial
-commercial, industrial or non-consumer uses, unless such uses represent
-the only significant mode of use of the product.
-
-  "Installation Information" for a User Product means any methods,
-procedures, authorization keys, or other information required to install
-and execute modified versions of a covered work in that User Product from
-a modified version of its Corresponding Source.  The information must
-suffice to ensure that the continued functioning of the modified object
-code is in no case prevented or interfered with solely because
-modification has been made.
-
-  If you convey an object code work under this section in, or with, or
-specifically for use in, a User Product, and the conveying occurs as
-part of a transaction in which the right of possession and use of the
-User Product is transferred to the recipient in perpetuity or for a
-fixed term (regardless of how the transaction is characterized), the
-Corresponding Source conveyed under this section must be accompanied
-by the Installation Information.  But this requirement does not apply
-if neither you nor any third party retains the ability to install
-modified object code on the User Product (for example, the work has
-been installed in ROM).
-
-  The requirement to provide Installation Information does not include a
-requirement to continue to provide support service, warranty, or updates
-for a work that has been modified or installed by the recipient, or for
-the User Product in which it has been modified or installed.  Access to a
-network may be denied when the modification itself materially and
-adversely affects the operation of the network or violates the rules and
-protocols for communication across the network.
-
-  Corresponding Source conveyed, and Installation Information provided,
-in accord with this section must be in a format that is publicly
-documented (and with an implementation available to the public in
-source code form), and must require no special password or key for
-unpacking, reading or copying.
-
-  7. Additional Terms.
-
-  "Additional permissions" are terms that supplement the terms of this
-License by making exceptions from one or more of its conditions.
-Additional permissions that are applicable to the entire Program shall
-be treated as though they were included in this License, to the extent
-that they are valid under applicable law.  If additional permissions
-apply only to part of the Program, that part may be used separately
-under those permissions, but the entire Program remains governed by
-this License without regard to the additional permissions.
-
-  When you convey a copy of a covered work, you may at your option
-remove any additional permissions from that copy, or from any part of
-it.  (Additional permissions may be written to require their own
-removal in certain cases when you modify the work.)  You may place
-additional permissions on material, added by you to a covered work,
-for which you have or can give appropriate copyright permission.
-
-  Notwithstanding any other provision of this License, for material you
-add to a covered work, you may (if authorized by the copyright holders of
-that material) supplement the terms of this License with terms:
-
-    a) Disclaiming warranty or limiting liability differently from the
-    terms of sections 15 and 16 of this License; or
-
-    b) Requiring preservation of specified reasonable legal notices or
-    author attributions in that material or in the Appropriate Legal
-    Notices displayed by works containing it; or
-
-    c) Prohibiting misrepresentation of the origin of that material, or
-    requiring that modified versions of such material be marked in
-    reasonable ways as different from the original version; or
-
-    d) Limiting the use for publicity purposes of names of licensors or
-    authors of the material; or
-
-    e) Declining to grant rights under trademark law for use of some
-    trade names, trademarks, or service marks; or
-
-    f) Requiring indemnification of licensors and authors of that
-    material by anyone who conveys the material (or modified versions of
-    it) with contractual assumptions of liability to the recipient, for
-    any liability that these contractual assumptions directly impose on
-    those licensors and authors.
-
-  All other non-permissive additional terms are considered "further
-restrictions" within the meaning of section 10.  If the Program as you
-received it, or any part of it, contains a notice stating that it is
-governed by this License along with a term that is a further
-restriction, you may remove that term.  If a license document contains
-a further restriction but permits relicensing or conveying under this
-License, you may add to a covered work material governed by the terms
-of that license document, provided that the further restriction does
-not survive such relicensing or conveying.
-
-  If you add terms to a covered work in accord with this section, you
-must place, in the relevant source files, a statement of the
-additional terms that apply to those files, or a notice indicating
-where to find the applicable terms.
-
-  Additional terms, permissive or non-permissive, may be stated in the
-form of a separately written license, or stated as exceptions;
-the above requirements apply either way.
-
-  8. Termination.
-
-  You may not propagate or modify a covered work except as expressly
-provided under this License.  Any attempt otherwise to propagate or
-modify it is void, and will automatically terminate your rights under
-this License (including any patent licenses granted under the third
-paragraph of section 11).
-
-  However, if you cease all violation of this License, then your
-license from a particular copyright holder is reinstated (a)
-provisionally, unless and until the copyright holder explicitly and
-finally terminates your license, and (b) permanently, if the copyright
-holder fails to notify you of the violation by some reasonable means
-prior to 60 days after the cessation.
-
-  Moreover, your license from a particular copyright holder is
-reinstated permanently if the copyright holder notifies you of the
-violation by some reasonable means, this is the first time you have
-received notice of violation of this License (for any work) from that
-copyright holder, and you cure the violation prior to 30 days after
-your receipt of the notice.
-
-  Termination of your rights under this section does not terminate the
-licenses of parties who have received copies or rights from you under
-this License.  If your rights have been terminated and not permanently
-reinstated, you do not qualify to receive new licenses for the same
-material under section 10.
-
-  9. Acceptance Not Required for Having Copies.
-
-  You are not required to accept this License in order to receive or
-run a copy of the Program.  Ancillary propagation of a covered work
-occurring solely as a consequence of using peer-to-peer transmission
-to receive a copy likewise does not require acceptance.  However,
-nothing other than this License grants you permission to propagate or
-modify any covered work.  These actions infringe copyright if you do
-not accept this License.  Therefore, by modifying or propagating a
-covered work, you indicate your acceptance of this License to do so.
-
-  10. Automatic Licensing of Downstream Recipients.
-
-  Each time you convey a covered work, the recipient automatically
-receives a license from the original licensors, to run, modify and
-propagate that work, subject to this License.  You are not responsible
-for enforcing compliance by third parties with this License.
-
-  An "entity transaction" is a transaction transferring control of an
-organization, or substantially all assets of one, or subdividing an
-organization, or merging organizations.  If propagation of a covered
-work results from an entity transaction, each party to that
-transaction who receives a copy of the work also receives whatever
-licenses to the work the party's predecessor in interest had or could
-give under the previous paragraph, plus a right to possession of the
-Corresponding Source of the work from the predecessor in interest, if
-the predecessor has it or can get it with reasonable efforts.
-
-  You may not impose any further restrictions on the exercise of the
-rights granted or affirmed under this License.  For example, you may
-not impose a license fee, royalty, or other charge for exercise of
-rights granted under this License, and you may not initiate litigation
-(including a cross-claim or counterclaim in a lawsuit) alleging that
-any patent claim is infringed by making, using, selling, offering for
-sale, or importing the Program or any portion of it.
-
-  11. Patents.
-
-  A "contributor" is a copyright holder who authorizes use under this
-License of the Program or a work on which the Program is based.  The
-work thus licensed is called the contributor's "contributor version".
-
-  A contributor's "essential patent claims" are all patent claims
-owned or controlled by the contributor, whether already acquired or
-hereafter acquired, that would be infringed by some manner, permitted
-by this License, of making, using, or selling its contributor version,
-but do not include claims that would be infringed only as a
-consequence of further modification of the contributor version.  For
-purposes of this definition, "control" includes the right to grant
-patent sublicenses in a manner consistent with the requirements of
-this License.
-
-  Each contributor grants you a non-exclusive, worldwide, royalty-free
-patent license under the contributor's essential patent claims, to
-make, use, sell, offer for sale, import and otherwise run, modify and
-propagate the contents of its contributor version.
-
-  In the following three paragraphs, a "patent license" is any express
-agreement or commitment, however denominated, not to enforce a patent
-(such as an express permission to practice a patent or covenant not to
-sue for patent infringement).  To "grant" such a patent license to a
-party means to make such an agreement or commitment not to enforce a
-patent against the party.
-
-  If you convey a covered work, knowingly relying on a patent license,
-and the Corresponding Source of the work is not available for anyone
-to copy, free of charge and under the terms of this License, through a
-publicly available network server or other readily accessible means,
-then you must either (1) cause the Corresponding Source to be so
-available, or (2) arrange to deprive yourself of the benefit of the
-patent license for this particular work, or (3) arrange, in a manner
-consistent with the requirements of this License, to extend the patent
-license to downstream recipients.  "Knowingly relying" means you have
-actual knowledge that, but for the patent license, your conveying the
-covered work in a country, or your recipient's use of the covered work
-in a country, would infringe one or more identifiable patents in that
-country that you have reason to believe are valid.
-
-  If, pursuant to or in connection with a single transaction or
-arrangement, you convey, or propagate by procuring conveyance of, a
-covered work, and grant a patent license to some of the parties
-receiving the covered work authorizing them to use, propagate, modify
-or convey a specific copy of the covered work, then the patent license
-you grant is automatically extended to all recipients of the covered
-work and works based on it.
-
-  A patent license is "discriminatory" if it does not include within
-the scope of its coverage, prohibits the exercise of, or is
-conditioned on the non-exercise of one or more of the rights that are
-specifically granted under this License.  You may not convey a covered
-work if you are a party to an arrangement with a third party that is
-in the business of distributing software, under which you make payment
-to the third party based on the extent of your activity of conveying
-the work, and under which the third party grants, to any of the
-parties who would receive the covered work from you, a discriminatory
-patent license (a) in connection with copies of the covered work
-conveyed by you (or copies made from those copies), or (b) primarily
-for and in connection with specific products or compilations that
-contain the covered work, unless you entered into that arrangement,
-or that patent license was granted, prior to 28 March 2007.
-
-  Nothing in this License shall be construed as excluding or limiting
-any implied license or other defenses to infringement that may
-otherwise be available to you under applicable patent law.
-
-  12. No Surrender of Others' Freedom.
-
-  If conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot convey a
-covered work so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you may
-not convey it at all.  For example, if you agree to terms that obligate you
-to collect a royalty for further conveying from those to whom you convey
-the Program, the only way you could satisfy both those terms and this
-License would be to refrain entirely from conveying the Program.
-
-  13. Use with the GNU Affero General Public License.
-
-  Notwithstanding any other provision of this License, you have
-permission to link or combine any covered work with a work licensed
-under version 3 of the GNU Affero General Public License into a single
-combined work, and to convey the resulting work.  The terms of this
-License will continue to apply to the part which is the covered work,
-but the special requirements of the GNU Affero General Public License,
-section 13, concerning interaction through a network will apply to the
-combination as such.
-
-  14. Revised Versions of this License.
-
-  The Free Software Foundation may publish revised and/or new versions of
-the GNU General Public License from time to time.  Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-  Each version is given a distinguishing version number.  If the
-Program specifies that a certain numbered version of the GNU General
-Public License "or any later version" applies to it, you have the
-option of following the terms and conditions either of that numbered
-version or of any later version published by the Free Software
-Foundation.  If the Program does not specify a version number of the
-GNU General Public License, you may choose any version ever published
-by the Free Software Foundation.
-
-  If the Program specifies that a proxy can decide which future
-versions of the GNU General Public License can be used, that proxy's
-public statement of acceptance of a version permanently authorizes you
-to choose that version for the Program.
-
-  Later license versions may give you additional or different
-permissions.  However, no additional obligations are imposed on any
-author or copyright holder as a result of your choosing to follow a
-later version.
-
-  15. Disclaimer of Warranty.
-
-  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
-APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
-HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
-OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
-THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
-IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
-ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-
-  16. Limitation of Liability.
-
-  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
-THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
-GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
-USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
-DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
-PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
-EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
-SUCH DAMAGES.
-
-  17. Interpretation of Sections 15 and 16.
-
-  If the disclaimer of warranty and limitation of liability provided
-above cannot be given local legal effect according to their terms,
-reviewing courts shall apply local law that most closely approximates
-an absolute waiver of all civil liability in connection with the
-Program, unless a warranty or assumption of liability accompanies a
-copy of the Program in return for a fee.
-
-                     END OF TERMS AND CONDITIONS
-
-            How to Apply These Terms to Your New Programs
-
-  If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
-  To do so, attach the following notices to the program.  It is safest
-to attach them to the start of each source file to most effectively
-state the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
-    
-    Copyright (C)   
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see .
-
-Also add information on how to contact you by electronic and paper mail.
-
-  If the program does terminal interaction, make it output a short
-notice like this when it starts in an interactive mode:
-
-      Copyright (C)   
-    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
-    This is free software, and you are welcome to redistribute it
-    under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License.  Of course, your program's commands
-might be different; for a GUI interface, you would use an "about box".
-
-  You should also get your employer (if you work as a programmer) or school,
-if any, to sign a "copyright disclaimer" for the program, if necessary.
-For more information on this, and how to apply and follow the GNU GPL, see
-.
-
-  The GNU General Public License does not permit incorporating your program
-into proprietary programs.  If your program is a subroutine library, you
-may consider it more useful to permit linking proprietary applications with
-the library.  If this is what you want to do, use the GNU Lesser General
-Public License instead of this License.  But first, please read
-.
-
-

-
-
diff --git a/readlicense_oo/util/makefile.pmk b/readlicense_oo/util/makefile.pmk
index 7001f3939869..37f70734f5a0 100755
--- a/readlicense_oo/util/makefile.pmk
+++ b/readlicense_oo/util/makefile.pmk
@@ -8,8 +8,6 @@
 #
 # $RCSfile: makefile.pmk,v $
 #
-# $Revision: 1.19 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
@@ -32,64 +30,42 @@
 # --- Targets ------------------------------------------------------
 
 .IF "$(GUI)"=="UNX"
-SYSDOCS=$(foreach,j,$(READMEFILES) $(j:d)$(j:b:u)$(j:e:s/.txt//))
-.ELSE          # "$(GUI)"=="UNX"
-SYSDOCS=$(foreach,j,$(READMEFILES) $(j:d)$(j:b)$(j:e))
-.ENDIF          # "$(GUI)"=="UNX"
+# uppercase and no filename extension for txt
+SYSTEXTDOCS=$(foreach,i,$(alllangiso) $(MISC)$/$(GUI)$/README_$i)
+SYSHTMLDOCS=$(SYSTEXTDOCS:+".html")
+.ELSE		# "$(GUI)"=="UNX"
+SYSTEXTDOCS=$(foreach,i,$(alllangiso) $(MISC)$/$(GUI)$/readme_$i.txt)
+SYSHTMLDOCS=$(SYSTEXTDOCS:s/.txt/.html/)
+.ENDIF		# "$(GUI)"=="UNX"
 
-ALLDOCS:=$(foreach,i,$(alllangiso) $(foreach,j,$(READMEFILES) $(j:d)$(j:b)_$i$(j:e)))
-ALLSYSDOCS:=$(foreach,i,$(alllangiso) $(foreach,j,$(SYSDOCS) $(j:d)$(GUI)$/$(j:b)_$i$(j:e)))
-
-.IF "$(WITH_LANG)"!="en-US"
-MERGEDXRM=$(COMMONMISC)$/$(TARGET)$/$(READMEFILES:b:+".xrm")
-MERGEDXRMDIR=$(COMMONMISC)$/$(TARGET)
-.ELSE			# "$(WITH_LANG)"!="en-US"
-MERGEDXRM=$(READMEFILES:b:+".xrm")
-MERGEDXRMDIR=.
-.ENDIF			# "$(WITH_LANG)"!="en-US"
+.IF "$(WITH_LANG)"!=""
+MERGEDXRM=$(COMMONMISC)$/$(TARGET)$/readme.xrm
+.ELSE		# "$(WITH_LANG)"!=""
+MERGEDXRM=.$/readme.xrm
+.ENDIF		# "$(WITH_LANG)"!=""
 
 .INCLUDE : target.mk
 
-ALLTAR : $(ALLSYSDOCS)
+ALLTAR : $(SYSTEXTDOCS) $(SYSHTMLDOCS)
 
-$(ALLDOCS) : $(MERGEDXRMDIR)$/$(READMEFILES:b:+".xrm") $(PRJ)$/docs/readme.xsl $(COMMONMISC)$/readme.dtd
-
-$(COMMONMISC)$/readme.dtd : ..$/readme.dtd
+$(COMMONMISC)$/readme.dtd : ..$/readme.dtd  
+    $(MKDIRHIER) $(MISC)$/$(GUI)
     $(COPY) $< $@
 
-$(MISC)$/$(GUI)$/README%.html : $(MISC)$/readme%.html
-    @+-$(MKDIRHIER) $(@:d)
-    +$(COPY) $< $@
-   
-$(MISC)$/$(GUI)$/README% : $(MISC)$/readme%.txt
-    @+-$(MKDIRHIER) $(@:d)
-    +$(COPY) $< $@
-   
-$(MISC)$/$(GUI)$/readme% : $(MISC)$/readme%
-    @+-$(MKDIRHIER) $(@:d)
-    +$(COPY) $< $@
-   
-$(MISC)$/readme%.html :
-    @+-$(MKDIRHIER) $(@:d)
-    $(XSLTPROC) --nonet -o $@ \
-             --stringparam os1 $(OS) \
-             --stringparam gui1 $(GUI) \
-             --stringparam cp1 $(CPUNAME) \
-             --stringparam com1 $(COM) \
-             --stringparam lang1 $(@:b:s/_/./:e:s/.//) \
-             --stringparam type html \
-         ..$/readme.xsl \
-             $(subst,_$(@:b:s/_/./:e:s/.//), $(MERGEDXRMDIR)$/$(@:b).xrm)
+virtual : $(MERGEDXRM) $(COMMONMISC)$/readme.dtd $(PRJ)$/docs/readme.xsl
 
-$(MISC)$/readme%.txt :
-    @+-$(MKDIRHIER) $(@:d)
-    $(SED) "s#method=\(.\)html..*#method=\1text\1/>#" < ..$/readme.xsl | \
-             $(XSLTPROC) --nonet -o $@ \
-             --stringparam os1 $(OS) \
-             --stringparam gui1 $(GUI) \
-             --stringparam cp1 $(CPUNAME) \
-             --stringparam com1 $(COM) \
-             --stringparam lang1 $(@:b:s/_/./:e:s/.//) \
-             --stringparam type text \
-             - \
-             $(subst,_$(@:b:s/_/./:e:s/.//), $(MERGEDXRMDIR)$/$(@:b).xrm)
+$(MISC)$/readme_text.xsl : virtual
+    $(SED) 's#method="html".*>#method="text"/>#' < ..$/readme.xsl > $@
+
+$(MISC)$/$(GUI)$/$(eq,$(GUI),WNT readme README)_%.html : 'virtual'
+    $(XSLTPROC) --nonet -o $@ \
+    --stringparam os1 $(OS)	--stringparam gui1 $(GUI)	--stringparam com1  $(COM) \
+    --stringparam cp1 $(CPUNAME)	--stringparam type html	--stringparam lang1 $* \
+    ..$/readme.xsl	$(MERGEDXRM)
+
+# no percent-rule to avoid ambiguous inference chains for README_.html 
+$(SYSTEXTDOCS) : $(MISC)$/readme_text.xsl
+    $(XSLTPROC) --nonet -o $@ \
+    --stringparam os1 $(OS)	--stringparam gui1 $(GUI)	--stringparam com1  $(COM) \
+    --stringparam cp1 $(CPUNAME)	--stringparam type text	--stringparam lang1 $(@:b:s/readme_//:s/README_//) \
+    $<	$(MERGEDXRM)