[PATCH] move palettes.zip to package

Hi,

I have submitted a patch for review:

    https://gerrit.libreoffice.org/3151

To pull it, you can do:

    git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/51/3151/1

move palettes.zip to package

Change-Id: Ide4e393ff2d735d9cdf01fcb489d65b7659acdbe
---
M extras/Module_extras.mk
R extras/Package_palettes.mk
M scp2/source/ooo/file_extra_ooo.scp
3 files changed, 6 insertions(+), 6 deletions(-)



diff --git a/extras/Module_extras.mk b/extras/Module_extras.mk
index e9f9667..977c475 100644
--- a/extras/Module_extras.mk
+++ b/extras/Module_extras.mk
@@ -18,6 +18,7 @@
        Package_glade \
        Package_labels \
        Package_newfiles \
+       Package_palettes \
        Package_wordbook \
        Zip_autotextuser \
        Zip_cfgsrvbitmapunx \
@@ -33,7 +34,6 @@
        Zip_gallsystem \
        Zip_gallwwwback \
        Zip_gallwwwgraf \
-       Zip_palettes \
        Zip_tpllayoutimpr \
        Zip_tplwizagenda \
        Zip_tplwizbitmap \
diff --git a/extras/Zip_palettes.mk b/extras/Package_palettes.mk
similarity index 80%
rename from extras/Zip_palettes.mk
rename to extras/Package_palettes.mk
index e4cdaab..937c1e4 100644
--- a/extras/Zip_palettes.mk
+++ b/extras/Package_palettes.mk
@@ -7,9 +7,9 @@
 # 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_add_files,extras_palettes,files/presets/config,\
        arrowhd.soe \
        classic.sog \
        cmyk.soc \
diff --git a/scp2/source/ooo/file_extra_ooo.scp b/scp2/source/ooo/file_extra_ooo.scp
index fd08738..2eef8a5 100644
--- a/scp2/source/ooo/file_extra_ooo.scp
+++ b/scp2/source/ooo/file_extra_ooo.scp
@@ -297,10 +297,10 @@
 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
 

-- 
To view, visit https://gerrit.libreoffice.org/3151
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ide4e393ff2d735d9cdf01fcb489d65b7659acdbe
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: David Tardon <dtardon@redhat.com>