incubator-ooo-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Dave Fisher <dave2w...@comcast.net>
Subject Re: svn commit: r1220578 - /incubator/ooo/ooo-site/trunk/content/license.html
Date Mon, 19 Dec 2011 20:09:50 GMT
Hi Pedro,

On Dec 19, 2011, at 2:49 PM, Pedro Giffuni wrote:

> Hello,
> 
> I think we just have to remove a lot of stuff that is
> not relevant anymore. I'll try my hand at cleaning some
> of it but I am just too busy lately and I don't really
> like to leave unfinished stuff here and there.

Let's be clear - we need to leave the current page alone as it is the legacy 3rd party licenses
and must be retained.

> 
> The icon coloring campaign will suffer, sorry :(

Do the icon coloring that is more important. There is no hurry with this it is for release
prep and Dennis has a good point about the LICENSE and NOTICE files being the proper source.

Regards,
Dave


> 
> Pedro.
> 
> --- Lun 19/12/11, Dennis E. Hamilton <dennis.hamilton@acm.org> ha scritto:
> 
>> Technically, I think these are to be
>> replaced by an appropriate combination of LICENSE and NOTICE
>> files, where the ones for a binary release will be different
>> than the source release because of bundled stuff.
>> 
>> - Dennis
>> 
>> -----Original Message-----
>> From: Dave Fisher [mailto:dave2wave@comcast.net]
>> 
>> Sent: Monday, December 19, 2011 09:23
>> To: ooo-dev@incubator.apache.org
>> Subject: Re: svn commit: r1220578 -
>> /incubator/ooo/ooo-site/trunk/content/license.html
>> 
>> Hi Pedro,
>> 
>> Thanks for this! There is another area that will need
>> consideration and careful attention in the future.
>> 
>> http://ooo-site.apache.org/external/3.0/THIRDPARTYLICENSEREADME.html
>> 
>> We will need a version for 3.4:
>> 
>> http://ooo-site.apache.org/external/3.4/THIRDPARTYLICENSEREADME.html
>> 
>> And this page needs to be updated.
>> 
>> http://ooo-site.apache.org/external/
>> 
>> Regards,
>> Dave
>> 
>> On Dec 18, 2011, at 8:13 PM, pfg@apache.org
>> wrote:
>> 
>>> Author: pfg
>>> Date: Mon Dec 19 01:13:35 2011
>>> New Revision: 1220578
>>> 
>>> URL: http://svn.apache.org/viewvc?rev=1220578&view=rev
>>> Log:
>>> Recall the LGPL as the license of previous releases:
>> change most verbs to past tense. This has to be revised or
>> preferably just removed.
>>> 
>>> Modified:
>>>    
>> incubator/ooo/ooo-site/trunk/content/license.html
>>> 
>>> Modified:
>> incubator/ooo/ooo-site/trunk/content/license.html
>>> URL: http://svn.apache.org/viewvc/incubator/ooo/ooo-site/trunk/content/license.html?rev=1220578&r1=1220577&r2=1220578&view=diff
>>> 
>> ==============================================================================
>>> --- incubator/ooo/ooo-site/trunk/content/license.html
>> (original)
>>> +++ incubator/ooo/ooo-site/trunk/content/license.html
>> Mon Dec 19 01:13:35 2011
>>> @@ -17,19 +17,18 @@
>>> 
>>> 
>>> 
>>> -<h2>Licenses of current Releases of the
>> OpenOffice.org Suite</h2>
>>> +<h2>Licenses of previous Releases of the
>> OpenOffice.org Suite</h2>
>>> 
>>> -<p>OpenOffice.org uses a single open-source
>> license for the source code and a separate documentation
>> license for most documents published on the website
>>> -without the intention of being included in the
>> product. The source-code license is the GNU Lesser General
>> Public License. Effective OpenOffice.org 3.0
>>> -Beta, OpenOffice.org uses the <a
>> href="licenses/lgpl_license.html">LGPL v3</a>. The
>> document license is the Public Document License
>> (PDL).</p>
>>> -
>>> -<p>Works beside code donated to the project
>> under cover of the Oracle Contributor Agreement (OCA) are
>> held jointly by Oracle for the project under the
>>> -project's prevailing license, in this case, the LGPL
>> v.3. Even if you have already submitted a copyright
>> agreement (e.g., the SCA or its predecessors),
>>> -you may also sign the PDL per work contributed, in
>> which case the PDL takes precendence. In some cases, we also
>> permit the use of the
>>> -<span class="Header"> Creative Commons
>> Attribution License (<a href="http://creativecommons.org/licenses/by-nd/2.5/">&quot;Attribution-NoDerivs
>> 2.5&quot;</a>).
>>> +<p>In past release under SUN and Oracle
>> Unmbrella OpenOffice.org used a single open-source license
>> for the source code and a separate documentation license for
>> most documents published on the website
>>> +without the intention of being included in the
>> product. The source-code license was the GNU Lesser General
>> Public License. Effective OpenOffice.org 3.0
>>> +Beta, OpenOffice.org used the <a
>> href="licenses/lgpl_license.html">LGPL v3</a>. The
>> document license was the Public Document License
>> (PDL).</p>
>>> +
>>> +<p>Works beside code donated to the project
>> under cover of the Oracle Contributor Agreement (OCA) were
>> held jointly by Oracle for the project under the
>>> +project's prevailing license, in this case, the LGPL
>> v.3. Even if you had already submitted a copyright agreement
>> (e.g., the SCA or its predecessors),
>>> +you could also sign the PDL per work contributed, in
>> which case the PDL took precendence. In some cases, the use
>> of the
>>> +<span class="Header"> Creative Commons
>> Attribution License (<a href="http://creativecommons.org/licenses/by-nd/2.5/">&quot;Attribution-NoDerivs
>> 2.5&quot;</a>) was also permitted.
>>> See <a href="#below">below</a> for details
>> on the circumstances of using this
>> license.</span></p>
>>> 
>>> -<p>Copies of the licenses are available. The
>> PDL is in a static and editable form, so that it can be used
>> as designed:</p>
>>> 
>>> <ul>
>>>    <li>
>>> @@ -50,10 +49,10 @@ http://www.gnu.org/licenses/gpl-faq.html
>>> 
>>> <p class="Header">Code</p>
>>> 
>>> -<p>In order to contribute code to the project,
>> you must sign and submit the Oracle Contributor Agreement
>> (OCA). This agreement jointly assigns copyright
>>> +<p>In order to contribute code to the project,
>> you had to sign and submit the Oracle Contributor Agreement
>> (OCA). This agreement jointly assigned copyright
>>> over your work to yourself and to Oracle. Details are
>> available on the &quot;
>>> <a
>> href="/contributing/programming.html#sca">Contributing</a>&quot;
>> page, and you can find a pdf of the OCA there. If you have
>>> -questions on how it works, the <a
>> href="FAQs/faq-questions.html#licensing">FAQ:
>> Licensing</a> section should answer them. The page
>> also has guidelines on
>>> +questions on how it worked, the <a
>> href="FAQs/faq-questions.html#licensing">FAQ:
>> Licensing</a> section should answer them. The page
>> also has guidelines on
>>> the use of the licenses.
>>> 
>>> <p class="Header"><a id="below"
>> name="below"></a>Other Works</p>
>>> 
>>> 
>> 
>> 


Mime
View raw message