extras/Module_extras.mk | 2 +-
instsetoo_native/CustomTarget_setup.mk | 2 +-
scp2/source/ooo/directory_ooo.scp | 16 ----------------
3 files changed, 2 insertions(+), 18 deletions(-)
New commits:
commit 97da1b3c060976089f16ea9f01fb479c119ac4d3
Author: Stephan Bergmann <sberg...@redhat.com>
Date: Wed Nov 26 12:17:26 2014 +0100
share/template/shellnew/soffice.od? are only installed on Windows
Change-Id: Id6afa19b5d1cbb0a76bb7d8a34d40ba4eda214ec
diff --git a/extras/Module_extras.mk b/extras/Module_extras.mk
index 51d617f..530d076 100644
--- a/extras/Module_extras.mk
+++ b/extras/Module_extras.mk
@@ -29,7 +29,7 @@ $(eval $(call gb_Module_add_targets,extras,\
Package_gallwwwgraf \
Package_glade \
Package_labels \
- Package_newfiles \
+ $(if $(filter WNT,$(OS)),Package_newfiles) \
Package_palettes \
Package_tpllayoutimpr \
Package_tplwizagenda \
commit b7e2b744e1e1348a20c120a8f9f9bb2bc4ebb1e3
Author: Stephan Bergmann <sberg...@redhat.com>
Date: Wed Nov 26 12:02:43 2014 +0100
Generate consistent buildid values in instdir/ setup and version ini-files
...consistent with the values in the correpsonding ini-files in generated
installation sets.
Change-Id: I8466cc64d309bbb3fe4bec7833803081d14e1097
diff --git a/instsetoo_native/CustomTarget_setup.mk
b/instsetoo_native/CustomTarget_setup.mk
index 01d2f9c..abab2b3 100644
--- a/instsetoo_native/CustomTarget_setup.mk
+++ b/instsetoo_native/CustomTarget_setup.mk
@@ -131,7 +131,7 @@ $(call
gb_CustomTarget_get_workdir,instsetoo_native/setup)/$(call gb_Helper_get_
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),ECH,1)
( \
echo '[Bootstrap]' \
- && echo
'buildid=$(LIBO_VERSION_MAJOR)$(LIBO_VERSION_MINOR)$(LIBO_VERSION_MICRO)(Build:$(LIBO_VERSION_PATCH))'
\
+ && echo 'buildid=$(shell cd $(SRCDIR) && git log -1
--format=%H)' \
) > $@
$(call gb_CustomTarget_get_workdir,instsetoo_native/setup)/$(call
gb_Helper_get_rcfile,soffice) :
commit 7e1c55f3c3a227ba44fb56673372cd7b857b5c0c
Author: Stephan Bergmann <sberg...@redhat.com>
Date: Wed Nov 26 11:23:37 2014 +0100
No need for empty presets/uno_packages/
...it is created on demand in the UserInstallation via
dp_misc::create_folder
(desktop/source/deployment/misc/dp_ucb.cxx)---and was only present in
installation sets, not in instdir/, anyway.
Change-Id: I37caf24a9d8821c49815be9d6b9b15c08a66af95
diff --git a/scp2/source/ooo/directory_ooo.scp
b/scp2/source/ooo/directory_ooo.scp
index 878da98..1337098 100644
--- a/scp2/source/ooo/directory_ooo.scp
+++ b/scp2/source/ooo/directory_ooo.scp
@@ -132,12 +132,6 @@ Directory gid_Dir_User
DosName = "presets";
End
-Directory gid_Dir_User_Uno_Packages
- ParentID = gid_Dir_User;
- DosName = "uno_packages";
- Styles = (CREATE);
-End
-
Directory gid_Dir_User_Basic
ParentID = gid_Dir_User;
DosName = "basic";
commit d25228d045dd779db98ecbd83394ee019d6a89f8
Author: Stephan Bergmann <sberg...@redhat.com>
Date: Wed Nov 26 11:07:48 2014 +0100
No need for empty presets/psprint/
...it is created on demand in the UserInstallation in psp::getOfficePath
(vcl/generic/fontmanager/helper.cxx)---and was only present in installation
sets, not in instdir/, anyway.
Change-Id: I6d7314f7fa4f6c0040e94e49ac1fe34d03e861be
diff --git a/scp2/source/ooo/directory_ooo.scp
b/scp2/source/ooo/directory_ooo.scp
index 110f67f..878da98 100644
--- a/scp2/source/ooo/directory_ooo.scp
+++ b/scp2/source/ooo/directory_ooo.scp
@@ -386,16 +386,6 @@ End
#ifdef UNX
-Directory gid_Dir_User_Psprint
- ParentID = gid_Dir_User;
- DosName = "psprint";
- Styles = (CREATE);
-End
-
-#endif
-
-#ifdef UNX
-
Directory gid_Dir_Fonts_Truetype
ParentID = gid_Dir_Fonts;
DosName = "truetype";
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
