[Libreoffice-commits] core.git: extras/Module_extras.mk extras/Package_wordbook.mk extras/Zip_wordbook.mk scp2/source

[Andras Timar]

 extras/Module_extras.mk            |    2 +-
 extras/Package_wordbook.mk         |   19 +++++++++++++++++++
 extras/Zip_wordbook.mk             |   19 -------------------
 scp2/source/ooo/file_extra_ooo.scp |   24 ++++++++++++++++++++++--
 scp2/source/ooo/module_ooo.scp     |    4 ++--
 5 files changed, 44 insertions(+), 24 deletions(-)

New commits:
commit a4547696d272588374fd391233626df986275870
Author: Andras Timar <atimar at suse.com>
Date:   Fri Feb 8 22:29:35 2013 +0100

    fdo#50827 move language dependent wordlists to the appropriate dict pack
    
    Change-Id: Ie60051b65834cdfc748d12a71089a683f3108335

diff --git a/extras/Module_extras.mk b/extras/Module_extras.mk
index 3165980..d3f6e07 100644
--- a/extras/Module_extras.mk
+++ b/extras/Module_extras.mk
@@ -14,6 +14,7 @@ $(eval $(call gb_Module_add_targets,extras,\
 	CustomTarget_autocorr \
 	Package_fonts \
 	Package_newfiles \
+	Package_wordbook \
 	Zip_autocorr \
 	Zip_autotextuser \
 	Zip_cfgsrvbitmapunx \
@@ -38,7 +39,6 @@ $(eval $(call gb_Module_add_targets,extras,\
 	Zip_tplwizletter \
 	Zip_tplwizreport \
 	Zip_tplwizstyles \
-	Zip_wordbook \
 ))
 
 ifeq ($(WITH_EXTRA_EXTENSIONS),YES)
diff --git a/extras/Package_wordbook.mk b/extras/Package_wordbook.mk
new file mode 100644
index 0000000..dc79fa8
--- /dev/null
+++ b/extras/Package_wordbook.mk
@@ -0,0 +1,19 @@
+# -*- 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_wordbook,$(SRCDIR)/extras/source/wordbook))
+
+$(eval $(call gb_Package_add_files,extras_wordbook,pck,\
+	en-GB.dic \
+	en-US.dic \
+	sl.dic \
+	technical.dic \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/extras/Zip_wordbook.mk b/extras/Zip_wordbook.mk
deleted file mode 100644
index 7641665..0000000
--- a/extras/Zip_wordbook.mk
+++ /dev/null
@@ -1,19 +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,wordbook,$(SRCDIR)/extras/source/wordbook))
-
-$(eval $(call gb_Zip_add_files,wordbook,\
-	en-GB.dic \
-	en-US.dic \
-	sl.dic \
-	technical.dic \
-))
-
-# 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 5ba170b..260c835 100644
--- a/scp2/source/ooo/file_extra_ooo.scp
+++ b/scp2/source/ooo/file_extra_ooo.scp
@@ -403,7 +403,27 @@ End
 
 File gid_File_Extra_Wordbook
     Dir = gid_Dir_Wordbook;
+    PACKED_TXT_FILE_BODY;
+    Name = "technical.dic";
+End
+
+File gid_File_Extra_Wordbook_en_US
+    Dir = gid_Dir_Wordbook;
     TXT_FILE_BODY;
-    Styles = (ARCHIVE, DONT_OVERWRITE);
-    Name = "wordbook.zip";
+    Styles = (PACKED, FORCELANGUAGEPACK);
+    Name = "en-US.dic";
+End
+
+File gid_File_Extra_Wordbook_en_GB
+    Dir = gid_Dir_Wordbook;
+    TXT_FILE_BODY;
+    Styles = (PACKED, FORCELANGUAGEPACK);
+    Name = "en-GB.dic";
+End
+
+File gid_File_Extra_Wordbook_sl
+    Dir = gid_Dir_Wordbook;
+    TXT_FILE_BODY;
+    Styles = (PACKED, FORCELANGUAGEPACK);
+    Name = "sl.dic";
 End
diff --git a/scp2/source/ooo/module_ooo.scp b/scp2/source/ooo/module_ooo.scp
index dfa8391..945c133 100644
--- a/scp2/source/ooo/module_ooo.scp
+++ b/scp2/source/ooo/module_ooo.scp
@@ -189,7 +189,7 @@ End
 
 Module gid_Module_Root_Extension_Dictionary_En
     MOD_NAME_DESC ( MODULE_EXTENSION_DICTIONARY_EN );
-    Files = (gid_File_Extension_Dictionary_En);
+    Files = (gid_File_Extension_Dictionary_En, gid_File_Extra_Wordbook_en_US, gid_File_Extra_Wordbook_en_GB);
     InstallOrder = "2000";
     Sortkey = "550";
     Spellcheckerlanguage = "en";
@@ -486,7 +486,7 @@ End
 
 Module gid_Module_Root_Extension_Dictionary_Sl
     MOD_NAME_DESC ( MODULE_EXTENSION_DICTIONARY_SL );
-    Files = (gid_File_Extension_Dictionary_Sl);
+    Files = (gid_File_Extension_Dictionary_Sl, gid_File_Extra_Wordbook_sl);
     InstallOrder = "2000";
     Sortkey = "710";
     Spellcheckerlanguage = "sl";