Date: prev next · Thread: first prev next last
2013 Archives by date, by thread · List index


Hi,

I have submitted a patch for review:

    https://gerrit.libreoffice.org/3150

To pull it, you can do:

    git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/50/3150/1

move autocorr.zip to package

Change-Id: Ia032d3cb3c41a654ab42b9fe5b2d79bc7ca713f1
---
M extras/Module_extras.mk
R extras/Package_autocorr.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 c3cb14b..e9f9667 100644
--- a/extras/Module_extras.mk
+++ b/extras/Module_extras.mk
@@ -13,12 +13,12 @@
        AllLangZip_autotextshare \
        CustomTarget_autocorr \
        CustomTarget_glade \
+       Package_autocorr \
        Package_fonts \
        Package_glade \
        Package_labels \
        Package_newfiles \
        Package_wordbook \
-       Zip_autocorr \
        Zip_autotextuser \
        Zip_cfgsrvbitmapunx \
        Zip_cfgsrvnolang \
diff --git a/extras/Zip_autocorr.mk b/extras/Package_autocorr.mk
similarity index 85%
rename from extras/Zip_autocorr.mk
rename to extras/Package_autocorr.mk
index adf5651..7711ffa 100644
--- a/extras/Zip_autocorr.mk
+++ b/extras/Package_autocorr.mk
@@ -7,9 +7,9 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-$(eval $(call gb_Zip_Zip,autocorr,$(call gb_CustomTarget_get_workdir,extras/source/autotext)))
+$(eval $(call gb_Package_Package,extras_autocorr,$(call 
gb_CustomTarget_get_workdir,extras/source/autotext)))
 
-$(eval $(call gb_Zip_add_files,autocorr,\
+$(eval $(call gb_Package_add_files,extras_autocorr,files/share/autocorr,\
        acor_af-ZA.dat \
        acor_bg-BG.dat \
        acor_cs-CZ.dat \
diff --git a/scp2/source/ooo/file_extra_ooo.scp b/scp2/source/ooo/file_extra_ooo.scp
index 260c835..fd08738 100644
--- a/scp2/source/ooo/file_extra_ooo.scp
+++ b/scp2/source/ooo/file_extra_ooo.scp
@@ -28,10 +28,10 @@
 #include "macros.inc"
 
 File gid_File_Extra_Autocorr
-    Dir = gid_Dir_Share_Autocorr;
+    Dir = FILELIST_DIR;
     USER_FILE_BODY;
-    Styles = (ARCHIVE);
-    Name = "autocorr.zip";
+    Styles = (FILELIST);
+    Name = "extras_autocorr.filelist";
 End
 
 File gid_File_Extra_Autotextshare_Lang

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

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


Context


Privacy Policy | Impressum (Legal Info) | Copyright information: Unless otherwise specified, all text and images on this website are licensed under the Creative Commons Attribution-Share Alike 3.0 License. This does not include the source code of LibreOffice, which is licensed under the Mozilla Public License (MPLv2). "LibreOffice" and "The Document Foundation" are registered trademarks of their corresponding registered owners or are in actual use as trademarks in one or more countries. Their respective logos and icons are also subject to international copyright laws. Use thereof is explained in our trademark policy.