move palettes.zip to package

Change-Id: Ide4e393ff2d735d9cdf01fcb489d65b7659acdbe
Reviewed-on: https://gerrit.libreoffice.org/3151Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org>
Tested-by: Fridrich Strba <fridrich@documentfoundation.org>

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 \

extras/Zip_palettes.mk → extras/Package_palettes.mk

@@ -7,9 +7,11 @@
 # 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_Package_Package,extras_palettes,$(SRCDIR)/extras/source/palettes))
 
-$(eval $(call gb_Zip_add_files,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 \

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