extras/Module_extras.mk | 2 +- extras/Package_palettes.mk | 36 ++++++++++++++++++++++++++++++++++++ extras/Zip_palettes.mk | 34 ---------------------------------- scp2/source/ooo/file_extra_ooo.scp | 6 +++--- 4 files changed, 40 insertions(+), 38 deletions(-)
New commits: commit 221cd46f47f40c892e554b0848978bda3d9957e1 Author: David Tardon <[email protected]> Date: Mon Apr 1 13:17:02 2013 +0200 move palettes.zip to package Change-Id: Ide4e393ff2d735d9cdf01fcb489d65b7659acdbe Reviewed-on: https://gerrit.libreoffice.org/3151 Reviewed-by: Fridrich Strba <[email protected]> Tested-by: Fridrich Strba <[email protected]> diff --git a/extras/Module_extras.mk b/extras/Module_extras.mk index c3cb14b..c6d9744 100644 --- a/extras/Module_extras.mk +++ b/extras/Module_extras.mk @@ -17,6 +17,7 @@ $(eval $(call gb_Module_add_targets,extras,\ Package_glade \ Package_labels \ Package_newfiles \ + Package_palettes \ Package_wordbook \ Zip_autocorr \ Zip_autotextuser \ @@ -33,7 +34,6 @@ $(eval $(call gb_Module_add_targets,extras,\ Zip_gallsystem \ Zip_gallwwwback \ Zip_gallwwwgraf \ - Zip_palettes \ Zip_tpllayoutimpr \ Zip_tplwizagenda \ Zip_tplwizbitmap \ diff --git a/extras/Package_palettes.mk b/extras/Package_palettes.mk new file mode 100644 index 0000000..767fb78 --- /dev/null +++ b/extras/Package_palettes.mk @@ -0,0 +1,36 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +# +# This file is part of the LibreOffice project. +# +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. +# + +$(eval $(call gb_Package_Package,extras_palettes,$(SRCDIR)/extras/source/palettes)) + +$(eval $(call gb_Package_set_outdir,extras_palettes,$(INSTDIR))) + +$(eval $(call gb_Package_add_files,extras_palettes,presets/config,\ + arrowhd.soe \ + classic.sog \ + cmyk.soc \ + gallery.soc \ + hatching.soh \ + html.soc \ + libreoffice.soc \ + modern.sog \ + palette.soc \ + scribus.soc \ + standard.sob \ + standard.soc \ + standard.sod \ + standard.soe \ + standard.sog \ + standard.soh \ + styles.sod \ + tango.soc \ + web.soc \ +)) + +# vim: set noet sw=4 ts=4: diff --git a/extras/Zip_palettes.mk b/extras/Zip_palettes.mk deleted file mode 100644 index e4cdaab..0000000 --- a/extras/Zip_palettes.mk +++ /dev/null @@ -1,34 +0,0 @@ -# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- -# -# This file is part of the LibreOffice project. -# -# This Source Code Form is subject to the terms of the Mozilla Public -# License, v. 2.0. If a copy of the MPL was not distributed with this -# file, You can obtain one at http://mozilla.org/MPL/2.0/. -# - -$(eval $(call gb_Zip_Zip,palettes,$(SRCDIR)/extras/source/palettes)) - -$(eval $(call gb_Zip_add_files,palettes,\ - arrowhd.soe \ - classic.sog \ - cmyk.soc \ - gallery.soc \ - hatching.soh \ - html.soc \ - libreoffice.soc \ - modern.sog \ - palette.soc \ - scribus.soc \ - standard.sob \ - standard.soc \ - standard.sod \ - standard.soe \ - standard.sog \ - standard.soh \ - styles.sod \ - tango.soc \ - web.soc \ -)) - -# vim: set noet sw=4 ts=4: diff --git a/scp2/source/ooo/file_extra_ooo.scp b/scp2/source/ooo/file_extra_ooo.scp index 260c835..52dbff4 100644 --- a/scp2/source/ooo/file_extra_ooo.scp +++ b/scp2/source/ooo/file_extra_ooo.scp @@ -297,10 +297,10 @@ File gid_File_Extra_Index_Pl End File gid_File_Extra_Palettes - Dir = gid_Dir_User_Config; + Dir = FILELIST_DIR; USER_FILE_BODY; - Styles = (ARCHIVE, WORKSTATION, DONT_OVERWRITE); - Name = "palettes.zip"; + Styles = (FILELIST, WORKSTATION, DONT_OVERWRITE); + Name = "extras_palettes.filelist"; Patchfiles = (); End _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
