You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by tr...@apache.org on 2020/10/31 23:37:49 UTC
[openoffice] branch trunk updated (342152f -> a4f1bfe)
This is an automated email from the ASF dual-hosted git repository.
truckman pushed a change to branch trunk
in repository https://gitbox.apache.org/repos/asf/openoffice.git.
from 342152f This bug was fixed by the previous commit. Delete a blank line to force a commit.
new 35d9187 Revert "This bug was fixed by the previous commit. Delete a blank line to"
new 97ff467 Revert "Add missing ',' delimiter. Commas appear to be mandatory between gids"
new a4f1bfe Fix #i127774# Updating 4.1.5 to 4.2.0 fails with error
The 3 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:
main/scp2/source/gnome/module_gnome.scp | 1 +
1 file changed, 1 insertion(+)
[openoffice] 01/03: Revert "This bug was fixed by the previous
commit. Delete a blank line to"
Posted by tr...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
truckman pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/openoffice.git
commit 35d91877e72f4c6a7b39a133b851566eed697301
Author: Don Lewis <tr...@apache.org>
AuthorDate: Sat Oct 31 16:31:34 2020 -0700
Revert "This bug was fixed by the previous commit. Delete a blank line to"
This reverts commit 342152f07d75e7c85ac6c11e8633554a9dee4ab9.
---
main/scp2/source/gnome/module_gnome.scp | 1 +
1 file changed, 1 insertion(+)
diff --git a/main/scp2/source/gnome/module_gnome.scp b/main/scp2/source/gnome/module_gnome.scp
index 7c7da26..b2ea990 100644
--- a/main/scp2/source/gnome/module_gnome.scp
+++ b/main/scp2/source/gnome/module_gnome.scp
@@ -51,3 +51,4 @@ Module gid_Module_Optional_Gnome
#endif
);
End
+
[openoffice] 02/03: Revert "Add missing ',
' delimiter. Commas appear to be mandatory between gids"
Posted by tr...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
truckman pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/openoffice.git
commit 97ff4670ba01f378b97a88315281adbaf252dbce
Author: Don Lewis <tr...@apache.org>
AuthorDate: Sat Oct 31 16:34:38 2020 -0700
Revert "Add missing ',' delimiter. Commas appear to be mandatory between gids"
This reverts commit c2415270e1ec2b5ba4fff587fb2d2f5f50077165 to allow
commit message fix.
---
main/scp2/source/gnome/module_gnome.scp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/main/scp2/source/gnome/module_gnome.scp b/main/scp2/source/gnome/module_gnome.scp
index b2ea990..6170e19 100644
--- a/main/scp2/source/gnome/module_gnome.scp
+++ b/main/scp2/source/gnome/module_gnome.scp
@@ -44,7 +44,7 @@ Module gid_Module_Optional_Gnome
gid_File_Lib_GIO,
#endif
#ifdef ENABLE_GCONF
- gid_File_Lib_Gconfbe,
+ gid_File_Lib_Gconfbe
#endif
#if (defined ENABLE_GNOMEVFS && defined ENABLE_LOCKDOWN) || defined ENABLE_GIO
gid_File_Share_Registry_Gnome_Xcd
[openoffice] 03/03: Fix #i127774# Updating 4.1.5 to 4.2.0 fails
with error
Posted by tr...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
truckman pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/openoffice.git
commit a4f1bfeeff787044d837fdb2375117a5aeed8a04
Author: Don Lewis <tr...@apache.org>
AuthorDate: Sat Oct 31 16:35:46 2020 -0700
Fix #i127774# Updating 4.1.5 to 4.2.0 fails with error
Add missing ',' delimiter. Commas appear to be mandatory between gids
in the file list. If a comma is omitted, then the adjacent gid names
are concatenated. Trailing commas do not appear to cause any problems.
---
main/scp2/source/gnome/module_gnome.scp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/main/scp2/source/gnome/module_gnome.scp b/main/scp2/source/gnome/module_gnome.scp
index 6170e19..b2ea990 100644
--- a/main/scp2/source/gnome/module_gnome.scp
+++ b/main/scp2/source/gnome/module_gnome.scp
@@ -44,7 +44,7 @@ Module gid_Module_Optional_Gnome
gid_File_Lib_GIO,
#endif
#ifdef ENABLE_GCONF
- gid_File_Lib_Gconfbe
+ gid_File_Lib_Gconfbe,
#endif
#if (defined ENABLE_GNOMEVFS && defined ENABLE_LOCKDOWN) || defined ENABLE_GIO
gid_File_Share_Registry_Gnome_Xcd