[openoffice] branch trunk updated: Save getuid only for Solaris (do we even support that anymre)?
This is an automated email from the ASF dual-hosted git repository.
jim pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/openoffice.git
The following commit(s) were added to refs/heads/trunk by this push:
new d921515 Save getuid only for Solaris (do we even support that anymre)?
d921515 is described below
commit d921515fcc11f846c699c95d0d3d2e52dd7a4ea3
Author: Jim Jagielski
AuthorDate: Mon Jan 4 07:46:24 2021 -0500
Save getuid only for Solaris (do we even support that anymre)?
---
main/solenv/bin/modules/installer/simplepackage.pm | 8 ++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/main/solenv/bin/modules/installer/simplepackage.pm
b/main/solenv/bin/modules/installer/simplepackage.pm
index 89ca043..6bbcdde 100644
--- a/main/solenv/bin/modules/installer/simplepackage.pm
+++ b/main/solenv/bin/modules/installer/simplepackage.pm
@@ -549,14 +549,18 @@ sub create_package
}
else
{
- # getting the path of the getuid.so (only required for Solaris
and Linux)
+ # getting the path of the getuid.so (Solaris) or fakeroot
(Linux)
my $getuidlibrary = "";
my $ldpreloadstring = "";
- if (( $installer::globals::issolarisbuild ) || (
$installer::globals::islinuxbuild ))
+ if ( $installer::globals::issolarisbuild )
{
$getuidlibrary =
installer::download::get_path_for_library($includepatharrayref);
if ( $getuidlibrary ne "" ) { $ldpreloadstring =
"LD_PRELOAD=" . $getuidlibrary; }
}
+ elsif ( $installer::globals::islinuxbuild )
+ {
+ $ldpreloadstring = $ENV{'FAKEROOT'};
+ }
$systemcall = "cd $tempdir; $ldpreloadstring tar -cf - . | gzip
> $archive";
}
[openoffice] branch AOO42X updated: Save getuid only for Solaris (do we even support that anymre)?
This is an automated email from the ASF dual-hosted git repository.
jim pushed a commit to branch AOO42X
in repository https://gitbox.apache.org/repos/asf/openoffice.git
The following commit(s) were added to refs/heads/AOO42X by this push:
new d45d6f4 Save getuid only for Solaris (do we even support that anymre)?
d45d6f4 is described below
commit d45d6f460c54bf1c83c0fd28a669498f82419a21
Author: Jim Jagielski
AuthorDate: Mon Jan 4 07:46:24 2021 -0500
Save getuid only for Solaris (do we even support that anymre)?
(cherry picked from commit d921515fcc11f846c699c95d0d3d2e52dd7a4ea3)
---
main/solenv/bin/modules/installer/simplepackage.pm | 8 ++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/main/solenv/bin/modules/installer/simplepackage.pm
b/main/solenv/bin/modules/installer/simplepackage.pm
index 89ca043..6bbcdde 100644
--- a/main/solenv/bin/modules/installer/simplepackage.pm
+++ b/main/solenv/bin/modules/installer/simplepackage.pm
@@ -549,14 +549,18 @@ sub create_package
}
else
{
- # getting the path of the getuid.so (only required for Solaris
and Linux)
+ # getting the path of the getuid.so (Solaris) or fakeroot
(Linux)
my $getuidlibrary = "";
my $ldpreloadstring = "";
- if (( $installer::globals::issolarisbuild ) || (
$installer::globals::islinuxbuild ))
+ if ( $installer::globals::issolarisbuild )
{
$getuidlibrary =
installer::download::get_path_for_library($includepatharrayref);
if ( $getuidlibrary ne "" ) { $ldpreloadstring =
"LD_PRELOAD=" . $getuidlibrary; }
}
+ elsif ( $installer::globals::islinuxbuild )
+ {
+ $ldpreloadstring = $ENV{'FAKEROOT'};
+ }
$systemcall = "cd $tempdir; $ldpreloadstring tar -cf - . | gzip
> $archive";
}
[openoffice] branch trunk updated: Fixed typos, removed whitespace
This is an automated email from the ASF dual-hosted git repository.
mseidel pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/openoffice.git
The following commit(s) were added to refs/heads/trunk by this push:
new b556d77 Fixed typos, removed whitespace
b556d77 is described below
commit b556d77e0a6c6a9db178b78826704c50983873c0
Author: mseidel
AuthorDate: Mon Jan 4 16:06:31 2021 +0100
Fixed typos, removed whitespace
---
.../filter/detection/typeDetection/Helper.java | 179 +++--
1 file changed, 90 insertions(+), 89 deletions(-)
diff --git a/main/filter/qa/complex/filter/detection/typeDetection/Helper.java
b/main/filter/qa/complex/filter/detection/typeDetection/Helper.java
index 18cf8bc..a75d5e2 100644
--- a/main/filter/qa/complex/filter/detection/typeDetection/Helper.java
+++ b/main/filter/qa/complex/filter/detection/typeDetection/Helper.java
@@ -1,5 +1,5 @@
/**
- *
+ *
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -7,16 +7,16 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
*/
@@ -44,27 +44,27 @@ import util.utils;
/** Helper class for "TypeDetection"
* This class do file hanlding.
*/
-public class Helper {
-
+public class Helper {
+
/** The runner log writer
* @member m_logfor log purposes
- * @member m_sTestDocPath directory for seraching files to load
- * @member m_vFiles list of all files describet in "files.csv"
- * @member m_hFileURLs contains the postition of a file name in the
m_vFiles Vector
- * @member m_hFileTypes contains the postition of a file type in the
m_vFiles Vector
+ * @member m_sTestDocPath directory for searching files to load
+ * @member m_vFiles list of all files described in "files.csv"
+ * @member m_hFileURLs contains the position of a file name in the
m_vFiles Vector
+ * @member m_hFileTypes contains the position of a file type in the
m_vFiles Vector
* @member m_param the test parameters
*/
-
+
LogWriter m_log = null;
String m_sTestDocPath = null;
-
+
Vector m_vFiles = null;
-
+
Hashtable m_hFileURLs = new Hashtable();
-
+
Hashtable m_hFileTypes = new Hashtable();
-
+
TestParameters m_param = null;
/**
@@ -76,50 +76,50 @@ public class Helper {
*
* @param log the log writer
*/
-
+
public Helper(TestParameters param, LogWriter log) {
m_param = param;
m_log = log;
-
-
+
+
// get all files from the given directory
m_sTestDocPath = (String)param.get("TestDocumentPath");
// get all files from "files.csv"
m_vFiles = getToDoList((String)m_param.get("csv.files"));
-
+
createFilesList();
}
-
+
/** Reads a comma separated file (CSV). Every line of the file is
- * repesented by an Vector entry. Every data entry of a row
is
+ * represented by an Vector entry. Every data entry of a row
is
* also stored in a Vector. So the returned value is a
* Vector[][] where the first dimension represents a row
- * and the second dimenesion inclueds the data values.
+ * and the second dimension includes the data values.
* @param csvFileName the name of the csv file
* @return Vector filled with Vector filled with data of a row
*/
public Vector getToDoList(String csvFileName){
-
- try {
-
+
+ try {
+
Vector vAll = new Vector();
Vector vFields = new Vector();
-
+
// get content of file
Vector content = getCSVFileContent(csvFileName);
-
+
// remove superfluous content like "#" started lines
content = removeSuperfluousContent(content);
-
+
// replace all place holders in file
content = replacePlaceHolder(content);
-
+
// create Enumeration
Enumeration contentEnum = content.elements();
-
+
// the first line contains field names of the columns
// split line by ";"
String
[openoffice] branch AOO42X updated: Fixed typos, removed whitespace
This is an automated email from the ASF dual-hosted git repository.
mseidel pushed a commit to branch AOO42X
in repository https://gitbox.apache.org/repos/asf/openoffice.git
The following commit(s) were added to refs/heads/AOO42X by this push:
new 7de2d4d Fixed typos, removed whitespace
7de2d4d is described below
commit 7de2d4d7a8e7188633f10daf107e662a13b72eed
Author: mseidel
AuthorDate: Mon Jan 4 16:06:31 2021 +0100
Fixed typos, removed whitespace
(cherry picked from commit b556d77e0a6c6a9db178b78826704c50983873c0)
---
.../filter/detection/typeDetection/Helper.java | 179 +++--
1 file changed, 90 insertions(+), 89 deletions(-)
diff --git a/main/filter/qa/complex/filter/detection/typeDetection/Helper.java
b/main/filter/qa/complex/filter/detection/typeDetection/Helper.java
index 18cf8bc..a75d5e2 100644
--- a/main/filter/qa/complex/filter/detection/typeDetection/Helper.java
+++ b/main/filter/qa/complex/filter/detection/typeDetection/Helper.java
@@ -1,5 +1,5 @@
/**
- *
+ *
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -7,16 +7,16 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
*/
@@ -44,27 +44,27 @@ import util.utils;
/** Helper class for "TypeDetection"
* This class do file hanlding.
*/
-public class Helper {
-
+public class Helper {
+
/** The runner log writer
* @member m_logfor log purposes
- * @member m_sTestDocPath directory for seraching files to load
- * @member m_vFiles list of all files describet in "files.csv"
- * @member m_hFileURLs contains the postition of a file name in the
m_vFiles Vector
- * @member m_hFileTypes contains the postition of a file type in the
m_vFiles Vector
+ * @member m_sTestDocPath directory for searching files to load
+ * @member m_vFiles list of all files described in "files.csv"
+ * @member m_hFileURLs contains the position of a file name in the
m_vFiles Vector
+ * @member m_hFileTypes contains the position of a file type in the
m_vFiles Vector
* @member m_param the test parameters
*/
-
+
LogWriter m_log = null;
String m_sTestDocPath = null;
-
+
Vector m_vFiles = null;
-
+
Hashtable m_hFileURLs = new Hashtable();
-
+
Hashtable m_hFileTypes = new Hashtable();
-
+
TestParameters m_param = null;
/**
@@ -76,50 +76,50 @@ public class Helper {
*
* @param log the log writer
*/
-
+
public Helper(TestParameters param, LogWriter log) {
m_param = param;
m_log = log;
-
-
+
+
// get all files from the given directory
m_sTestDocPath = (String)param.get("TestDocumentPath");
// get all files from "files.csv"
m_vFiles = getToDoList((String)m_param.get("csv.files"));
-
+
createFilesList();
}
-
+
/** Reads a comma separated file (CSV). Every line of the file is
- * repesented by an Vector entry. Every data entry of a row
is
+ * represented by an Vector entry. Every data entry of a row
is
* also stored in a Vector. So the returned value is a
* Vector[][] where the first dimension represents a row
- * and the second dimenesion inclueds the data values.
+ * and the second dimension includes the data values.
* @param csvFileName the name of the csv file
* @return Vector filled with Vector filled with data of a row
*/
public Vector getToDoList(String csvFileName){
-
- try {
-
+
+ try {
+
Vector vAll = new Vector();
Vector vFields = new Vector();
-
+
// get content of file
Vector content = getCSVFileContent(csvFileName);
-
+
// remove superfluous content like "#" started lines
content = removeSuperfluousContent(content);
-
+
// replace all place holders in file
content = replacePlaceHolder(content);
-
+
// create Enumeration
Enumeration contentEnum = content.elements();
-
+
// the first line con
[openoffice-project] branch main updated: Updated copyright, fixed typo
This is an automated email from the ASF dual-hosted git repository. mseidel pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/openoffice-project.git The following commit(s) were added to refs/heads/main by this push: new 1eb01ee Updated copyright, fixed typo 1eb01ee is described below commit 1eb01ee49ec7c4934f7a818ad9d8d691897f5413 Author: mseidel AuthorDate: Mon Jan 4 17:33:17 2021 +0100 Updated copyright, fixed typo --- theme/openoffice/templates/base.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/theme/openoffice/templates/base.html b/theme/openoffice/templates/base.html index 7133c7c..2b1ec6a 100644 --- a/theme/openoffice/templates/base.html +++ b/theme/openoffice/templates/base.html @@ -58,11 +58,11 @@ - Copyright © 2011-2020 The Apache Software Foundation, Licensed under the https://www.apache.org/licenses/LICENSE-2.0";>Apache License, Version 2.0 | Contact Us | Terms of Use | Privacy + Copyright © 2011-2021 The Apache Software Foundation, Licensed under the https://www.apache.org/licenses/LICENSE-2.0";>Apache License, Version 2.0 | Contact Us | Terms of Use | Privacy Apache, OpenOffice, OpenOffice.org and the seagull logo are registered trademarks of The Apache Software Foundation. - The Apache feather logo ia a trademark of The Apache Software Foundation. + The Apache feather logo is a trademark of The Apache Software Foundation. Other names appearing on the site may be trademarks of their respective owners.
[openoffice-project] branch asf-site updated: Automatic Site Publish by Buildbot
This is an automated email from the ASF dual-hosted git repository. git-site-role pushed a commit to branch asf-site in repository https://gitbox.apache.org/repos/asf/openoffice-project.git The following commit(s) were added to refs/heads/asf-site by this push: new fe87ccc Automatic Site Publish by Buildbot fe87ccc is described below commit fe87ccc9267d4d7186dffed374a8b3e509c7b5bc Author: buildbot AuthorDate: Mon Jan 4 16:34:03 2021 + Automatic Site Publish by Buildbot --- output/bug-tracking.html | 4 ++-- output/community-faqs.html| 4 ++-- output/contact.html | 4 ++-- output/contributing-code.html | 4 ++-- output/developer-faqs.html| 4 ++-- output/docs/edit-cms.html | 4 ++-- output/docs/governance/consensusBuilding.html | 4 ++-- output/docs/governance/lazyConsensus.html | 4 ++-- output/docs/governance/voting.html| 4 ++-- output/downloads.html | 4 ++-- output/events.html| 4 ++-- output/get-involved-de.html | 4 ++-- output/get-involved.html | 4 ++-- output/get-it-here.html | 4 ++-- output/index.html | 4 ++-- output/license.html | 4 ++-- output/list-conduct.html | 4 ++-- output/mailing-lists.html | 4 ++-- output/mission.html | 4 ++-- output/native-lang.html | 4 ++-- output/orientation/decision-making.html | 4 ++-- output/orientation/how-aoo-project-works.html | 4 ++-- output/orientation/index.html | 4 ++-- output/orientation/infrastructure.html| 4 ++-- output/orientation/intro-contributing.html| 4 ++-- output/orientation/intro-development.html | 4 ++-- output/orientation/intro-doc.html | 4 ++-- output/orientation/intro-l10n.html| 4 ++-- output/orientation/intro-marketing.html | 4 ++-- output/orientation/intro-qa.html | 4 ++-- output/people.html| 4 ++-- output/pmc-faqs.html | 4 ++-- output/press.html | 4 ++-- output/privacy.html | 4 ++-- output/qa.html| 4 ++-- output/security.html | 4 ++-- output/social.html| 4 ++-- output/source.html| 4 ++-- output/students.html | 4 ++-- output/style-test.html| 4 ++-- output/svn-basics.html| 4 ++-- output/terms.html | 4 ++-- output/trademarks.html| 4 ++-- output/translate.html | 4 ++-- output/website-local.html | 4 ++-- output/website-native.html| 4 ++-- 46 files changed, 92 insertions(+), 92 deletions(-) diff --git a/output/bug-tracking.html b/output/bug-tracking.html index b8ea329..0122ad9 100644 --- a/output/bug-tracking.html +++ b/output/bug-tracking.html @@ -113,11 +113,11 @@ - Copyright © 2011-2020 The Apache Software Foundation, Licensed under the https://www.apache.org/licenses/LICENSE-2.0";>Apache License, Version 2.0 | Contact Us | Terms of Use | Privacy + Copyright © 2011-2021 The Apache Software Foundation, Licensed under the https://www.apache.org/licenses/LICENSE-2.0";>Apache License, Version 2.0 | Contact Us | Terms of Use | Privacy Apache, OpenOffice, OpenOffice.org and the seagull logo are registered trademarks of The Apache Software Foundation. - The Apache feather logo ia a trademark of The Apache Software Foundation. + The Apache feather logo is a trademark of The Apache Software Foundation. Other names appearing on the site may be trademarks of their respective owners. diff --git a/output/community-faqs.html b/output/community-faqs.html index b149128..60b8e19 100644 --- a/output/community-faqs.html +++ b/output/community-faqs.html @@ -132,11 +132,11 @@ to approve a release. - Copyright © 2011-2020 The Apache Software Foundation, Licensed under the https://www.apache.org/licenses/LICENSE-2.0";>Apache License, Version 2.0 | Contact Us | Terms of Use | Privacy + Copyright © 2011-2021 The Apache Software Foundation, Licensed under the https://www.apache.org/licenses/LICENSE-2.0";>Apache License, Version 2.0 | Contact Us | Terms of Use | Privacy Apache, OpenOffice, OpenOffice.org and the seagull logo are registered trademarks of The Apache Software Foundation. - The Apache feather logo ia a trademark of The Apache Software Foundation. +
Buildbot success in on pelican_websites
The Buildbot has detected a passing build on builder pelican_websites while building openoffice. Full details are available at: https://ci2.apache.org/#builders/3/builds/1483 Buildbot URL: https://ci2.apache.org/ Worker for this Build: bb_slave9_ubuntu Build Reason: Triggered pelican auto-build via .asf.yaml by mseidel Blamelist: asfinfra, commits@openoffice.apache.org Build succeeded! Sincerely, -The Buildbot
[openoffice] branch trunk updated: Updated copyright year to 2021
This is an automated email from the ASF dual-hosted git repository.
mseidel pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/openoffice.git
The following commit(s) were added to refs/heads/trunk by this push:
new b3fc2ec Updated copyright year to 2021
b3fc2ec is described below
commit b3fc2ec329d5bf9ddb749664e01ca9e4d6c6069b
Author: mseidel
AuthorDate: Mon Jan 4 17:55:15 2021 +0100
Updated copyright year to 2021
---
main/LICENSE | 2 +-
main/LICENSE_ALv2 | 2 +-
main/NOTICE| 2 +-
main/cui/source/dialogs/about.cxx | 2 +-
main/odk/docs/install.html | 2 +-
main/odk/docs/notsupported.html| 2 +-
main/odk/docs/tools.html | 2 +-
main/odk/examples/DevelopersGuide/examples.html| 2 +-
main/odk/examples/examples.html| 2 +-
main/odk/index.html| 2 +-
.../source/packinfo/packinfo_brand.txt | 16 +--
.../source/packinfo/packinfo_office.txt| 118 ++---
.../source/packinfo/packinfo_office_lang.txt | 22 ++--
.../source/packinfo/packinfo_sdkoo.txt | 2 +-
main/setup_native/source/packinfo/packinfo_ure.txt | 4 +-
main/solenv/inc/version.lst| 2 +-
16 files changed, 92 insertions(+), 92 deletions(-)
diff --git a/main/LICENSE b/main/LICENSE
index 057db0c..e5e79e4 100644
--- a/main/LICENSE
+++ b/main/LICENSE
@@ -187,7 +187,7 @@
same "printed page" as the copyright notice for easier
identification within third-party archives.
- Copyright 2011-2020 Apache Software Foundation
+ Copyright 2011-2021 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/main/LICENSE_ALv2 b/main/LICENSE_ALv2
index 4410801..cbc382b 100644
--- a/main/LICENSE_ALv2
+++ b/main/LICENSE_ALv2
@@ -187,7 +187,7 @@
same "printed page" as the copyright notice for easier
identification within third-party archives.
- Copyright 2011-2020 Apache Software Foundation
+ Copyright 2011-2021 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/main/NOTICE b/main/NOTICE
index 30f20eb..404f4e7 100644
--- a/main/NOTICE
+++ b/main/NOTICE
@@ -1,6 +1,6 @@
Apache OpenOffice (https://www.openoffice.org)
-Copyright 2011-2020 The Apache Software Foundation
+Copyright 2011-2021 The Apache Software Foundation
This product includes software developed at
The Apache Software Foundation (https://www.apache.org/).
diff --git a/main/cui/source/dialogs/about.cxx
b/main/cui/source/dialogs/about.cxx
index 255e17e..5c21ec9 100644
--- a/main/cui/source/dialogs/about.cxx
+++ b/main/cui/source/dialogs/about.cxx
@@ -311,7 +311,7 @@ AboutDialog::AboutDialog( Window* pParent, const ResId &
rId ) :
sbcopyright.appendAscii("Copyright ");
sbcopyright.append((sal_Unicode)0x00a9);
sbcopyright.appendAscii(" ");
-rtl::OUString sYear( RTL_CONSTASCII_USTRINGPARAM("2020") );
+rtl::OUString sYear( RTL_CONSTASCII_USTRINGPARAM("2021") );
if (vendor.EqualsAscii("Apache Software Foundation")) {
sbcopyright.append(sYear);
sbcopyright.appendAscii(" The Apache Software Foundation.\n\n");
diff --git a/main/odk/docs/install.html b/main/odk/docs/install.html
index eb45736..fe42a8d 100644
--- a/main/odk/docs/install.html
+++ b/main/odk/docs/install.html
@@ -439,7 +439,7 @@
-Copyright © 2011-2020 The Apache Software Foundation,
Licensed under the Apache License, Version 2.0. Apache, the Apache feather
logo, Apache OpenOffice and OpenOffice.org are trademarks of The Apache
Software Foundation. Other names may be trademarks of their respective
owners.
+Copyright © 2011-2021 The Apache Software Foundation,
Licensed under the Apache License, Version 2.0. Apache, the Apache feather
logo, Apache OpenOffice and OpenOffice.org are trademarks of The Apache
Software Foundation. Other names may be trademarks of their respective
owners.
diff --git a/main/odk/docs/notsupported.html b/main/odk/docs/notsupported.html
index 9c2b82c..404a0bb 100644
--- a/main/odk/docs/notsupported.html
+++ b/main/odk/docs/notsupported.html
@@ -66,7 +66,7 @@
-Copyright © 2011-2020 The Apache Software Foundation,
Licensed under the Apache License, Version 2.0. Apache, the Apache feather
logo, Apache OpenOffice and OpenOffice.org are trademarks of The Apache
Software Foundation. Other names may be trademarks of their respective
owners.
+Copyright © 2011-2021 The Apache Software Fo
[openoffice] branch AOO42X updated: Updated copyright year to 2021
This is an automated email from the ASF dual-hosted git repository.
mseidel pushed a commit to branch AOO42X
in repository https://gitbox.apache.org/repos/asf/openoffice.git
The following commit(s) were added to refs/heads/AOO42X by this push:
new 48789bc Updated copyright year to 2021
48789bc is described below
commit 48789bc7feacdc850df8f0aece51fcac864a3104
Author: mseidel
AuthorDate: Mon Jan 4 17:55:15 2021 +0100
Updated copyright year to 2021
(cherry picked from commit b3fc2ec329d5bf9ddb749664e01ca9e4d6c6069b)
---
main/LICENSE | 2 +-
main/LICENSE_ALv2 | 2 +-
main/NOTICE| 2 +-
main/cui/source/dialogs/about.cxx | 2 +-
main/odk/docs/install.html | 2 +-
main/odk/docs/notsupported.html| 2 +-
main/odk/docs/tools.html | 2 +-
main/odk/examples/DevelopersGuide/examples.html| 2 +-
main/odk/examples/examples.html| 2 +-
main/odk/index.html| 2 +-
.../source/packinfo/packinfo_brand.txt | 16 +--
.../source/packinfo/packinfo_office.txt| 118 ++---
.../source/packinfo/packinfo_office_lang.txt | 22 ++--
.../source/packinfo/packinfo_sdkoo.txt | 2 +-
main/setup_native/source/packinfo/packinfo_ure.txt | 4 +-
main/solenv/inc/version.lst| 2 +-
16 files changed, 92 insertions(+), 92 deletions(-)
diff --git a/main/LICENSE b/main/LICENSE
index 057db0c..e5e79e4 100644
--- a/main/LICENSE
+++ b/main/LICENSE
@@ -187,7 +187,7 @@
same "printed page" as the copyright notice for easier
identification within third-party archives.
- Copyright 2011-2020 Apache Software Foundation
+ Copyright 2011-2021 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/main/LICENSE_ALv2 b/main/LICENSE_ALv2
index 4410801..cbc382b 100644
--- a/main/LICENSE_ALv2
+++ b/main/LICENSE_ALv2
@@ -187,7 +187,7 @@
same "printed page" as the copyright notice for easier
identification within third-party archives.
- Copyright 2011-2020 Apache Software Foundation
+ Copyright 2011-2021 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/main/NOTICE b/main/NOTICE
index 30f20eb..404f4e7 100644
--- a/main/NOTICE
+++ b/main/NOTICE
@@ -1,6 +1,6 @@
Apache OpenOffice (https://www.openoffice.org)
-Copyright 2011-2020 The Apache Software Foundation
+Copyright 2011-2021 The Apache Software Foundation
This product includes software developed at
The Apache Software Foundation (https://www.apache.org/).
diff --git a/main/cui/source/dialogs/about.cxx
b/main/cui/source/dialogs/about.cxx
index 255e17e..5c21ec9 100644
--- a/main/cui/source/dialogs/about.cxx
+++ b/main/cui/source/dialogs/about.cxx
@@ -311,7 +311,7 @@ AboutDialog::AboutDialog( Window* pParent, const ResId &
rId ) :
sbcopyright.appendAscii("Copyright ");
sbcopyright.append((sal_Unicode)0x00a9);
sbcopyright.appendAscii(" ");
-rtl::OUString sYear( RTL_CONSTASCII_USTRINGPARAM("2020") );
+rtl::OUString sYear( RTL_CONSTASCII_USTRINGPARAM("2021") );
if (vendor.EqualsAscii("Apache Software Foundation")) {
sbcopyright.append(sYear);
sbcopyright.appendAscii(" The Apache Software Foundation.\n\n");
diff --git a/main/odk/docs/install.html b/main/odk/docs/install.html
index eb45736..fe42a8d 100644
--- a/main/odk/docs/install.html
+++ b/main/odk/docs/install.html
@@ -439,7 +439,7 @@
-Copyright © 2011-2020 The Apache Software Foundation,
Licensed under the Apache License, Version 2.0. Apache, the Apache feather
logo, Apache OpenOffice and OpenOffice.org are trademarks of The Apache
Software Foundation. Other names may be trademarks of their respective
owners.
+Copyright © 2011-2021 The Apache Software Foundation,
Licensed under the Apache License, Version 2.0. Apache, the Apache feather
logo, Apache OpenOffice and OpenOffice.org are trademarks of The Apache
Software Foundation. Other names may be trademarks of their respective
owners.
diff --git a/main/odk/docs/notsupported.html b/main/odk/docs/notsupported.html
index 9c2b82c..404a0bb 100644
--- a/main/odk/docs/notsupported.html
+++ b/main/odk/docs/notsupported.html
@@ -66,7 +66,7 @@
-Copyright © 2011-2020 The Apache Software Foundation,
Licensed under the Apache License, Version 2.0. Apache, the Apache feather
logo, Apache OpenOffice and OpenOffice.org are trademarks of The Apache
Software Foundation. Other names may be trademarks of the
[openoffice-org] 01/02: Added Windows 10, fixed typos
This is an automated email from the ASF dual-hosted git repository. marcus pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/openoffice-org.git commit 284d912dec01365b28b1065e7ad4bcebfcbbfd09 Author: Marcus AuthorDate: Mon Jan 4 18:31:17 2021 +0100 Added Windows 10, fixed typos --- content/product/windows.md | 19 +-- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/content/product/windows.md b/content/product/windows.md index e8e5edd..59a8dd4 100644 --- a/content/product/windows.md +++ b/content/product/windows.md @@ -1,10 +1,10 @@ -type=page +type=page title=Apache OpenOffice for Windows -notice=https://www.apache.org/licenses/LICENSE-2.0 -~~ +notice=https://www.apache.org/licenses/LICENSE-2.0 +~~ ## Windows Version Support -The current Apache OpenOffice supports Microsoft Windows XP, Vista, Windows 7 and Windows 8. +The current Apache OpenOffice supports Microsoft Windows XP, Vista, Windows 7, Windows 8 and Windows 10. Specific platform version notes: @@ -12,13 +12,12 @@ Specific platform version notes: - **Windows XP**: Tested, stable, no platform-specific problems known. - **Windows Vista**: Tested, stable, no platform-specific problems known. - **Windows 7**: Tested, stable. - - **Windows 8**: We run as a "desktop application", not a Metro "App". Requires x86 or 64-bit Windows. + - **Windows 8, 10**: We run as a "desktop application", not a Metro "App". Requires x86 or 64-bit Windows. We do not support Windows RT, the ARM-based version, intended for tablets. **Please note**: Apache OpenOffice is distributed as a 32-bit application. It will run successfully in -32-bit mode on 64-bit versions of Windows 7 and Windows 8. But in those cases a 32-bit JVM is required -for some functionality. Details are -[here](http://www.openoffice.org/download/common/java.html). +32-bit mode on 64-bit versions of Windows 7, 8 and 10. But in those cases a 32-bit JVM is required +for some functionality. Details are [here](http://www.openoffice.org/download/common/java.html). ## Hardware Requirements @@ -27,7 +26,7 @@ Hardware demands are quite modest and even older machines should be able to run - **Memory**: Minimum 256 Mbytes RAM (512 MB RAM recommended). - **Storage**: At least 650 Mbytes available disk space for a default install via download. After installation and deletion of temporary installation files, Apache OpenOffice will use approximately 440 Mbytes disk space. - - **Graphics**: 1024 x 768 or higher resolution with at least 256 colours. + - **Graphics**: 1024 x 768 or higher resolution with at least 256 colors. ## Windows-specific Features @@ -43,6 +42,6 @@ Apache OpenOffice has the following special features on Windows: - Click here to [download](http://www.openoffice.org/download/) - Click here to get -[Install intructions for OpenOffice on Windows](http://www.openoffice.org/download/common/instructions.html#win) +[Install instructions for OpenOffice on Windows](http://www.openoffice.org/download/common/instructions.html#win) - Click here to get help and support in the [Community Support Forums](http://forum.openoffice.org/)
[openoffice-org] branch main updated (ca7396a -> 9b32617)
This is an automated email from the ASF dual-hosted git repository. marcus pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/openoffice-org.git. from ca7396a Revert logo new 284d912 Added Windows 10, fixed typos new 9b32617 Updated strings for the platform hint text for Windows The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: assets/download/msg_prop_l10n_en.js | 8 content/product/windows.md | 19 +-- 2 files changed, 13 insertions(+), 14 deletions(-)
[openoffice-org] 02/02: Updated strings for the platform hint text for Windows
This is an automated email from the ASF dual-hosted git repository. marcus pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/openoffice-org.git commit 9b3261732dc1b86df9a37efcdf17d7972cdee9a5 Author: Marcus AuthorDate: Mon Jan 4 18:34:57 2021 +0100 Updated strings for the platform hint text for Windows --- assets/download/msg_prop_l10n_en.js | 8 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/assets/download/msg_prop_l10n_en.js b/assets/download/msg_prop_l10n_en.js index 2664660..a7ce3d4 100644 --- a/assets/download/msg_prop_l10n_en.js +++ b/assets/download/msg_prop_l10n_en.js @@ -228,12 +228,12 @@ l10n.dl_full_link_text= "Download full installation"; l10n.dl_full_link_title= "Click to download: "; l10n.dl_langpack_link_text = "Download language pack"; l10n.dl_langpack_link_title= "Click to download: "; -l10n.dl_win_info_text = "Windows : Title"; -l10n.dl_win_info_title = "Windows : Text"; +l10n.dl_win_info_text = "32-bit, 64-bit and Java - What to choose?"; +l10n.dl_win_info_title = "At the moment there is a 32-bit (x86) version for Windows. However, this installs and runs also on Windows 64-bit (x86-64).\nPlease note that you may need Java in 32-bit for additional functionality which must then be selected only ones (see menu 'Tools - Options - OpenOffice - Java').\n\nFor more information about OpenOffice and Java please see the link on the right 'Java and Apache OpenOffice'."; l10n.dl_linux_info_text= "RPM vs. DEB = What to choose?"; l10n.dl_linux_info_title = "RPM is used in:\nCentOS, Fedora, Mageia, Mandriva, MeeGo, openSUSE, Oracle Linux, PCLinuxOS, Red Hat Enterprise Linux, Sailfish OS, Scientific Linux, SUSE Linux Enterprise Server\n\nDEB is used in:\nDebian, Kanotix, Knoppix, Kubuntu, Linux Mint, Lubuntu, Ubuntu, Xubuntu"; -l10n.dl_mac_info_text = "macOS : Title"; -l10n.dl_mac_info_title = "macOS : Text"; +// l10n.dl_mac_info_text = "macOS : Title"; +// l10n.dl_mac_info_title = "macOS : Text"; l10n.dl_full_link_porting_text = "Porting: Click to choose from 3rd party vendors"; l10n.dl_full_link_porting_title= "Click to browse to the porting webpage and download from 3rd party vendors";
[openoffice-org] branch asf-staging updated: git-site-role commit from build_staging.sh
This is an automated email from the ASF dual-hosted git repository. git-site-role pushed a commit to branch asf-staging in repository https://gitbox.apache.org/repos/asf/openoffice-org.git The following commit(s) were added to refs/heads/asf-staging by this push: new dc4bf84 git-site-role commit from build_staging.sh dc4bf84 is described below commit dc4bf8479165c493b1ad5d43762b46abe7012bca Author: jenkins AuthorDate: Mon Jan 4 17:43:13 2021 + git-site-role commit from build_staging.sh --- content/download/msg_prop_l10n_en.js | 8 content/feed.xml | 4 ++-- content/product/windows.html | 10 +- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/content/download/msg_prop_l10n_en.js b/content/download/msg_prop_l10n_en.js index 2664660..a7ce3d4 100644 --- a/content/download/msg_prop_l10n_en.js +++ b/content/download/msg_prop_l10n_en.js @@ -228,12 +228,12 @@ l10n.dl_full_link_text= "Download full installation"; l10n.dl_full_link_title= "Click to download: "; l10n.dl_langpack_link_text = "Download language pack"; l10n.dl_langpack_link_title= "Click to download: "; -l10n.dl_win_info_text = "Windows : Title"; -l10n.dl_win_info_title = "Windows : Text"; +l10n.dl_win_info_text = "32-bit, 64-bit and Java - What to choose?"; +l10n.dl_win_info_title = "At the moment there is a 32-bit (x86) version for Windows. However, this installs and runs also on Windows 64-bit (x86-64).\nPlease note that you may need Java in 32-bit for additional functionality which must then be selected only ones (see menu 'Tools - Options - OpenOffice - Java').\n\nFor more information about OpenOffice and Java please see the link on the right 'Java and Apache OpenOffice'."; l10n.dl_linux_info_text= "RPM vs. DEB = What to choose?"; l10n.dl_linux_info_title = "RPM is used in:\nCentOS, Fedora, Mageia, Mandriva, MeeGo, openSUSE, Oracle Linux, PCLinuxOS, Red Hat Enterprise Linux, Sailfish OS, Scientific Linux, SUSE Linux Enterprise Server\n\nDEB is used in:\nDebian, Kanotix, Knoppix, Kubuntu, Linux Mint, Lubuntu, Ubuntu, Xubuntu"; -l10n.dl_mac_info_text = "macOS : Title"; -l10n.dl_mac_info_title = "macOS : Text"; +// l10n.dl_mac_info_text = "macOS : Title"; +// l10n.dl_mac_info_title = "macOS : Text"; l10n.dl_full_link_porting_text = "Porting: Click to choose from 3rd party vendors"; l10n.dl_full_link_porting_title= "Click to browse to the porting webpage and download from 3rd party vendors"; diff --git a/content/feed.xml b/content/feed.xml index 8ff5804..6df50ad 100644 --- a/content/feed.xml +++ b/content/feed.xml @@ -6,8 +6,8 @@ http://localhost:8820/feed.xml"; rel="self" type="application/rss+xml" /> OpenOffice.org Feed en-us -Sun, 3 Jan 2021 20:51:50 + -Sun, 3 Jan 2021 20:51:50 + +Mon, 4 Jan 2021 17:41:36 + +Mon, 4 Jan 2021 17:41:36 + diff --git a/content/product/windows.html b/content/product/windows.html index 467fac2..f252f3c 100644 --- a/content/product/windows.html +++ b/content/product/windows.html @@ -23,22 +23,22 @@ Apache OpenOffice for Windows Windows Version Support -The current Apache OpenOffice supports Microsoft Windows XP, Vista, Windows 7 and Windows 8. +The current Apache OpenOffice supports Microsoft Windows XP, Vista, Windows 7, Windows 8 and Windows 10. Specific platform version notes: Windows 2000: OpenOffice may work on Windows 2000, but we don’t test or recommend it. Windows XP: Tested, stable, no platform-specific problems known. Windows Vista: Tested, stable, no platform-specific problems known. Windows 7: Tested, stable. -Windows 8: We run as a “desktop application”, not a Metro “App”. Requires x86 or 64-bit Windows. We do not support Windows RT, the ARM-based version, intended for tablets. +Windows 8, 10: We run as a “desktop application”, not a Metro “App”. Requires x86 or 64-bit Windows. We do not support Windows RT, the ARM-based version, intended for tablets. -Please note: Apache OpenOffice is distributed as a 32-bit application. It will run successfully in 32-bit mode on 64-bit versions of Windows 7 and Windows 8. But in those cases a 32-bit JVM is required for some functionality. Details are http://www.openoffice.org/download/common/java.html";>here. +Please note: Apache OpenOffice is distributed as a 32-bit application. It will run successfully in 32-bit mode on 64-bit versions of Windows 7, 8 and 10. But in those cases a 32-bit JVM is required for some functionality. Details are http://www.openoffice.org/download/common/java.ht
OpenOffice-org Staging Site Published
OpenOffice » OpenOffice-org-Staging-Site-Build - Build # 112 - Successful: Check console output at https://ci-builds.apache.org/job/OpenOffice/job/OpenOffice-org-Staging-Site-Build/112/ to view the results.
[openoffice] branch AOO419 updated: Updated copyright year to 2021
This is an automated email from the ASF dual-hosted git repository.
mseidel pushed a commit to branch AOO419
in repository https://gitbox.apache.org/repos/asf/openoffice.git
The following commit(s) were added to refs/heads/AOO419 by this push:
new 85cfe42 Updated copyright year to 2021
85cfe42 is described below
commit 85cfe422170f36258f2af2fab8e035021332bb4c
Author: mseidel
AuthorDate: Mon Jan 4 18:49:57 2021 +0100
Updated copyright year to 2021
---
main/LICENSE | 2 +-
main/LICENSE_ALv2 | 2 +-
main/NOTICE| 2 +-
main/cui/source/dialogs/about.cxx | 2 +-
main/odk/docs/install.html | 2 +-
main/odk/docs/notsupported.html| 2 +-
main/odk/docs/tools.html | 2 +-
main/odk/examples/DevelopersGuide/examples.html| 2 +-
main/odk/examples/examples.html| 2 +-
main/odk/index.html| 2 +-
.../source/packinfo/packinfo_brand.txt | 16 +--
.../source/packinfo/packinfo_office.txt| 118 ++---
.../source/packinfo/packinfo_office_lang.txt | 22 ++--
.../source/packinfo/packinfo_sdkoo.txt | 2 +-
main/setup_native/source/packinfo/packinfo_ure.txt | 4 +-
main/solenv/inc/version.lst| 10 +-
16 files changed, 96 insertions(+), 96 deletions(-)
diff --git a/main/LICENSE b/main/LICENSE
index 6c2496e..e6e8e9c 100644
--- a/main/LICENSE
+++ b/main/LICENSE
@@ -186,7 +186,7 @@
same "printed page" as the copyright notice for easier
identification within third-party archives.
- Copyright 2012, 2013 Apache Software Foundation
+ Copyright 2011-2021 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/main/LICENSE_ALv2 b/main/LICENSE_ALv2
index 565c4ce..cbc382b 100644
--- a/main/LICENSE_ALv2
+++ b/main/LICENSE_ALv2
@@ -187,7 +187,7 @@
same "printed page" as the copyright notice for easier
identification within third-party archives.
- Copyright 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020 Apache
Software Foundation
+ Copyright 2011-2021 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/main/NOTICE b/main/NOTICE
index d0e7801..e9d6ea1 100644
--- a/main/NOTICE
+++ b/main/NOTICE
@@ -1,5 +1,5 @@
Apache OpenOffice (http://www.openoffice.org)
-Copyright 2011, 2020 The Apache Software Foundation
+Copyright 2011-2021 The Apache Software Foundation
This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).
diff --git a/main/cui/source/dialogs/about.cxx
b/main/cui/source/dialogs/about.cxx
index e88c118..45fcd8f 100644
--- a/main/cui/source/dialogs/about.cxx
+++ b/main/cui/source/dialogs/about.cxx
@@ -314,7 +314,7 @@ AboutDialog::AboutDialog( Window* pParent, const ResId &
rId ) :
// TODO:
// This date needs to be updated each year... do this automagically
//
-rtl::OUString sYear( RTL_CONSTASCII_USTRINGPARAM("2020") );
+rtl::OUString sYear( RTL_CONSTASCII_USTRINGPARAM("2021") );
if (vendor.EqualsAscii("Apache Software Foundation")) {
sbcopyright.append(sYear);
sbcopyright.appendAscii(" The Apache Software Foundation.\n\n");
diff --git a/main/odk/docs/install.html b/main/odk/docs/install.html
index 5f94d66..4a0b520 100644
--- a/main/odk/docs/install.html
+++ b/main/odk/docs/install.html
@@ -440,7 +440,7 @@
-Copyright © 2011 The Apache Software Foundation, Licensed
under the Apache License, Version 2.0. Apache, the Apache feather logo, Apache
OpenOffice and OpenOffice.org are trademarks of The Apache Software Foundation.
Other names may be trademarks of their respective owners.
+Copyright © 2011-2021 The Apache Software Foundation,
Licensed under the Apache License, Version 2.0. Apache, the Apache feather
logo, Apache OpenOffice and OpenOffice.org are trademarks of The Apache
Software Foundation. Other names may be trademarks of their respective
owners.
diff --git a/main/odk/docs/notsupported.html b/main/odk/docs/notsupported.html
index b33c29f..5416fbd 100644
--- a/main/odk/docs/notsupported.html
+++ b/main/odk/docs/notsupported.html
@@ -66,7 +66,7 @@
-Copyright © 2011 The Apache Software Foundation, Licensed
under the Apache License, Version 2.0. Apache, the Apache feather logo, Apache
OpenOffice and OpenOffice.org are trademarks of The Apache Software Foundation.
Other names may be trademarks of their respective owners.
+Copyright © 2011-2021 The Apache Software Fo
