ooo-build r12204 - in branches/sled-10-sp1-ooo-build-2-4: . patches/src680

[tml svn gnome org]

Author: tml
Date: Thu Apr 17 18:01:46 2008
New Revision: 12204
URL: http://svn.gnome.org/viewvc/ooo-build?rev=12204&view=rev

Log:
2008-04-17  Tor Lillqvist  <tml novell com>

	* patches/src680/novell-win32-msi-patchability.diff
	(instsetoo_native/inc_openoffice/windows/msi_templates/components.txt):
	Add more new components from 2.4.0.



Modified:
   branches/sled-10-sp1-ooo-build-2-4/ChangeLog
   branches/sled-10-sp1-ooo-build-2-4/patches/src680/novell-win32-msi-patchability.diff

Modified: branches/sled-10-sp1-ooo-build-2-4/patches/src680/novell-win32-msi-patchability.diff
==============================================================================
--- branches/sled-10-sp1-ooo-build-2-4/patches/src680/novell-win32-msi-patchability.diff	(original)
+++ branches/sled-10-sp1-ooo-build-2-4/patches/src680/novell-win32-msi-patchability.diff	Thu Apr 17 18:01:46 2008
@@ -389,7 +389,7 @@
 dummy line to avoid confusing diff-mode
 --- instsetoo_native/inc_openoffice/windows/msi_templates/components.txt
 +++ instsetoo_native/inc_openoffice/windows/msi_templates/components.txt
-@@ -0,0 +1,6685 @@
+@@ -0,0 +1,6773 @@
 +g_f_basic_depot__share_basic_depot	349DE05A-A67F-473C-BEC0-F2C9F10A9F71
 +g_f_basic_euro__share_basic_euro	E2AE970C-A2D6-47D5-9453-2DA8279EC601
 +g_f_basic_formwiz__share_basic_formwizard	52D7EA47-9D90-46CD-B68B-23B896A723FF
@@ -415,6 +415,7 @@
 +g_f_bin_uno__program	B84FFF18-FCF6-4BC5-8EF3-22F9940D7202
 +g_f_bin_unopkg__program	8D85641C-53CF-42C7-9C1C-43E2EFF42289
 +g_f_bin_unopkgcom__program	93A9BBFE-74D5-422F-A8AE-F0C355E1D100
++g_f_bin_unopkgexe__program	C10A91D1-A6BF-48D0-990E-81E62C7EFE98
 +g_f_bmp_abouts__program	539D8249-C2D3-4B9E-AAF5-9FF0B7DF66D5
 +g_f_bmp_installation__program	3F334157-4AD1-47D7-BF4E-69EC54DF1F9D
 +g_f_bmp_intro__program	0E2451D1-D0D0-48FC-B3EA-71E76D497C43
@@ -1179,6 +1180,7 @@
 +g_f_exe_simpress__program	E7248F81-0916-4196-ACFC-4E7385BE1191
 +g_f_exe_smath__program	1CC15046-C273-4FDE-AAFC-79A8DE69EB65
 +g_f_exe_swriter__program	1DBB91E6-3DB5-448E-A1B5-0A80D62BE936
++g_f_exe_testtool__program	F107935F-1474-441B-A726-9E8EB9801853
 +g_f_filter_egi__program	EAE63BAD-163F-417C-BCFE-D003E4CA0090
 +g_f_filter_eme__program	9734D2F9-8952-4EC8-8A43-F4D048DBB7FC
 +g_f_filter_emp__program	C243667D-C398-4372-905A-2C65C106FD43
@@ -1220,6 +1222,27 @@
 +g_f_fnt_cumbwbi__share_fonts_truetype	C2198161-A241-40EB-ADD6-75A3E8DE0DF0
 +g_f_fnt_cumbwi__share_fonts_truetype	27E914F2-50DC-478E-AEF8-388702E41C70
 +g_f_fnt_cumbwr__share_fonts_truetype	9508BB3C-B9A6-41F4-9DE8-DD42FDAC57C9
++g_f_fnt_dejavusans__share_fonts_truetype	BA5DCFF6-1C9D-415A-8A11-53C473BB6024
++g_f_fnt_dejavusans_bold__share_fonts_truetype	2AF206C0-E4EB-4533-919B-D3ABA3F38F2A
++g_f_fnt_dejavusans_boldoblique__share_fonts_truetype	FC7DBACD-3121-4D7E-A17D-6CAD81E6A95D
++g_f_fnt_dejavusans_oblique__share_fonts_truetype	05E35192-A2C7-412D-9BAA-91FA76ECFCE3
++g_f_fnt_dejavusanscondensed__share_fonts_truetype	560A41A2-71BC-489F-8F8A-FD4C680B420F
++g_f_fnt_dejavusanscondensed_bold__share_fonts_truetype	BB711A58-A267-40D8-8CAE-31AADB440C20
++g_f_fnt_dejavusanscondensed_boldoblique__share_fonts_truetype	642ABF99-9FED-47E2-8BD4-3BE614D0B757
++g_f_fnt_dejavusanscondensed_oblique__share_fonts_truetype	82DB066D-1964-4FAD-BFC8-34EAA9A2DD40
++g_f_fnt_dejavusansextralight__share_fonts_truetype	9BC3956A-3C2B-45AE-8A7B-A97101529AB9
++g_f_fnt_dejavusansmono__share_fonts_truetype	A5D38125-0FD6-4053-944A-AF440E9137E3
++g_f_fnt_dejavusansmono_bold__share_fonts_truetype	B7B63A58-C93D-4753-8DB9-D2E8FC11DDD3
++g_f_fnt_dejavusansmono_boldoblique__share_fonts_truetype	DBAAC56A-1DD1-439D-801E-9C213716D6F6
++g_f_fnt_dejavusansmono_oblique__share_fonts_truetype	5BCBF857-E7B6-4ECB-AFA0-304B838F32DC
++g_f_fnt_dejavuserif__share_fonts_truetype	10098253-5092-45F8-8C03-FD849C2C6E64
++g_f_fnt_dejavuserif_bold__share_fonts_truetype	4F73AEF2-C0C7-466F-BE81-0F678DD88884
++g_f_fnt_dejavuserif_bolditalic__share_fonts_truetype	1FAE157F-E02C-439E-BCD2-F42588D38436
++g_f_fnt_dejavuserif_italic__share_fonts_truetype	F6F003C9-FA3F-4996-98DF-121AF9909760
++g_f_fnt_dejavuserifcondensed__share_fonts_truetype	5BDCD5E9-AE07-4C54-8DD2-99753E41C23C
++g_f_fnt_dejavuserifcondensed_bold__share_fonts_truetype	1E8EA2C8-B249-4F24-B5A3-4B92EB16A5B1
++g_f_fnt_dejavuserifcondensed_bolditalic__share_fonts_truetype	BC3B109D-9754-4305-8868-739C8D73AF2C
++g_f_fnt_dejavuserifcondensed_italic__share_fonts_truetype	8DE3DCC7-EA06-413F-A3C0-BE687AD66601
 +g_f_fnt_mtsorts__share_fonts_truetype	DF9E7E5A-268B-4BAF-9D41-4B9F754B2EBE
 +g_f_fnt_opensymb__share_fonts_truetype	C239D62A-5FE6-413A-BF2B-00FF7FBCAB14
 +g_f_fnt_thowb__share_fonts_truetype	9536B7BF-B108-46F3-936B-FE0244B2252E
@@ -1806,12 +1829,14 @@
 +g_f_lib_bf_sch__program	24A8377F-68C2-41F1-B8AA-E964BA892214
 +g_f_lib_bf_sd__program	C4BDA11F-B79F-4C1D-A485-13E41984E635
 +g_f_lib_bf_sm__program	6C1D928B-DC08-4378-AF3B-F6D27BE975E1
++g_f_lib_bf_so__program	872AEF3D-D03B-48E8-994B-F9EF001CAF7F
 +g_f_lib_bf_svx__program	61AF00C6-A15E-4EAB-99EE-771864EC9916
 +g_f_lib_bf_sw__program	BA7D4E83-53A7-4726-A4F4-87CC160A87DE
 +g_f_lib_bf_wrapper__program	C21BEB35-B3B2-468D-97C9-5BBEBD85F172
 +g_f_lib_bf_xo__program	A1E95FF1-9292-4305-BA98-70956B95B6FE
 +g_f_lib_bib__program	269BA679-6268-4EFE-861F-1510C6503326
 +g_f_lib_bindet__program	4D809E73-57FA-4394-BD29-5FBE49D023CB
++g_f_lib_bootstrap__program	F98365E9-09B2-4C18-B372-6CB73D89ECAA
 +g_f_lib_brdgfctr__program	DC7D6493-076F-494B-AF30-7EBDDBFD8F8E
 +g_f_lib_cached1__program	052D63CC-C9B8-4292-AA58-12E00DCBDC03
 +g_f_lib_cairocanvas__program	4089AB7F-41AC-4536-9225-9896E1F175B2
@@ -1840,6 +1865,7 @@
 +g_f_lib_cppcanvas__program	B6C289C8-9B36-49F0-8B50-126F41A17595
 +g_f_lib_cppu__program	B22D9232-339B-4D77-B2F8-CF0E85012F44
 +g_f_lib_cppuhelper__program	B807C50A-7597-4077-B8E5-2C3A4E82CC51
++g_f_lib_crypto__program	38CAC1E4-91E5-4D6D-ADD4-8CED326D526F
 +g_f_lib_ctl__program	654661B2-9FBA-4840-B39C-84A3ED2B5F8B
 +g_f_lib_cui__program	3208EECB-6BA1-464C-B19F-66365881D7A7
 +g_f_lib_curl__program	C8CB2035-BC6E-4DDB-875D-A26D92EF7289
@@ -1862,6 +1888,8 @@
 +g_f_lib_deploymentmisc__program	8E137FE3-B7BE-4B20-904F-DACEFDEE013A
 +g_f_lib_dict_ja__program	C3D672FA-E68B-460E-9745-543E45F89F8C
 +g_f_lib_dict_zh__program	3087A840-92C0-4C84-9201-79C80C938621
++g_f_lib_directx9canvas__program	4369C634-234B-4A56-B26D-F78B608C5C27
++g_f_lib_directxcanvas__program	2858D605-D444-47D7-98D7-D91B6A62B91E
 +g_f_lib_dlgprov__program	011CF21C-31DC-485A-8402-E7E810CECF76
 +g_f_lib_dnd__program	07AF8D07-A8D5-447A-BF49-51AFD4FD9EC7
 +g_f_lib_dtrans__program	C9196A59-4E2D-499D-955D-02D208E229CF
@@ -1891,6 +1919,7 @@
 +g_f_lib_go__program	7917BF9B-AAEA-4E0A-B65C-13210CB2AB0A
 +g_f_lib_guesslang__program	7D3A22E0-F513-4C36-9CF3-FC6E293BBCC2
 +g_f_lib_hatchwindowfactory__program	B09923B2-4FB1-4898-ABD6-4711FE8468E5
++g_f_lib_helplinker__program	B00FB30C-C02E-4C75-B131-9712BC550743
 +g_f_lib_hsqldb_2__program	7F166AC5-31F1-459F-A931-50A2D169F85B
 +g_f_lib_hunspell__program	3EA10728-F451-4B0A-87B3-19223811B9DF
 +g_f_lib_hwpreader__program	8BFB75D0-4EFB-4950-B4AD-E7783B29DF97
@@ -1953,6 +1982,7 @@
 +g_f_lib_ooofiltproxy__program	6EEE5F18-951C-4283-A42E-B4B1C193FBD8
 +g_f_lib_oox__program	7ACC36C4-60A4-46C3-B7A9-3898BCB6AC68
 +g_f_lib_opc__program	4618C558-4D25-49CC-BA1A-B5B8C36C7BC1
++g_f_lib_openssl__program	2AAE06D6-FB48-4B96-A435-C5DDC566F0A1
 +g_f_lib_package2__program	E5882E56-6D6A-4B74-AE31-F9FE6BD19EB4
 +g_f_lib_passwordcontainer__program	4BA3A846-9A26-47E7-8F4D-B7CAD0895FF4
 +g_f_lib_pcr__program	C55FC40F-2489-4476-B826-8679DFC85C40
@@ -2015,6 +2045,7 @@
 +g_f_lib_srtrs1__program	EE2CC6E0-CBB3-408B-8F71-414A4491AAE3
 +g_f_lib_stlport__program	A1D9DB5F-79BE-4BAB-B516-BB9282CE9C1C
 +g_f_lib_stm__program	D01D223A-1A2A-4981-9565-164B1D150517
++g_f_lib_stocserv__program	825D5B97-7086-4C70-B8BC-0F1ADDCC1189
 +g_f_lib_store__program	9759141F-1C46-403D-89D6-3B2BBA3EA1AE
 +g_f_lib_stringresource__program	6E63500B-C875-4576-9961-229943E28CC8
 +g_f_lib_sts__program	6E1D2ED4-A25E-42F3-A41D-1F909CD82E05
@@ -2287,6 +2318,8 @@
 +g_f_oo_office_calc_xcs__share_registry_schema_o_o_office	BD2B17F3-CDD1-4472-B586-FAE03CA5D7E7
 +g_f_oo_office_calc_xcu__share_registry_data_o_o_office	562E4C19-93F2-49AD-ABE5-71751CEE74FF
 +g_f_oo_office_calcaddins_xcs__share_registry_schema_o_o_office	DB130CF9-C6ED-4FA9-8A71-F185FCEE1720
++g_f_oo_office_canvas_xcs__share_registry_schema_o_o_office	3614B129-555B-4F2E-9B49-308B625B409B
++g_f_oo_office_canvas_xcu__share_registry_data_o_o_office	0763E584-6274-4960-B854-55BC3CB77352
 +g_f_oo_office_chart_xcs__share_registry_schema_o_o_office	D1D9857E-41F3-419A-82D3-3C08A33744C5
 +g_f_oo_office_cm_xcs__share_registry_schema_o_o_office	5B359D72-442D-4185-90E3-91A4AC4F252A
 +g_f_oo_office_cm_xcu__share_registry_data_o_o_office	E90EE7C3-F88B-4BEE-AE95-4B045AD15685
@@ -5576,6 +5609,56 @@
 +g_f_res_sdbcl__p_resource_zh_cn	8ADCEA1D-07AB-46F7-89A1-5030E695A90C
 +g_f_res_sdbcl__p_resource_zh_tw	10DE715B-297D-47E3-A48A-DA7044517059
 +g_f_res_sdbcl__p_resource_zu	C07613C8-0239-4D0C-864C-CD122CD34FA3
++g_f_res_sdberr__p_resource_af	234DC879-1A21-4748-966B-452888BF185D
++g_f_res_sdberr__p_resource_ar	517995F8-1645-4297-B974-64DC5A8EC4CE
++g_f_res_sdberr__p_resource_be_by	396C7FB5-22F6-4054-A2AE-E5F57251E3CB
++g_f_res_sdberr__p_resource_bg	61E4B829-34F7-41B1-B311-0ECC01CF61FE
++g_f_res_sdberr__p_resource_bn_in	57FA40C1-ECF1-4E03-8771-E1348B520DD3
++g_f_res_sdberr__p_resource_br	53B00874-E210-464F-BD80-10D663431667
++g_f_res_sdberr__p_resource_ca	56C1EB58-2CB1-421D-902A-C68189846B9F
++g_f_res_sdberr__p_resource_cs	89822974-0AEA-4044-AC46-7A6099304C80
++g_f_res_sdberr__p_resource_cy	47ABD417-08B3-401C-B252-E84D48D0C4D2
++g_f_res_sdberr__p_resource_da	672538A0-6031-4496-8AE5-6C6D84BAB6EB
++g_f_res_sdberr__p_resource_de	48DA1DAF-79DE-43F8-A51F-D1893EB50C2B
++g_f_res_sdberr__p_resource_el	5AE09BCD-6102-4640-A1B4-2E588F9B33CE
++g_f_res_sdberr__p_resource_en_gb	A08C83EC-B2F6-4E92-AAB7-0012566DBCBD
++g_f_res_sdberr__p_resource_en_us	8ACDA4C7-62A0-440E-B592-F5A992A61EF8
++g_f_res_sdberr__p_resource_es	7E34E70A-91C0-4CB7-AF06-F0EE5E50941B
++g_f_res_sdberr__p_resource_et	DB23762C-844D-4077-B4C2-F7732E7AC246
++g_f_res_sdberr__p_resource_fi	C938BFC8-4DEF-4ED1-9670-499BF5E8FBA9
++g_f_res_sdberr__p_resource_fr	726BD27A-F7EF-4BD6-830A-9F9BDD10DA64
++g_f_res_sdberr__p_resource_gu_in	EB871D22-B7B3-497C-9258-17324C99E52F
++g_f_res_sdberr__p_resource_he	2CD71888-E930-4E8B-B86A-C249AD178B86
++g_f_res_sdberr__p_resource_hi_in	A051D5E7-F2A2-4FD6-AA3C-3B892E4803BF
++g_f_res_sdberr__p_resource_hr	96D6A95E-577B-4CF8-A571-9A736F1680D9
++g_f_res_sdberr__p_resource_hu	641F50D0-23FB-4E2E-A5F6-9E5E40016DF8
++g_f_res_sdberr__p_resource_it	DD82086C-40C3-424F-949C-54E14D5222DE
++g_f_res_sdberr__p_resource_ja	A4278E1C-BA9C-49C0-82F0-F4DAC84B694B
++g_f_res_sdberr__p_resource_km	7F197B76-D8FD-462C-BFB7-FC5D2E77C5AB
++g_f_res_sdberr__p_resource_ko	5C6DE538-F3C1-45B4-9FAE-FB830675F82A
++g_f_res_sdberr__p_resource_lt	9EFE973B-A615-4A52-B83A-58A01136CB8D
++g_f_res_sdberr__p_resource_lv	CA076466-0402-4324-B9DE-A9FCA946F911
++g_f_res_sdberr__p_resource_mk	141FBE37-55E1-4006-BC82-034D46D105B5
++g_f_res_sdberr__p_resource_mr_in	CBC4C7C0-B23A-4DA8-91D5-6DF1B0946AF3
++g_f_res_sdberr__p_resource_nb	1C98E275-3A86-43CF-B0A5-E30D37485DD1
++g_f_res_sdberr__p_resource_nl	CE30AE4E-2E07-4BDA-BF05-B2BD650729C2
++g_f_res_sdberr__p_resource_nn	FA6E2F19-83B4-4396-92E4-18FCCDCB1E57
++g_f_res_sdberr__p_resource_pa_in	6B64BB64-730A-49DF-BF07-B650FA28EA37
++g_f_res_sdberr__p_resource_pl	B5B36917-DDA7-4DBA-8037-54B6DE103080
++g_f_res_sdberr__p_resource_pt	B1C9F933-D512-4754-9D7A-D6ECECDC607F
++g_f_res_sdberr__p_resource_pt_br	D8138A72-7FB3-4C77-879B-27B7582AA26D
++g_f_res_sdberr__p_resource_ru	691EBC85-3927-4EB3-A1B2-6359DFB63636
++g_f_res_sdberr__p_resource_rw	831D592C-079F-414F-B6A0-C33A756DFC97
++g_f_res_sdberr__p_resource_sk	C18130DF-2CAC-487F-84FA-2E94C8D50962
++g_f_res_sdberr__p_resource_sl	235102A3-8630-470D-9880-77861839AD95
++g_f_res_sdberr__p_resource_sv	FD929836-62A8-46E6-9855-8E4086FE5239
++g_f_res_sdberr__p_resource_ta_in	07383931-1C34-49BE-B3FD-A008986410F5
++g_f_res_sdberr__p_resource_tr	95A2DB8C-0681-4FB4-8554-E6E6428393D2
++g_f_res_sdberr__p_resource_vi	D80FDA82-BC40-44B4-8D42-237F54CD4B72
++g_f_res_sdberr__p_resource_xh	8C0A1808-7440-4211-87B8-EC9809C1E036
++g_f_res_sdberr__p_resource_zh_cn	5419E0DD-E5EB-4C2B-8BBB-D50701D624B1
++g_f_res_sdberr__p_resource_zh_tw	2A5653F6-DD7B-435A-9939-655B97C35AED
++g_f_res_sdberr__p_resource_zu	D1926D13-62AE-4FA2-B9E8-90E1546C9336
 +g_f_res_sdbt__p_resource_af	1056E190-4499-4D46-87B9-C270647FD5FE
 +g_f_res_sdbt__p_resource_ar	0F426C3E-C971-4F3C-B2DE-6587ED6F71FC
 +g_f_res_sdbt__p_resource_be_by	E5F10D00-9DCA-4C2D-B062-D65DE453151F
@@ -6603,6 +6686,7 @@
 +g_f_share_c_sc_uiconfig_zip__share_c_soffice_cfg_modules_sglobal_mb	09321CC1-27A5-48C4-AD79-A20AEB5ADD8E
 +g_f_share_c_sc_uiconfig_zip__share_c_soffice_cfg_modules_sglobal_statusbar	C6E309C8-D401-41D4-BFA5-3EE6B9EE9189
 +g_f_share_c_sc_uiconfig_zip__share_c_soffice_cfg_modules_sglobal_toolbar	325FBBA0-FEEC-4FE5-ACC2-2C28AB44ADA1
++g_f_share_c_sc_uiconfig_zip__share_c_soffice_cfg_modules_simpress_accelerator	F212CAF8-14D4-49E1-A253-8B8467A68336
 +g_f_share_c_sc_uiconfig_zip__share_c_soffice_cfg_modules_simpress_accelerator_de	C0DB77C7-34D8-4FE9-86E6-816D95D9C8F8
 +g_f_share_c_sc_uiconfig_zip__share_c_soffice_cfg_modules_simpress_accelerator_en_us	6B665D92-FB64-4887-9702-F15BA9119B7C
 +g_f_share_c_sc_uiconfig_zip__share_c_soffice_cfg_modules_simpress_accelerator_es	771EE8C3-0007-49FC-B175-76302159ABDA
@@ -6654,9 +6738,13 @@
 +g_f_share_c_sc_uiconfig_zip__share_c_soffice_cfg_modules_swxform_statusbar	90F2A737-9A1B-4BAD-A09D-7EE4F3B80535
 +g_f_share_c_sc_uiconfig_zip__share_c_soffice_cfg_modules_swxform_toolbar	AD8BD61D-97EF-4508-BA95-7C2A8AD0AB9C
 +g_f_shellnew2_odg_soffice__p_shellnew	F3D0F7CA-F0C4-42F9-B586-CA37CC8701E0
++g_f_shellnew2_odg_soffice__p_shellnew2	F39E5FA4-2429-47F8-AC68-6B36895BF927
 +g_f_shellnew2_odp_soffice__p_shellnew	FD473DAB-CFF1-4735-B508-D2DFC2C29DE6
++g_f_shellnew2_odp_soffice__p_shellnew2	7018AEE3-EA24-455C-8CC1-0C668219B82B
 +g_f_shellnew2_ods_soffice__p_shellnew	E6C5062F-E160-4D35-B25B-E4B599A93ED5
++g_f_shellnew2_ods_soffice__p_shellnew2	D21714D0-B53A-48A1-A7CC-EF379343C6D0
 +g_f_shellnew2_odt_soffice__p_shellnew	0DDD99A8-4988-4A6A-B797-22D3889912F2
++g_f_shellnew2_odt_soffice__p_shellnew2	3D25F9F3-56A6-4986-BFBE-F938320BEDF8
 +g_f_shellnew_odg_soffice__p_shellnew	8AD12FA3-94AC-4F99-AF75-3ED8CD21463C
 +g_f_shellnew_odp_soffice__p_shellnew	1B39BBF2-CFED-4FB0-8FE5-45D06F33599E
 +g_f_shellnew_ods_soffice__p_shellnew	CF646F5C-CC2F-4DB0-8D0C-88FA8DC561BD