[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 2 commits - RepositoryExternal.mk RepositoryFixes.mk scp2/source setup_native/source

[Libreoffice Gerrit user]

 RepositoryExternal.mk                            |    3 +--
 RepositoryFixes.mk                               |    6 +++---
 scp2/source/gnome/module_gnome.ulf               |    2 +-
 setup_native/source/packinfo/package_names.txt   |    2 +-
 setup_native/source/packinfo/packinfo_office.txt |    2 +-
 5 files changed, 7 insertions(+), 8 deletions(-)

New commits:
commit 72b2299f3ec474a09e00f4966abc8c37bb972ec1
Author:     Matthias Seidel <mseidel at apache.org>
AuthorDate: Fri Sep 28 08:04:33 2018 +0000
Commit:     Matthias Seidel <mseidel at apache.org>
CommitDate: Fri Sep 28 08:04:33 2018 +0000

    Correcting description: Gnome -> GNOME

diff --git a/scp2/source/gnome/module_gnome.ulf b/scp2/source/gnome/module_gnome.ulf
index c8d84d45aa47..4a82fe2b805e 100644
--- a/scp2/source/gnome/module_gnome.ulf
+++ b/scp2/source/gnome/module_gnome.ulf
@@ -25,5 +25,5 @@
 en-US = "GNOME Integration"
 
 [STR_DESC_MODULE_OPTIONAL_GNOME]
-en-US = "System integration of %PRODUCTNAME %PRODUCTVERSION into Gnome Desktop Environment."
+en-US = "System integration of %PRODUCTNAME %PRODUCTVERSION into GNOME Desktop Environment."
 
diff --git a/setup_native/source/packinfo/package_names.txt b/setup_native/source/packinfo/package_names.txt
index 86f3a8db438f..bc301ce00905 100644
--- a/setup_native/source/packinfo/package_names.txt
+++ b/setup_native/source/packinfo/package_names.txt
@@ -23,7 +23,7 @@
 %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-dict-vi	Vietnamese dictionary for %PRODUCTNAME %PRODUCTVERSION
 %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-draw	Draw module for %APACHEPROJECTNAME %PRODUCTVERSION
 %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-emailmerge	Email mailmerge module for %APACHEPROJECTNAME %PRODUCTVERSION
-%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-gnome-integratn	Gnome integration module for %APACHEPROJECTNAME %PRODUCTVERSION
+%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-gnome-integratn	GNOME integration module for %APACHEPROJECTNAME %PRODUCTVERSION
 %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-graphicfilter	Graphic filter module for %APACHEPROJECTNAME %PRODUCTVERSION
 %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-headless	Headless display module for %APACHEPROJECTNAME %PRODUCTVERSION
 %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-images	Images module for %APACHEPROJECTNAME %PRODUCTVERSION
diff --git a/setup_native/source/packinfo/packinfo_office.txt b/setup_native/source/packinfo/packinfo_office.txt
index 984db61a9e04..16a438041042 100644
--- a/setup_native/source/packinfo/packinfo_office.txt
+++ b/setup_native/source/packinfo/packinfo_office.txt
@@ -49,7 +49,7 @@ findrequires = "find-requires-gnome.sh"
 copyright = "2012-2018 by The Apache Software Foundation"
 solariscopyright = "solariscopyrightfile"
 vendor = "Apache Software Foundation"
-description = "Gnome integration module for %APACHEPROJECTNAME %PRODUCTVERSION"
+description = "GNOME integration module for %APACHEPROJECTNAME %PRODUCTVERSION"
 destpath = "/opt"
 packageversion = "%OOOPACKAGEVERSION"
 End
commit 98abbd6a837436c18e360edae46cd603c1182bd6
Author:     Matthias Seidel <mseidel at apache.org>
AuthorDate: Fri Sep 28 07:26:58 2018 +0000
Commit:     Matthias Seidel <mseidel at apache.org>
CommitDate: Fri Sep 28 07:26:58 2018 +0000

    Minor cleanup

diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 8cb3a5d5a4e5..669330608c8d 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -371,7 +371,7 @@ $(call gb_LinkTarget_add_defs,$(1),\
 $(call gb_LinkTarget_set_include,$(1),\
     $$(INCLUDE) \
     $(APR_CFLAGS) \
-)       
+)
 $(call gb_LinkTarget_add_libs,$(1),$(APR_LIBS))
 endef
 
@@ -668,5 +668,4 @@ endef
 
 endif # SYSTEM_HUNSPELL
 
-
 # vim: set noet sw=4 ts=4:
diff --git a/RepositoryFixes.mk b/RepositoryFixes.mk
index dcdb0538313e..8bbed45f8ab7 100644
--- a/RepositoryFixes.mk
+++ b/RepositoryFixes.mk
@@ -107,8 +107,8 @@ gb_Library_FILENAMES := $(patsubst z:iz%,z:zlib%,$(gb_Library_FILENAMES))
 gb_Library_FILENAMES := $(patsubst stl:istl%,stl:msvcprt%,$(gb_Library_FILENAMES))
 
 # handle libraries in msvc format that don't use an "i" prefix for their import library
-# these are libraries built by OOo, but only a few of them
-# all other libraries built by OOo and all platform libraries (exceptions see below) are used without an import library
+# these are libraries built by AOO, but only a few of them
+# all other libraries built by AOO and all platform libraries (exceptions see below) are used without an import library
 # we link against their dlls in gcc format directly
 gb_Library_NOILIBFILENAMES:=\
     icudt \
@@ -193,7 +193,7 @@ gb_Library_DLLFILENAMES := $(patsubst z:z%,z:zlib%,$(gb_Library_DLLFILENAMES))
 
 endif # ifneq ($(USE_MINGW),)
 
-else  # ifeq ($(OS),WNT)
+else # ifeq ($(OS),WNT)
 
 gb_Library_FILENAMES := $(patsubst vbaobj:vbaobj.uno%,vbaobj:libvbaobj.uno%,$(gb_Library_FILENAMES))