diff options
| -rw-r--r-- | LICENSE | 3 | ||||
| -rw-r--r-- | LICENSE_aggregated | 9 | ||||
| -rw-r--r-- | NOTICE_aggregated | 9 | ||||
| -rw-r--r-- | NOTICE_category_b | 7 | ||||
| -rw-r--r-- | configure.in | 6 |
5 files changed, 28 insertions, 6 deletions
@@ -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. diff --git a/LICENSE_aggregated b/LICENSE_aggregated index 563e0bdbac38..d3d75a94ed36 100644 --- a/LICENSE_aggregated +++ b/LICENSE_aggregated @@ -5,7 +5,10 @@ dictionary extensions that are merely aggregated for the convenience 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. diff --git a/NOTICE_aggregated b/NOTICE_aggregated index e69de29bb2d1..1ca9194faa1b 100644 --- a/NOTICE_aggregated +++ b/NOTICE_aggregated @@ -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: + diff --git a/NOTICE_category_b b/NOTICE_category_b index e69de29bb2d1..34a61d6e3481 100644 --- a/NOTICE_category_b +++ b/NOTICE_category_b @@ -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: diff --git a/configure.in b/configure.in index c1b584109ddd..cb176fd9f717 100644 --- a/configure.in +++ b/configure.in @@ -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. |