[Libreoffice-commits] core.git: configure.ac instsetoo_native/CustomTarget_setup.mk

[Christian Lohmaier]

 configure.ac                           |    2 +-
 instsetoo_native/CustomTarget_setup.mk |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 468aaa1bcf96c86c4a33b5dcd0aabb41e14b042d
Author: Christian Lohmaier <lohmaier+LibreOffice at googlemail.com>
Date:   Thu Apr 16 14:21:30 2015 +0200

    bump version to 5.0.0.0.alpha0+ - but keep profile at 4
    
    Change-Id: I30536ecd8a03a19a647d247e7c6ece3d6f1695c1

diff --git a/configure.ac b/configure.ac
index 9e8e1d2..66f4209 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.5.0.0.alpha0+],[],[],[http://documentfoundation.org/])
+AC_INIT([LibreOffice],[5.0.0.0.alpha0+],[],[],[http://documentfoundation.org/])
 
 AC_PREREQ([2.59])
 
diff --git a/instsetoo_native/CustomTarget_setup.mk b/instsetoo_native/CustomTarget_setup.mk
index 0d646ae..b020e96 100644
--- a/instsetoo_native/CustomTarget_setup.mk
+++ b/instsetoo_native/CustomTarget_setup.mk
@@ -37,7 +37,7 @@ $(call gb_CustomTarget_get_workdir,instsetoo_native/setup)/$(call gb_Helper_get_
 		&& echo 'InstallMode=<installmode>' \
 		&& echo 'ProductKey=$(PRODUCTNAME) $(PRODUCTVERSION)' \
 		$(if $(ENABLE_RELEASE_BUILD),\
-			&& echo 'UserInstallation=$$SYSUSERCONFIG/$(if $(filter-out MACOSX WNT,$(OS)),$(shell echo $(PRODUCTNAME) | tr "[:upper:]" "[:lower:]"),$(PRODUCTNAME))/$(LIBO_VERSION_MAJOR)', \
+			&& echo 'UserInstallation=$$SYSUSERCONFIG/$(if $(filter-out MACOSX WNT,$(OS)),$(shell echo $(PRODUCTNAME) | tr "[:upper:]" "[:lower:]"),$(PRODUCTNAME))/4', \
 			&& echo 'UserInstallation=$$ORIGIN/..') \
 	) > $@