configure.ac | 2 +-
instsetoo_native/util/openoffice.lst.in | 12 ++++++------
postprocess/CustomTarget_registry.mk | 2 +-
shell/Module_shell.mk | 2 +-
4 files changed, 9 insertions(+), 9 deletions(-)
New commits:
commit b8199ac1b7f8bf561575705fd851a8bfbfe647c4
Author: Andras Timar <andras.ti...@collabora.com>
Date: Thu Apr 17 13:51:26 2014 -0700
shell build fix on Windows
Change-Id: I500f8a86bb9bca5532577a37268b94fb8a8c8b16
diff --git a/shell/Module_shell.mk b/shell/Module_shell.mk
index 1e93743..b9b0bc2 100644
--- a/shell/Module_shell.mk
+++ b/shell/Module_shell.mk
@@ -101,13 +101,13 @@ ifeq ($(filter DESKTOP,$(BUILD_TYPE)),DESKTOP)
$(eval $(call gb_Module_add_targets,shell,\
Executable_lngconvex \
- Library_syssh \
))
ifneq ($(OS),WNT)
$(eval $(call gb_Module_add_targets,shell,\
StaticLibrary_xmlparser \
+ Library_syssh \
))
endif
commit 628a6607513d19faac17274dfa88d2e4e384ce30
Author: Andras Timar <andras.ti...@collabora.com>
Date: Thu Apr 17 09:55:57 2014 -0700
LibreOffice from Collabora versioning
Change-Id: Iff7004808f9637f3dbc6393751246c3a82134487
diff --git a/configure.ac b/configure.ac
index 64fa5db..a6d36c5 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.2.4.0.0+],[],[],[http://documentfoundation.org/])
+AC_INIT([LibreOffice],[4.2.10.1],[],[],[https://libreoffice-from-collabora.com/])
AC_PREREQ([2.59])
diff --git a/instsetoo_native/util/openoffice.lst.in
b/instsetoo_native/util/openoffice.lst.in
index 92da96a..5b6ae24 100644
--- a/instsetoo_native/util/openoffice.lst.in
+++ b/instsetoo_native/util/openoffice.lst.in
@@ -4,7 +4,7 @@ Globals
{
variables
{
- UREPACKAGEVERSION
@LIBO_VERSION_MAJOR@.@LIBO_VERSION_MINOR@.@LIBO_VERSION_MICRO@.@LIBO_VERSION_PATCH@@LIBO_VERSION_SUFFIX@
+ UREPACKAGEVERSION @LIBO_VERSION_MAJOR@.@LIBO_VERSION_MINOR@
URELAYERVERSION 1
REFERENCEOOOMAJORMINOR 3.4
WINDOWSBASISROOTNAME LibreOffice @LIBO_VERSION_MAJOR@
@@ -29,7 +29,7 @@ Globals
CREATE_MSP_INSTALLSET 0
UPDATE_DATABASE_LISTNAME finals_instsetoo.txt
PACKAGEMAP package_names.txt,package_names_ext.txt
- WINDOWSPATCHLEVEL 8
+ WINDOWSPATCHLEVEL @LIBO_VERSION_PATCH@
OOOVENDOR The Document Foundation
OOODOWNLOADNAME 1
STARTCENTER_HIDE_EXTERNAL_LINKS 0
@@ -45,19 +45,19 @@ LibreOffice
{
PRODUCTNAME LibreOffice
PRODUCTVERSION @LIBO_VERSION_MAJOR@.@LIBO_VERSION_MINOR@
- PRODUCTEXTENSION
.@LIBO_VERSION_MICRO@.@LIBO_VERSION_PATCH@@LIBO_VERSION_SUFFIX@
+ PRODUCTEXTENSION -@LIBO_VERSION_PATCH@
POSTVERSIONEXTENSION
BUNDLEIDENTIFIER @MACOSX_BUNDLE_IDENTIFIER@
BRANDPACKAGEVERSION @LIBO_VERSION_MAJOR@.@LIBO_VERSION_MINOR@
USERDIRPRODUCTVERSION @LIBO_VERSION_MAJOR@
- ABOUTBOXPRODUCTVERSION
@LIBO_VERSION_MAJOR@.@LIBO_VERSION_MINOR@.@LIBO_VERSION_MICRO@.@LIBO_VERSION_PATCH@@LIBO_VERSION_SUFFIX@
- ABOUTBOXPRODUCTVERSIONSUFFIX @LIBO_VERSION_SUFFIX_SUFFIX@
+ ABOUTBOXPRODUCTVERSION
@LIBO_VERSION_MAJOR@.@LIBO_VERSION_MINOR@-@LIBO_VERSION_PATCH@
+ ABOUTBOXPRODUCTVERSIONSUFFIX
BASEPRODUCTVERSION @LIBO_VERSION_MAJOR@.@LIBO_VERSION_MINOR@
PCPFILENAME libreoffice.pcp
UPDATEURL http://update.libreoffice.org/check.php
ADD_INCLUDE_FILES
cli_ure/version/version.txt,unoil/climaker/version.txt
ADDSYSTEMINTEGRATION 1
- PACKAGEVERSION
@LIBO_VERSION_MAJOR@.@LIBO_VERSION_MINOR@.@LIBO_VERSION_MICRO@.@LIBO_VERSION_PATCH@@LIBO_VERSION_SUFFIX@
+ PACKAGEVERSION
@LIBO_VERSION_MAJOR@.@LIBO_VERSION_MINOR@.@LIBO_VERSION_MICRO@.@LIBO_VERSION_PATCH@
PACKAGEREVISION {buildid}
LICENSENAME LGPL
GLOBALFILEGID gid_File_Lib_Oox
diff --git a/postprocess/CustomTarget_registry.mk
b/postprocess/CustomTarget_registry.mk
index 364bb2c..6d755759 100644
--- a/postprocess/CustomTarget_registry.mk
+++ b/postprocess/CustomTarget_registry.mk
@@ -550,7 +550,7 @@ $(foreach lang,$(gb_Configuration_LANGS),$(eval $(call
postprocess_lang_deps,$(l
#
postprocess_main_SED := \
- -e
's,$${ABOUTBOXPRODUCTVERSION},$(LIBO_VERSION_MAJOR).$(LIBO_VERSION_MINOR).$(LIBO_VERSION_MICRO).$(LIBO_VERSION_PATCH)$(LIBO_VERSION_SUFFIX),g'
\
+ -e
's,$${ABOUTBOXPRODUCTVERSION},$(LIBO_VERSION_MAJOR).$(LIBO_VERSION_MINOR)-$(LIBO_VERSION_PATCH),g'
\
-e 's,$${ABOUTBOXPRODUCTVERSIONSUFFIX},$(LIBO_VERSION_SUFFIX_SUFFIX),g'
\
-e
's,$${DICT_REPO_URL},http://extensions.libreoffice.org/dictionaries/,g' \
-e 's,$${OOOVENDOR},$(if $(OOO_VENDOR),$(subst
$(COMMA),\x2c,$(OOO_VENDOR)),The Document Foundation),g' \
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
