extensions/Package_mdibundle.mk | 4 +++- solenv/gbuild/Dictionary.mk | 2 +- solenv/gbuild/Extension.mk | 2 +- sysui/desktop/icons/main.icns |binary 4 files changed, 5 insertions(+), 3 deletions(-)
New commits: commit 0b6555f594095ddc082d555852f7d8e9f7d7f266 Author: Tor Lillqvist <[email protected]> Date: Fri Sep 12 23:50:11 2014 +0300 Put schema.xml in the correct place, and drop the empty English strings file Change-Id: Ic9d3894611eedcffa9ce79ae8b2745de72eb9117 diff --git a/extensions/Package_mdibundle.mk b/extensions/Package_mdibundle.mk index 3677116..88f70f2 100644 --- a/extensions/Package_mdibundle.mk +++ b/extensions/Package_mdibundle.mk @@ -11,7 +11,9 @@ $(eval $(call gb_Package_Package,extensions_mdibundle,$(SRCDIR)/extensions/sourc $(eval $(call gb_Package_add_files,extensions_mdibundle,Library/Spotlight/OOoSpotlightImporter.mdimporter/Contents,\ Info.plist \ - en.lproj/schema.strings \ +)) + +$(eval $(call gb_Package_add_files,extensions_mdibundle,Library/Spotlight/OOoSpotlightImporter.mdimporter/Contents/Resources,\ schema.xml \ )) commit 0307129596344fb40dc5ade2fb6a6dd913b1799e Author: Tor Lillqvist <[email protected]> Date: Fri Sep 12 23:49:21 2014 +0300 Use the white on purple LOfC icon Change-Id: I2c49e5018742f35c57ab1290b783e47ed0a3b73b diff --git a/sysui/desktop/icons/main.icns b/sysui/desktop/icons/main.icns index c3e1bf6..9ef3f72 100644 Binary files a/sysui/desktop/icons/main.icns and b/sysui/desktop/icons/main.icns differ commit 8186717d70d438957537430c57c3a598eaa8cc73 Author: Tor Lillqvist <[email protected]> Date: Fri Sep 12 20:03:54 2014 +0300 Use $(LIBO_SHARE_FOLDER) instead of hardcoded 'share' Change-Id: I073d44c0e3e8c6eff0e885f827fa661e3c8e5206 diff --git a/solenv/gbuild/Dictionary.mk b/solenv/gbuild/Dictionary.mk index 651d5ae9..8b8c8c5 100644 --- a/solenv/gbuild/Dictionary.mk +++ b/solenv/gbuild/Dictionary.mk @@ -185,7 +185,7 @@ endef # all installed files of the dictionary. gb_Dictionary_ALL_LANGS := $(filter-out en-US,$(gb_WITH_LANG)) -gb_Dictionary_INSTDIR := share/extensions +gb_Dictionary_INSTDIR := $(LIBO_SHARE_FOLDER)/extensions $(dir $(call gb_Dictionary_get_target,%)).dir : $(if $(wildcard $(dir $@)),,mkdir -p $(dir $@)) diff --git a/solenv/gbuild/Extension.mk b/solenv/gbuild/Extension.mk index 419deb6..1885755 100644 --- a/solenv/gbuild/Extension.mk +++ b/solenv/gbuild/Extension.mk @@ -150,7 +150,7 @@ endef # gb_Extension__Extension_deliver extension package-name define gb_Extension__Extension_deliver $(call gb_GeneratedPackage_GeneratedPackage,$(2),$(dir $(call gb_Extension_get_rootdir,$(1)))) -$(call gb_GeneratedPackage_add_dir,$(2),$(INSTROOT)/share/extensions/$(1),$(notdir $(call gb_Extension_get_rootdir,$(1)))) +$(call gb_GeneratedPackage_add_dir,$(2),$(INSTROOT)/$(LIBO_SHARE_FOLDER)/extensions/$(1),$(notdir $(call gb_Extension_get_rootdir,$(1)))) $(call gb_GeneratedPackage_get_target,$(2)) : $(call gb_Extension_get_target,$(1)) $(call gb_Extension__get_final_target,$(1)) : $(call gb_GeneratedPackage_get_target,$(2)) _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
