[ooo-build-commit] Branch 'ooo/OOO320' - 3 commits - instsetoo_native/util scp2/source solenv/inc
Jan Holesovsky
kendy at kemper.freedesktop.org
Fri Jan 8 17:13:55 PST 2010
instsetoo_native/util/pack.lst | 4 +-
scp2/source/ooo/file_ooo.scp | 49 ++++++++++++++++++++++++-
scp2/source/ooo/module_hidden_ooo.scp | 65 +++++++++++++++++++++++++++++++---
solenv/inc/minor.mk | 6 +--
solenv/inc/postset.mk | 1
5 files changed, 113 insertions(+), 12 deletions(-)
New commits:
commit 69a1cd8ed11108547bea11eb90329f3236e96706
Author: Release Engineers <releng at openoffice.org>
Date: Fri Jan 8 15:44:02 2010 +0000
OOO320
diff --git a/solenv/inc/minor.mk b/solenv/inc/minor.mk
index e498f1a..399e856 100644
--- a/solenv/inc/minor.mk
+++ b/solenv/inc/minor.mk
@@ -1,5 +1,5 @@
RSCVERSION=320
-RSCREVISION=320m8(Build:9472)
-BUILD=9472
-LAST_MINOR=m8
+RSCREVISION=320m9(Build:9476)
+BUILD=9476
+LAST_MINOR=m9
SOURCEVERSION=OOO320
commit aec09b31db1e81b8b8c4d285649eb0f2bfd779fc
Author: Oliver Bolte <obo at openoffice.org>
Date: Fri Jan 8 15:31:19 2010 +0000
#i10000# OOo_wJRE for unxlngi6.pro and unxlngx6.pro active again
diff --git a/instsetoo_native/util/pack.lst b/instsetoo_native/util/pack.lst
index 4a1a6b3..ab267b3 100755
--- a/instsetoo_native/util/pack.lst
+++ b/instsetoo_native/util/pack.lst
@@ -10,8 +10,8 @@
OpenOffice unxlngi6.pro,unxmacxi.pro,unxsoli4.pro,unxsols4.pro,wntmsci12.pro,unxlngx6.pro en-US|ar|bg|bn|ca|cs|da|de|el|en-GB|es|et|eu|fi|fr|gl|hu|it|ja|km|ko|lt|mk|nb|nl|nn|om|pl|pt|ru|sh|sl|sr|sv|tr|vi|zh-CN|zh-TW openoffice
OpenOffice unxlngi6,unxmacxi,unxsoli4,unxsols4,wntmsci12 en-US openoffice
BrOffice unxlngi6.pro,unxlngx6.pro,unxmacxi.pro,unxsoli4.pro,unxsols4.pro,wntmsci12.pro pt-BR broffice
-OpenOffice_wJRE unxsoli4.pro,unxsols4.pro,wntmsci12.pro en-US|ar|bg|bn|ca|cs|da|de|el|en-GB|es|et|eu|fi|fr|gl|hu|it|ja|km|ko|lt|mk|nb|nl|nn|om|pl|pt|ru|sh|sl|sr|sv|tr|vi|zh-CN|zh-TW openofficewithjre
-BrOffice_wJRE unxsoli4.pro,unxsols4.pro,wntmsci12.pro pt-BR brofficewithjre
+OpenOffice_wJRE unxlngi6.pro,unxlngx6.pro,unxsoli4.pro,unxsols4.pro,wntmsci12.pro en-US|ar|bg|bn|ca|cs|da|de|el|en-GB|es|et|eu|fi|fr|gl|hu|it|ja|km|ko|lt|mk|nb|nl|nn|om|pl|pt|ru|sh|sl|sr|sv|tr|vi|zh-CN|zh-TW openofficewithjre
+BrOffice_wJRE unxlngi6.pro,unxlngx6.pro,unxsoli4.pro,unxsols4.pro,wntmsci12.pro pt-BR brofficewithjre
OpenOffice_SDK unxlngi6.pro,unxmacxi.pro,unxsoli4.pro,unxsols4.pro,wntmsci12.pro,unxlngx6.pro,unxlngi6,unxmacxi,unxsoli4,unxsols4,wntmsci12 en-US sdkoo
#URE unxlngi6.pro,unxsoli4.pro,unxsols4.pro,wntmsci12.pro,unxlngi6,unxsoli4,unxsols4,wntmsci12 en-US ure
OpenOfficeLanguagepack unxlngi6.pro,unxsoli4.pro,unxsols4.pro,wntmsci12.pro,unxlngx6.pro,unxmacxi.pro ar|as|ast|bg|bn|ca|cs|da|de|dz|el|en-GB|en-US|eo|es|et|eu|fi|fr|gl|gu|hi-IN|hu|id|is|it|ja|ka|km|kn|ko|ku|lt|lv|mk|ml|mr|my|nb|nl|nn|oc|om|or|pa-IN|pl|pt|pt-BR|ro|ru|sh|si|sk|sl|sr|sv|ta|te|th|tr|ug|uk|uz|vi|zh-CN|zh-TW ooolanguagepack
commit e34a07f2cc0c9597c7fd8a90cc077d1a3cc77af0
Author: Oliver Bolte <obo at openoffice.org>
Date: Fri Jan 8 14:24:31 2010 +0000
CWS-TOOLING: integrate CWS dict32b
2010-01-08 14:23:17 +0100 tl r277885 : #i108111# added entries for ar, en-GB, pt installation sets
2010-01-07 12:02:06 +0100 tl r277876 : #i101887# extension update
2010-01-07 11:48:43 +0100 tl r277875 : #i101887# adding romanian to the list of supported locales
2010-01-07 11:39:53 +0100 tl r277874 : #i101963# removed unsupported locales from dictionary.xcu to avoid duplicate entries in EditModules dialog
2010-01-06 17:30:56 +0100 tl r277871 : #i101963#, #i101887# fix for missing Catalan and Romanian dictionaries
2010-01-06 17:30:25 +0100 tl r277870 : #i101963#, #i101887# fix for missing Catalan and Romanian dictionaries
2010-01-06 15:57:47 +0100 tl r277869 : #i74289# fixed readme/license for hyphenation dictionary
2010-01-06 15:54:58 +0100 tl r277868 : #i74290# fixed readme/license for hyphenation dictionary
2010-01-06 15:51:13 +0100 tl r277867 : #i74290# fixed readme/license for hyphenation dictionary
2010-01-06 15:26:34 +0100 tl r277866 : #i108111# fixed use of English dictionaries for nb, nn, ca and ro
2010-01-06 15:24:49 +0100 tl r277865 : #i105565# fixed use of split up German dictionaries
2010-01-05 16:47:35 +0100 tl r277861 : #i105565# 'de' dictionary extension fix (single extension split into three as in repository)
2010-01-05 16:47:00 +0100 tl r277860 : #i105565# 'de' dictionary extension fix (single extension split into three as in repository)
2010-01-05 16:46:30 +0100 tl r277859 : #i105565# 'de' dictionary extension fix (single extension split into three as in repository)
2010-01-05 14:18:46 +0100 tl r277858 : #i101945# fixed missing Norwegian dictionary packages
2010-01-05 14:12:56 +0100 tl r277857 : #i101945# fixed missing Norwegian dictionary packages
2010-01-05 11:55:19 +0100 tl r277855 : #96422# fixed dictionary list for 'sh' builds
2010-01-05 11:49:44 +0100 tl r277854 : #96422# duplicate entry in supported language list
diff --git a/scp2/source/ooo/file_ooo.scp b/scp2/source/ooo/file_ooo.scp
index 7d1d8bb..26b6bda 100644
--- a/scp2/source/ooo/file_ooo.scp
+++ b/scp2/source/ooo/file_ooo.scp
@@ -2964,6 +2964,15 @@ End
#endif
#ifndef WITHOUT_MYSPELL_DICTS
+File gid_File_Extension_Dictionary_Ca
+ Dir = gid_Brand_Dir_Share_Extension_Install;
+ Name = "dict-ca.oxt";
+ Styles = (PACKED, FORCELANGUAGEPACK);
+ UnixRights = 444;
+End
+#endif
+
+#ifndef WITHOUT_MYSPELL_DICTS
File gid_File_Extension_Dictionary_Cs
Dir = gid_Brand_Dir_Share_Extension_Install;
Name = "dict-cs.oxt";
@@ -2982,15 +2991,33 @@ End
#endif
#ifndef WITHOUT_MYSPELL_DICTS
-File gid_File_Extension_Dictionary_De
+File gid_File_Extension_Dictionary_De_AT
Dir = gid_Brand_Dir_Share_Extension_Install;
- Name = "dict-de.oxt";
+ Name = "dict-de-AT.oxt";
Styles = (PACKED, FORCELANGUAGEPACK);
UnixRights = 444;
End
#endif
#ifndef WITHOUT_MYSPELL_DICTS
+File gid_File_Extension_Dictionary_De_CH
+ Dir = gid_Brand_Dir_Share_Extension_Install;
+ Name = "dict-de-CH.oxt";
+ Styles = (PACKED, FORCELANGUAGEPACK);
+ UnixRights = 444;
+End
+#endif
+
+#ifndef WITHOUT_MYSPELL_DICTS
+File gid_File_Extension_Dictionary_De_DE
+ Dir = gid_Brand_Dir_Share_Extension_Install;
+ Name = "dict-de-DE.oxt";
+ Styles = (PACKED, FORCELANGUAGEPACK);
+ UnixRights = 444;
+End
+#endif
+
+#ifndef WITHOUT_MYSPELL_DICTS
File gid_File_Extension_Dictionary_En
Dir = gid_Brand_Dir_Share_Extension_Install;
Name = "dict-en.oxt";
@@ -3090,6 +3117,15 @@ End
#endif
#ifndef WITHOUT_MYSPELL_DICTS
+File gid_File_Extension_Dictionary_No
+ Dir = gid_Brand_Dir_Share_Extension_Install;
+ Name = "dict-no.oxt";
+ Styles = (PACKED, FORCELANGUAGEPACK);
+ UnixRights = 444;
+End
+#endif
+
+#ifndef WITHOUT_MYSPELL_DICTS
File gid_File_Extension_Dictionary_Pl
Dir = gid_Brand_Dir_Share_Extension_Install;
Name = "dict-pl.oxt";
@@ -3108,6 +3144,15 @@ End
#endif
#ifndef WITHOUT_MYSPELL_DICTS
+File gid_File_Extension_Dictionary_Ro
+ Dir = gid_Brand_Dir_Share_Extension_Install;
+ Name = "dict-ro.oxt";
+ Styles = (PACKED, FORCELANGUAGEPACK);
+ UnixRights = 444;
+End
+#endif
+
+#ifndef WITHOUT_MYSPELL_DICTS
File gid_File_Extension_Dictionary_Ru
Dir = gid_Brand_Dir_Share_Extension_Install;
Name = "dict-ru.oxt";
diff --git a/scp2/source/ooo/module_hidden_ooo.scp b/scp2/source/ooo/module_hidden_ooo.scp
index e203085..73bdc5d 100644
--- a/scp2/source/ooo/module_hidden_ooo.scp
+++ b/scp2/source/ooo/module_hidden_ooo.scp
@@ -971,6 +971,17 @@ Module gid_Module_Root_Extension_Dictionary_Af
Styles = (HIDDEN_ROOT);
End
+Module gid_Module_Root_Extension_Dictionary_Ca
+ Name = "gid_Module_Root_Extension_Dictionary_Ca";
+ Description = "gid_Module_Root_Extension_Dictionary_Ca";
+ Files = (gid_File_Extension_Dictionary_Ca);
+ InstallOrder = "2000";
+ Spellcheckerlanguage = "ca";
+ PackageInfo = "packinfo_office.txt";
+ ParentID = gid_Module_Root;
+ Styles = (HIDDEN_ROOT);
+End
+
Module gid_Module_Root_Extension_Dictionary_Cs
Name = "gid_Module_Root_Extension_Dictionary_Cs";
Description = "gid_Module_Root_Extension_Dictionary_Cs";
@@ -993,17 +1004,39 @@ Module gid_Module_Root_Extension_Dictionary_Da
Styles = (HIDDEN_ROOT);
End
-Module gid_Module_Root_Extension_Dictionary_De
- Name = "gid_Module_Root_Extension_Dictionary_De";
- Description = "gid_Module_Root_Extension_Dictionary_De";
- Files = (gid_File_Extension_Dictionary_De);
+Module gid_Module_Root_Extension_Dictionary_De_AT
+ Name = "gid_Module_Root_Extension_Dictionary_De_AT";
+ Description = "gid_Module_Root_Extension_Dictionary_De_AT";
+ Files = (gid_File_Extension_Dictionary_De_AT);
InstallOrder = "2000";
- Spellcheckerlanguage = "de";
+ Spellcheckerlanguage = "de-AT";
PackageInfo = "packinfo_office.txt";
ParentID = gid_Module_Root;
Styles = (HIDDEN_ROOT);
End
+Module gid_Module_Root_Extension_Dictionary_De_CH
+ Name = "gid_Module_Root_Extension_Dictionary_De_CH";
+ Description = "gid_Module_Root_Extension_Dictionary_De_CH";
+ Files = (gid_File_Extension_Dictionary_De_CH);
+ InstallOrder = "2000";
+ Spellcheckerlanguage = "de-CH";
+ PackageInfo = "packinfo_office.txt";
+ ParentID = gid_Module_Root;
+ Styles = (HIDDEN_ROOT);
+End
+
+Module gid_Module_Root_Extension_Dictionary_De_DE
+ Name = "gid_Module_Root_Extension_Dictionary_De_DE";
+ Description = "gid_Module_Root_Extension_Dictionary_De_DE";
+ Files = (gid_File_Extension_Dictionary_De_DE);
+ InstallOrder = "2000";
+ Spellcheckerlanguage = "de-DE";
+ PackageInfo = "packinfo_office.txt";
+ ParentID = gid_Module_Root;
+ Styles = (HIDDEN_ROOT);
+End
+
Module gid_Module_Root_Extension_Dictionary_En
Name = "gid_Module_Root_Extension_Dictionary_En";
Description = "gid_Module_Root_Extension_Dictionary_En";
@@ -1125,6 +1158,17 @@ Module gid_Module_Root_Extension_Dictionary_Nl
Styles = (HIDDEN_ROOT);
End
+Module gid_Module_Root_Extension_Dictionary_No
+ Name = "gid_Module_Root_Extension_Dictionary_No";
+ Description = "gid_Module_Root_Extension_Dictionary_No";
+ Files = (gid_File_Extension_Dictionary_No);
+ InstallOrder = "2000";
+ Spellcheckerlanguage = "no";
+ PackageInfo = "packinfo_office.txt";
+ ParentID = gid_Module_Root;
+ Styles = (HIDDEN_ROOT);
+End
+
Module gid_Module_Root_Extension_Dictionary_Pl
Name = "gid_Module_Root_Extension_Dictionary_Pl";
Description = "gid_Module_Root_Extension_Dictionary_Pl";
@@ -1147,6 +1191,17 @@ Module gid_Module_Root_Extension_Dictionary_Pt
Styles = (HIDDEN_ROOT);
End
+Module gid_Module_Root_Extension_Dictionary_Ro
+ Name = "gid_Module_Root_Extension_Dictionary_Ro";
+ Description = "gid_Module_Root_Extension_Dictionary_Ro";
+ Files = (gid_File_Extension_Dictionary_Ro);
+ InstallOrder = "2000";
+ Spellcheckerlanguage = "ro";
+ PackageInfo = "packinfo_office.txt";
+ ParentID = gid_Module_Root;
+ Styles = (HIDDEN_ROOT);
+End
+
Module gid_Module_Root_Extension_Dictionary_Ru
Name = "gid_Module_Root_Extension_Dictionary_Ru";
Description = "gid_Module_Root_Extension_Dictionary_Ru";
diff --git a/solenv/inc/postset.mk b/solenv/inc/postset.mk
index 30bb915..4a7f6ae 100644
--- a/solenv/inc/postset.mk
+++ b/solenv/inc/postset.mk
@@ -114,6 +114,7 @@ pl \
ps \
pt \
pt-BR \
+ro \
ru \
rw \
sat \
More information about the ooo-build-commit
mailing list