[ooo-build-commit] Branch 'ooo/OOO310' - 4 commits - instsetoo_native/util scp2/source solenv/inc
Jan Holesovsky
kendy at kemper.freedesktop.org
Wed Aug 5 17:08:31 PDT 2009
instsetoo_native/util/pack.lst | 12 ++++++------
scp2/source/ooo/file_library_ooo.scp | 22 +++++++++++-----------
solenv/inc/minor.mk | 6 +++---
3 files changed, 20 insertions(+), 20 deletions(-)
New commits:
commit c594d8e47e421ef2ea6b1a0f1aa5123efadd58dd
Author: Release Engineers <releng at openoffice.org>
Date: Wed Aug 5 13:01:28 2009 +0000
#i10000# RC mode
diff --git a/instsetoo_native/util/pack.lst b/instsetoo_native/util/pack.lst
index 1709883..4c63ea6 100755
--- a/instsetoo_native/util/pack.lst
+++ b/instsetoo_native/util/pack.lst
@@ -7,17 +7,17 @@
# Product List_of_platforms List_of_languages Target
-OpenOffice unxlngi6.pro,unxmacxi.pro,unxsoli4.pro,unxsols4.pro,wntmsci12.pro,unxlngx6.pro en-US|ar openoffice
+OpenOffice unxlngi6.pro,unxmacxi.pro,unxsoli4.pro,unxsols4.pro,wntmsci12.pro,unxlngx6.pro en-US|ar|da|de|el|es|fr|it|ja|nl|ko|pl|ru|sv|pt|pt-BR|zh-CN|zh-TW|gl|vi|mk|lt|nn|nb|tr|sl|sh|sr openoffice
OpenOffice unxlngi6,unxmacxi,unxsoli4,unxsols4,wntmsci12 en-US openoffice
-#BrOffice pt-BR broffice
-#OpenOffice_wJRE unxlngi6.pro,unxsoli4.pro,unxsols4.pro,wntmsci12.pro,wntmsci12 en-US openofficewithjre
-#BrOffice_wJRE pt-BR brofficewithjre
+BrOffice unxlngi6.pro,unxmacxi.pro,unxsoli4.pro,unxsols4.pro,wntmsci12.pro pt-BR broffice
+OpenOffice_wJRE unxlngi6.pro,unxsoli4.pro,unxsols4.pro,wntmsci12.pro en-US|ar|da|de|el|es|fr|it|ja|nl|ko|pl|ru|sv|pt|pt-BR|zh-CN|zh-TW|gl|vi|mk|lt|nn|nb|tr|sl|sh|sr openofficewithjre
+BrOffice_wJRE unxlngi6.pro,unxmacxi.pro,unxsoli4.pro,unxsols4.pro,wntmsci12.pro pt-BR brofficewithjre
OpenOffice_Dev unxlngi6.pro,unxsoli4.pro,unxsols4.pro,wntmsci12.pro,unxmacxi.pro,unxlngx6.pro en-US|ar openofficedev
#BrOffice_Dev pt-BR brofficedev
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 de ooolanguagepack
+OpenOfficeLanguagepack unxlngi6.pro,unxsoli4.pro,unxsols4.pro,wntmsci12.pro,unxlngx6.pro de|af|ar|as-IN|be-BY|bg|bn|br|brx|bs|ca|cs|cy|da|dgo|dz|el|es|en-GB|en-US|en-ZA|eo|et|eu|fa|fi|fr|ga|gl|gu|gu-IN|he|hi-IN|hr|hu|id|it|ja|ka|kk|km|kn-IN|ko|kok|ks|ku|lt|mai|mk|ml-IN|mn|mni|mr-IN|my|nb|ne|nl|nn|nr|ns|oc|or-IN|pa-IN|pl|pt|pt-BR|ru|rw|sa-IN|sat|sd|sh|sk|sl|sr|ss|st|sv|sw-TZ|ta|ta-IN|te-IN|tg|th|ti-ER|tn|tr|ts|uk|ur-IN|uz|ve|vi|xh|zh-CN|zh-TW|zu ooolanguagepack
OpenOfficeLanguagepack unxlngi6,unxsoli4,unxsols4,wntmsci12 de ooolanguagepack
OpenOfficeDevLanguagepack unxlngi6.pro,unxsoli4.pro,unxsols4.pro,wntmsci12.pro,unxlngx6.pro de|fr|ja|ar ooodevlanguagepack
-#BrOfficeLanguagepack unxlngi6.pro,unxsoli4.pro,unxsols4.pro,wntmsci12.pro,unxlngx6.pro pt-BR broolanguagepack
+BrOfficeLanguagepack unxlngi6.pro,unxsoli4.pro,unxsols4.pro,wntmsci12.pro,unxlngx6.pro pt-BR broolanguagepack
commit c56eec2175406f0e8e89226039b329d0747668a1
Author: Release Engineers <releng at openoffice.org>
Date: Wed Aug 5 12:47:05 2009 +0000
OOO310
diff --git a/solenv/inc/minor.mk b/solenv/inc/minor.mk
index b08de40..473523c 100644
--- a/solenv/inc/minor.mk
+++ b/solenv/inc/minor.mk
@@ -1,5 +1,5 @@
RSCVERSION=310
-RSCREVISION=310m17(Build:9415)
-BUILD=9415
-LAST_MINOR=m17
+RSCREVISION=310m18(Build:9417)
+BUILD=9417
+LAST_MINOR=m18
SOURCEVERSION=OOO310
commit 46518b48991f01dc65b4120c66911b35d2092fb8
Author: Oliver Bolte <obo at openoffice.org>
Date: Wed Aug 5 12:39:09 2009 +0000
CWS-TOOLING: integrate CWS gciteratorfix
2009-08-04 10:23:19 +0200 od r274608 : add missing patch flags for libaries swui, msword and xo
2009-08-03 16:42:48 +0200 mav r274586 : #i101899# workaround the wrong error code on MAC
2009-08-03 13:24:44 +0200 tl r274575 : #i103936# fix for grammar checking loop
2009-08-03 12:37:37 +0200 tl r274573 : #i103936# fix for grammar checking loop
2009-08-03 12:10:01 +0200 tl r274572 : #i103936# fix for grammar checking loop
2009-08-03 09:06:49 +0200 tl r274565 : #i103936# fix for grammar checking loop
2009-08-03 09:04:50 +0200 tl r274564 : #i103936# fix for grammar checking loop
2009-07-31 17:52:45 +0200 tl r274545 : #i103936# fix for grammar checking loop
diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp
index ebe8b9d..731cb5c 100644
--- a/scp2/source/ooo/file_library_ooo.scp
+++ b/scp2/source/ooo/file_library_ooo.scp
@@ -1,4 +1,4 @@
-/*************************************************************************
+*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -192,7 +192,7 @@ File gid_File_Lib_Comphelper2
Name = STRING(CONCAT3(comphelp4,COMID,.dll));
#endif
Dir = gid_Dir_Program;
- Styles = (PACKED,UNO_COMPONENT);
+ Styles = (PACKED,PATCH,UNO_COMPONENT);
RegistryID = gid_Starregistry_Services_Rdb;
End
@@ -523,7 +523,7 @@ End
File gid_File_Lib_Fps
TXT_FILE_BODY;
- Styles = (PACKED,UNO_COMPONENT);
+ Styles = (PACKED,PATCH,UNO_COMPONENT);
RegistryID = gid_Starregistry_Services_Rdb;
Dir = gid_Dir_Program;
Name = "fps.dll";
@@ -841,7 +841,7 @@ End
#endif
-STD_UNO_LIB_FILE( gid_File_Lib_Lng, lng)
+STD_UNO_LIB_FILE_PATCH( gid_File_Lib_Lng, lng)
File gid_File_Lib_Localedata_En
TXT_FILE_BODY;
@@ -1277,7 +1277,7 @@ STD_UNO_LIB_FILE( gid_File_Lib_Sf_Prothdlr, protocolhandler )
File gid_File_Lib_Sfx
Name = LIBNAME(sfx);
TXT_FILE_BODY;
- Styles = (PACKED,UNO_COMPONENT);
+ Styles = (PACKED,PATCH,UNO_COMPONENT);
Dir = gid_Dir_Program;
RegistryID = gid_Starregistry_Services_Rdb;
End
@@ -1359,16 +1359,16 @@ End
STD_LIB_FILE( gid_File_Lib_Sts , sts)
STD_LIB_FILE( gid_File_Lib_Svl, svl )
-STD_UNO_LIB_FILE( gid_File_Lib_Svtools, svt )
+STD_UNO_LIB_FILE_PATCH( gid_File_Lib_Svtools, svt )
SPECIAL_UNO_COMPONENT_LIB_FILE( gid_File_Lib_Svtmisc, svtmisc.uno )
STD_UNO_LIB_FILE( gid_File_Lib_Svx, svx)
STD_UNO_LIB_FILE( gid_File_Lib_TextConversionDlgs, textconversiondlgs)
-STD_UNO_LIB_FILE( gid_File_Lib_Sw , sw)
-STD_LIB_FILE( gid_File_Lib_Swui, swui)
+STD_UNO_LIB_FILE_PATCH( gid_File_Lib_Sw , sw)
+STD_LIB_FILE_PATCH( gid_File_Lib_Swui, swui)
-STD_LIB_FILE( gid_File_Lib_Msword, msword )
+STD_LIB_FILE_PATCH( gid_File_Lib_Msword, msword )
File gid_File_Lib_Sysdtrans
TXT_FILE_BODY;
@@ -1515,7 +1515,7 @@ STD_UNO_LIB_FILE( gid_File_Lib_Xof , xof)
File gid_File_Lib_Xo
Name = LIBNAME(xo);
TXT_FILE_BODY;
- Styles = (PACKED,UNO_COMPONENT);
+ Styles = (PACKED,PATCH,UNO_COMPONENT);
Dir = gid_Dir_Program;
RegistryID = gid_Starregistry_Services_Rdb;
End
commit 8f5db3e2b75088038102008fad4a9dacde9125d1
Author: Oliver Bolte <obo at openoffice.org>
Date: Wed Aug 5 10:50:54 2009 +0000
CWS-TOOLING: integrate CWS calcooo311
2009-08-04 13:55:19 +0200 er r274617 : #i102356# add patch flag for i18npool lib
2009-08-03 17:29:15 +0200 dr r274589 : #i103968# ported fix from DEV300, new pie charts lose point color
2009-07-29 23:20:00 +0200 er r274467 : #i103861# Shared formula and named range relative reference wrap with different grid sizes; patch from <kohei>
diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp
index c54ab13..ebe8b9d 100644
--- a/scp2/source/ooo/file_library_ooo.scp
+++ b/scp2/source/ooo/file_library_ooo.scp
@@ -663,7 +663,7 @@ STD_LIB_FILE( gid_File_Lib_Helplinker, helplinker)
File gid_File_Lib_I18npool
TXT_FILE_BODY;
- Styles = (PACKED,UNO_COMPONENT);
+ Styles = (PACKED,PATCH,UNO_COMPONENT);
RegistryID = gid_Starregistry_Services_Rdb;
Dir = gid_Dir_Program;
#ifdef UNX
More information about the ooo-build-commit
mailing list