[Libreoffice-commits] core.git: extras/Module_extras.mk extras/Package_autocorr.mk extras/Zip_autocorr.mk scp2/source

[David Tardon]

 extras/Module_extras.mk            |    2 -
 extras/Package_autocorr.mk         |   59 +++++++++++++++++++++++++++++++++++++
 extras/Zip_autocorr.mk             |   57 -----------------------------------
 scp2/source/ooo/file_extra_ooo.scp |    6 +--
 4 files changed, 63 insertions(+), 61 deletions(-)

New commits:
commit a593069ff9f64dd94e8210b0cff03b65fe059b40
Author: David Tardon <dtardon at redhat.com>
Date:   Mon Apr 1 09:38:35 2013 +0200

    move autocorr.zip to package
    
    Change-Id: Ia032d3cb3c41a654ab42b9fe5b2d79bc7ca713f1
    Reviewed-on: https://gerrit.libreoffice.org/3150
    Reviewed-by: Fridrich Strba <fridrich at documentfoundation.org>
    Tested-by: Fridrich Strba <fridrich at documentfoundation.org>

diff --git a/extras/Module_extras.mk b/extras/Module_extras.mk
index c6d9744..977c475 100644
--- a/extras/Module_extras.mk
+++ b/extras/Module_extras.mk
@@ -13,13 +13,13 @@ $(eval $(call gb_Module_add_targets,extras,\
 	AllLangZip_autotextshare \
 	CustomTarget_autocorr \
 	CustomTarget_glade \
+	Package_autocorr \
 	Package_fonts \
 	Package_glade \
 	Package_labels \
 	Package_newfiles \
 	Package_palettes \
 	Package_wordbook \
-	Zip_autocorr \
 	Zip_autotextuser \
 	Zip_cfgsrvbitmapunx \
 	Zip_cfgsrvnolang \
diff --git a/extras/Package_autocorr.mk b/extras/Package_autocorr.mk
new file mode 100644
index 0000000..87ab16a
--- /dev/null
+++ b/extras/Package_autocorr.mk
@@ -0,0 +1,59 @@
+# -*- 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_autocorr,$(call gb_CustomTarget_get_workdir,extras/source/autotext)))
+
+$(eval $(call gb_Package_set_outdir,extras_autocorr,$(INSTDIR)))
+
+$(eval $(call gb_Package_add_files,extras_autocorr,share/autocorr,\
+	acor_af-ZA.dat \
+	acor_bg-BG.dat \
+	acor_cs-CZ.dat \
+	acor_ca.dat \
+	acor_da-DK.dat \
+	acor_de-DE.dat \
+	acor_en-AU.dat \
+	acor_en-GB.dat \
+	acor_en-US.dat \
+	acor_en-ZA.dat \
+	acor_es-ES.dat \
+	acor_fa-IR.dat \
+	acor_fi-FI.dat \
+	acor_fr-FR.dat \
+	acor_ga-IE.dat \
+	acor_hr-HR.dat \
+	acor_hu-HU.dat \
+	acor_it-IT.dat \
+	acor_ja-JP.dat \
+	acor_ko-KR.dat \
+	acor_lb-LU.dat \
+	acor_lt-LT.dat \
+	acor_mn-MN.dat \
+	acor_nl-BE.dat \
+	acor_nl-NL.dat \
+	acor_pl-PL.dat \
+	acor_pt-BR.dat \
+	acor_pt-PT.dat \
+	acor_ru-RU.dat \
+	acor_sh-ME.dat \
+	acor_sh-RS.dat \
+	acor_sh-YU.dat \
+	acor_sk-SK.dat \
+	acor_sl-SI.dat \
+	acor_sr-ME.dat \
+	acor_sr-RS.dat \
+	acor_sr-YU.dat \
+	acor_sv-SE.dat \
+	acor_tr-TR.dat \
+	acor_vi-VN.dat \
+	acor_zh-CN.dat \
+	acor_zh-TW.dat \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/extras/Zip_autocorr.mk b/extras/Zip_autocorr.mk
deleted file mode 100644
index adf5651..0000000
--- a/extras/Zip_autocorr.mk
+++ /dev/null
@@ -1,57 +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,autocorr,$(call gb_CustomTarget_get_workdir,extras/source/autotext)))
-
-$(eval $(call gb_Zip_add_files,autocorr,\
-	acor_af-ZA.dat \
-	acor_bg-BG.dat \
-	acor_cs-CZ.dat \
-	acor_ca.dat \
-	acor_da-DK.dat \
-	acor_de-DE.dat \
-	acor_en-AU.dat \
-	acor_en-GB.dat \
-	acor_en-US.dat \
-	acor_en-ZA.dat \
-	acor_es-ES.dat \
-	acor_fa-IR.dat \
-	acor_fi-FI.dat \
-	acor_fr-FR.dat \
-	acor_ga-IE.dat \
-	acor_hr-HR.dat \
-	acor_hu-HU.dat \
-	acor_it-IT.dat \
-	acor_ja-JP.dat \
-	acor_ko-KR.dat \
-	acor_lb-LU.dat \
-	acor_lt-LT.dat \
-	acor_mn-MN.dat \
-	acor_nl-BE.dat \
-	acor_nl-NL.dat \
-	acor_pl-PL.dat \
-	acor_pt-BR.dat \
-	acor_pt-PT.dat \
-	acor_ru-RU.dat \
-	acor_sh-ME.dat \
-	acor_sh-RS.dat \
-	acor_sh-YU.dat \
-	acor_sk-SK.dat \
-	acor_sl-SI.dat \
-	acor_sr-ME.dat \
-	acor_sr-RS.dat \
-	acor_sr-YU.dat \
-	acor_sv-SE.dat \
-	acor_tr-TR.dat \
-	acor_vi-VN.dat \
-	acor_zh-CN.dat \
-	acor_zh-TW.dat \
-))
-
-# 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 52dbff4..2eef8a5 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