[Libreoffice-commits] core.git: Branch 'distro/collabora/lov-4.4' - 2 commits - configure.ac pyuno/Package_python_shell.mk

[Andras Timar]

 configure.ac                  |    2 +-
 pyuno/Package_python_shell.mk |    4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

New commits:
commit cbf10ec0cf7448380cae24cf69d9b7ef3d9080fb
Author: Andras Timar <andras.timar at collabora.com>
Date:   Sat Aug 22 07:43:54 2015 +0200

    Bump version for next App Store upload
    
    Change-Id: I7305d6bb83d695916d056d6e2031a0ad2fca7e81

diff --git a/configure.ac b/configure.ac
index 7471be6..8eaae29 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.4.4.4],[],[],[http://documentfoundation.org/])
+AC_INIT([LibreOffice],[4.4.4.6],[],[],[http://documentfoundation.org/])
 
 AC_PREREQ([2.59])
 
commit 4a2263f537dbd4a55dcff079a67a765db4982084
Author: Andras Timar <andras.timar at collabora.com>
Date:   Thu Jul 2 16:26:50 2015 +0200

    put python starter shell script to Resources folder of OS X app
    
    Change-Id: Iaed947b9168fbd1e2d2c79da724426b56bd8a830

diff --git a/pyuno/Package_python_shell.mk b/pyuno/Package_python_shell.mk
index e8c3fa6..f75cda3 100644
--- a/pyuno/Package_python_shell.mk
+++ b/pyuno/Package_python_shell.mk
@@ -9,6 +9,10 @@
 
 $(eval $(call gb_Package_Package,python_shell,$(call gb_CustomTarget_get_workdir,pyuno/python_shell)))
 
+ifeq ($(OS),MACOSX)
+$(eval $(call gb_Package_add_file,python_shell,$(LIBO_ETC_FOLDER)/python,python.sh))
+else
 $(eval $(call gb_Package_add_file,python_shell,$(LIBO_BIN_FOLDER)/python,python.sh))
+endif
 
 # vim: set noet sw=4 ts=4: