diff options
| author | Andras Timar <andras.timar@collabora.com> | 2014-04-17 09:55:57 -0700 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2017-02-19 23:56:33 +0100 |
| commit | 1d1a79ef024fa6b860d0084c1f7ab13f85b4f22e (patch) | |
| tree | 857f9725548f490cef3a461cc20d485eea243208 /postprocess | |
| parent | disable Liberation fonts on Windows (diff) | |
| download | core-1d1a79ef024fa6b860d0084c1f7ab13f85b4f22e.tar.gz core-1d1a79ef024fa6b860d0084c1f7ab13f85b4f22e.zip | |
Collabora Office versioning
Conflicts:
configure.ac
Conflicts:
configure.ac
instsetoo_native/util/openoffice.lst.in
(cherry picked from commit dec4b25aaceeba671c0c3f7f81ef13e5b8e42e00)
Change-Id: Iff7004808f9637f3dbc6393751246c3a82134487
Diffstat (limited to 'postprocess')
| -rw-r--r-- | postprocess/CustomTarget_registry.mk | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/postprocess/CustomTarget_registry.mk b/postprocess/CustomTarget_registry.mk index 5fa06e63c484..88f43b7bc2ad 100644 --- a/postprocess/CustomTarget_registry.mk +++ b/postprocess/CustomTarget_registry.mk @@ -536,7 +536,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' \ |