[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.0' - 2 commits - configure.ac icon-themes/galaxy

[Andras Timar]

 configure.ac                         |    2 +-
 icon-themes/galaxy/sfx2/res/logo.png |binary
 2 files changed, 1 insertion(+), 1 deletion(-)

New commits:
commit ae2fbc7c806fdc0ebbf984b189f81e17d7e6939c
Author: Andras Timar <andras.timar at collabora.com>
Date:   Mon Apr 16 15:03:51 2018 +0200

    Collabora Office logo at Start Center
    
    Change-Id: I8bbd75d4ae5d0a3b3547baa55d9ff4886a9d023c

diff --git a/icon-themes/galaxy/sfx2/res/logo.png b/icon-themes/galaxy/sfx2/res/logo.png
index 9ba6acaaaa0d..2da14712d31d 100644
Binary files a/icon-themes/galaxy/sfx2/res/logo.png and b/icon-themes/galaxy/sfx2/res/logo.png differ
commit 2efbbaeac59809f86ecc707ff304089805c21fbc
Author: Andras Timar <andras.timar at collabora.com>
Date:   Thu Mar 9 12:28:39 2017 +0100

    don't allow space in INSTALLDIRNAME
    
    Change-Id: I4c20ab9051b49149d4cd52339a61c98f5f62226b
    (cherry picked from commit 2fc7778ba2ce545ecb6bd2e60a09eeb8fdb44b49)

diff --git a/configure.ac b/configure.ac
index 9130c00a1728..9bf05a853406 100644
--- a/configure.ac
+++ b/configure.ac
@@ -11989,7 +11989,7 @@ else
 fi
 AC_SUBST(WITH_COMPAT_OOWRAPPERS)
 
-INSTALLDIRNAME=`echo AC_PACKAGE_NAME | $AWK '{print tolower($0)}'`
+INSTALLDIRNAME=`echo AC_PACKAGE_NAME | $AWK '{gsub(" ", "", $0);print tolower($0)}'`
 AC_MSG_CHECKING([for install dirname])
 if test -n "$with_install_dirname" -a "$with_install_dirname" != "no" -a "$with_install_dirname" != "yes"; then
     INSTALLDIRNAME="$with_install_dirname"