svn commit: r1308922 - in /incubator/ooo/trunk/main: LICENSE LICENSE_aggregated NOTICE_aggregated NOTICE_category_b configure.in

[hd...@apache.org]

Author: hdu
Date: Tue Apr  3 14:05:09 2012
New Revision: 1308922

URL: http://svn.apache.org/viewvc?rev=1308922&view=rev
Log:
#i119168# updated configure help for category-b/aggregation instructions and update license/notice boilerplate text

Modified:
    incubator/ooo/trunk/main/LICENSE
    incubator/ooo/trunk/main/LICENSE_aggregated
    incubator/ooo/trunk/main/NOTICE_aggregated
    incubator/ooo/trunk/main/NOTICE_category_b
    incubator/ooo/trunk/main/configure.in

Modified: incubator/ooo/trunk/main/LICENSE
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/LICENSE?rev=1308922&r1=1308921&r2=1308922&view=diff
==============================================================================
--- incubator/ooo/trunk/main/LICENSE (original)
+++ incubator/ooo/trunk/main/LICENSE Tue Apr  3 14:05:09 2012
@@ -1,4 +1,3 @@
-
                                  Apache License
                            Version 2.0, January 2004
                         http://www.apache.org/licenses/
@@ -187,7 +186,7 @@
       same "printed page" as the copyright notice for easier
       identification within third-party archives.
 
-   Copyright [yyyy] [name of copyright owner]
+   Copyright 2012 Apache Software Foundation
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.

Modified: incubator/ooo/trunk/main/LICENSE_aggregated
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/LICENSE_aggregated?rev=1308922&r1=1308921&r2=1308922&view=diff
==============================================================================
--- incubator/ooo/trunk/main/LICENSE_aggregated (original)
+++ incubator/ooo/trunk/main/LICENSE_aggregated Tue Apr  3 14:05:09 2012
@@ -5,7 +5,10 @@ dictionary extensions that are merely ag
 of end users.
 Basis for this aggregation is Apache JIRA issue LEGAL-117
 - https://issues.apache.org/jira/browse/LEGAL-117
-As these dictionary extensions are only aggregated
+These parts are only included in binary form.
+
+In the case of Apache OpenOffice these parts only get aggregated
+when the configure option --with-bundled-extension-blobs or
+--enable-bundled-dictionaries have been requested.
+When you use these options make sure to add the license here:
 
-The licenses of the aggregated dictionary extensions are typically
-GNU General Public License and/or GNU Lesser General Public License.

Modified: incubator/ooo/trunk/main/NOTICE_aggregated
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/NOTICE_aggregated?rev=1308922&r1=1308921&r2=1308922&view=diff
==============================================================================
--- incubator/ooo/trunk/main/NOTICE_aggregated (original)
+++ incubator/ooo/trunk/main/NOTICE_aggregated Tue Apr  3 14:05:09 2012
@@ -0,0 +1,9 @@
+___
+
+In the case of Apache OpenOffice some parts only get aggregated
+when the configure option --with-bundled-extension-blobs or
+--enable-bundled-dictionaries have been requested.
+When you use these options make sure to comply with the
+distribution requirements of these packages by extending
+this file with the notices recommended by them:
+

Modified: incubator/ooo/trunk/main/NOTICE_category_b
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/NOTICE_category_b?rev=1308922&r1=1308921&r2=1308922&view=diff
==============================================================================
--- incubator/ooo/trunk/main/NOTICE_category_b (original)
+++ incubator/ooo/trunk/main/NOTICE_category_b Tue Apr  3 14:05:09 2012
@@ -0,0 +1,7 @@
+___
+
+Apache OpenOffice has some optional parts that only get included
+when the configure option --enable-category-b has been requested.
+When you used this option make sure to comply with the
+distribution requirements of these parts by extending
+this file with the notices recommended by them:

Modified: incubator/ooo/trunk/main/configure.in
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/configure.in?rev=1308922&r1=1308921&r2=1308922&view=diff
==============================================================================
--- incubator/ooo/trunk/main/configure.in (original)
+++ incubator/ooo/trunk/main/configure.in Tue Apr  3 14:05:09 2012
@@ -331,6 +331,8 @@ AC_ARG_WITH(bundled-extension-blobs,
                           that are to be bundled as-is for installation as extensions
                           at the first program start. Make sure to only bundle extensions
                           which can be installed without requiring a license dialog
+                          and comply with their distribution requirements by updating the
+                          files LICENSE_aggregated and NOTICE_aggregated accordingly
 ],,)
 #AC_ARG_WITH(bundled-prereg-extensions,
 #[  --with-bundled-prereg-extensions Whitespace seperated list of files in the tarball directory that
@@ -339,7 +341,9 @@ AC_ARG_WITH(bundled-extension-blobs,
 #],,)
 AC_ARG_ENABLE(bundled-dictionaries,
 [  --enable-bundled-dictionaries  Download dictionaries (spelling, hyphenation, thesaurus)
-                           according to main/extensions.lst and bundle them.
+                           according to main/extensions.lst and bundle them. Make sure to
+                           comply with their distribution requirements and update the
+                           files LICENSE_aggregated and NOTICE_aggregated accordingly
 ],,enable_bundled_dictionaries=no)
 
 # Remove the following switches when not in release mode.