[ooo-build-commit] Branch 'ooo/OOO310' - 4 commits - instsetoo_native/util scp2/source solenv/inc
Jan Holesovsky
kendy at kemper.freedesktop.org
Tue Aug 18 17:37:45 PDT 2009
instsetoo_native/util/pack.lst | 8 ++++----
scp2/source/ooo/file_library_ooo.scp | 2 +-
scp2/source/ooo/ure.scp | 2 +-
solenv/inc/minor.mk | 6 +++---
4 files changed, 9 insertions(+), 9 deletions(-)
New commits:
commit e7a099be34fdfbc259f3624506c279c7a076f5b6
Author: Kurt Zenker <kz at openoffice.org>
Date: Tue Aug 18 10:26:40 2009 +0000
OOO310
diff --git a/solenv/inc/minor.mk b/solenv/inc/minor.mk
index 473523c..f8743e8 100644
--- a/solenv/inc/minor.mk
+++ b/solenv/inc/minor.mk
@@ -1,5 +1,5 @@
RSCVERSION=310
-RSCREVISION=310m18(Build:9417)
-BUILD=9417
-LAST_MINOR=m18
+RSCREVISION=310m19(Build:9420)
+BUILD=9420
+LAST_MINOR=m19
SOURCEVERSION=OOO310
commit aa1009837e8cf3d18e0d07097260b43b8760bae9
Author: Kurt Zenker <kz at openoffice.org>
Date: Tue Aug 18 09:48:55 2009 +0000
CWS-TOOLING: integrate CWS sb114
2009-08-12 09:02:01 +0200 sb r274880 : #i104149# missing PATCH flag
2009-08-11 16:39:16 +0200 sb r274864 : #i104149# merged in difference between <http://ftp.debian.org/debian/pool/main/libx/libxml2/libxml2_2.6.32.dfsg-5.diff.gz> and <http://security.debian.org/pool/updates/main/libx/libxml2/libxml2_2.6.32.dfsg-5+lenny1.diff.gz> (which appears to also apply cleanly to the libxml2 2.6.31 source base checked into OOo)
diff --git a/scp2/source/ooo/ure.scp b/scp2/source/ooo/ure.scp
index ad669f7..7d88c61 100755
--- a/scp2/source/ooo/ure.scp
+++ b/scp2/source/ooo/ure.scp
@@ -832,7 +832,7 @@ File gid_File_Dl_Libxml2
#else
Name = SCP2_URE_DL_VER("xml2", "2");
#endif
- Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
+ Styles = (PACKED, PATCH, VERSION_INDEPENDENT_COMP_ID);
// CompID = "BE6FAD97-F84C-43E3-8392-6FE2CDA04D8E";
End
#endif
commit 966c35848c009edbe01828554488f579ad97fe73
Author: Kurt Zenker <kz at openoffice.org>
Date: Tue Aug 18 09:43:19 2009 +0000
CWS-TOOLING: integrate CWS swapfix01
2009-08-17 16:40:04 +0200 cl r275061 : #i104146# added patch flag for svx library
2009-08-17 15:48:01 +0200 cl r275059 : #i104146# force swap in of graphic to avoid getting the unique id from the preview graphic
diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp
index 731cb5c..4c5a99e 100644
--- a/scp2/source/ooo/file_library_ooo.scp
+++ b/scp2/source/ooo/file_library_ooo.scp
@@ -1362,7 +1362,7 @@ STD_LIB_FILE( gid_File_Lib_Svl, svl )
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_PATCH( gid_File_Lib_Svx, svx)
STD_UNO_LIB_FILE( gid_File_Lib_TextConversionDlgs, textconversiondlgs)
STD_UNO_LIB_FILE_PATCH( gid_File_Lib_Sw , sw)
commit e40d43444415b97b8ceef655d9353b275a3c3c5a
Author: Kurt Zenker <kz at openoffice.org>
Date: Tue Aug 18 09:14:10 2009 +0000
#i10000# changes for unxlngx6.pro
diff --git a/instsetoo_native/util/pack.lst b/instsetoo_native/util/pack.lst
index 4c63ea6..6db4425 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|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.pro,unxmacxi.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 openoffice
OpenOffice unxlngi6,unxmacxi,unxsoli4,unxsols4,wntmsci12 en-US openoffice
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
+OpenOffice_wJRE unxlngi6.pro,unxlngx6.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
+#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|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
+#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
More information about the ooo-build-commit
mailing list