[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-4.3' - 2 commits - configure.ac scp2/source

[Andras Timar]

 configure.ac                 |    2 +-
 scp2/source/ooo/file_ooo.scp |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 4b069fff04a35b7100b383e9e7835f5327175054
Author: Andras Timar <andras.timar at collabora.com>
Date:   Thu May 14 21:09:21 2015 +0200

    Bump version to 4.3-7
    
    Change-Id: Ia01ac1695c4b88dc5868f054236f8468c1383335

diff --git a/configure.ac b/configure.ac
index e3cd488..4f5c769 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9,7 +9,7 @@ dnl in order to create a configure script.
 # several non-alphanumeric characters, those are split off and used only for the
 # ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no idea.
 
-AC_INIT([LibreOffice],[4.3.10.6],[],[],[https://libreoffice-from-collabora.com/])
+AC_INIT([LibreOffice],[4.3.10.7],[],[],[https://libreoffice-from-collabora.com/])
 
 AC_PREREQ([2.59])
 
commit 418df028fbd9b33fd8d29b97cc7753dccf9c7958
Author: Andras Timar <andras.timar at collabora.com>
Date:   Thu May 14 21:08:00 2015 +0200

    shell script in Contents/MacOS is not accepted
    
    Change-Id: I5a482a617f40730d223d0a1401a66d9ab70d7774

diff --git a/scp2/source/ooo/file_ooo.scp b/scp2/source/ooo/file_ooo.scp
index 2f8cdfb..33f1a66 100644
--- a/scp2/source/ooo/file_ooo.scp
+++ b/scp2/source/ooo/file_ooo.scp
@@ -213,7 +213,7 @@ End
 
 #endif
 
-#if defined UNX
+#if defined UNX && !defined ENABLE_MACOSX_MACLIKE_APP_STRUCTURE
 File gid_File_Bin_Senddoc
     BIN_FILE_BODY;
     Dir = FILELIST_DIR;