ooo-build r13145 - in trunk: . patches/dev300

[tml svn gnome org]

Author: tml
Date: Thu Jul 10 12:10:53 2008
New Revision: 13145
URL: http://svn.gnome.org/viewvc/ooo-build?rev=13145&view=rev

Log:
2008-07-10  Tor Lillqvist  <tml novell com>

	* patches/dev300/win32-multi-lang-installer.diff: Update for
	dev300-m21.



Modified:
   trunk/ChangeLog
   trunk/patches/dev300/win32-multi-lang-installer.diff

Modified: trunk/patches/dev300/win32-multi-lang-installer.diff
==============================================================================
--- trunk/patches/dev300/win32-multi-lang-installer.diff	(original)
+++ trunk/patches/dev300/win32-multi-lang-installer.diff	Thu Jul 10 12:10:53 2008
@@ -1,19 +1,17 @@
 --- ../../../2.0.2-pristine/build/OOO_2_0_2/scp2/source/ooo/file_library_ooo.scp	2006-06-02 13:06:38.003914500 +0000
 +++ scp2/source/ooo/file_library_ooo.scp	2006-05-31 16:15:01.893875000 +0000
-@@ -2168,3 +2168,14 @@
-     Name = SCP2_URE_DL_NORMAL("unopkg");
-     Styles = (PACKED);
+@@ -2168,3 +2168,12 @@
+     Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
  End
+ #endif
 +
 +#ifdef WNT
-+
 +File gid_File_Lib_sellangmsi
 +    TXT_FILE_BODY;
 +    Styles = (PACKED, BINARYTABLE, BINARYTABLE_ONLY);
 +    Dir = gid_Dir_Program;
 +    Name = "sellangmsi.dll";
 +End
-+
 +#endif
 dummy line to avoid confusing diff-mode
 --- scp2/source/ooo/windowscustomaction_ooo.scp
@@ -493,19 +491,6 @@
  	replace_one_variable($templatefile, "PRODUCTPATHPLACEHOLDER", $productpath);
  }
  
---- solenv/bin/modules/installer/windows/file.pm
-+++ solenv/bin/modules/installer/windows/file.pm
-@@ -242,6 +242,10 @@
- 	$componentname =~ s/_basicidecommands_/_baic_/g;
- 	$componentname =~ s/_genericcommands_/_genc_/g;
- 	$componentname =~ s/_bibliographycommands_/_bibc_/g;
-+	$componentname =~ s/_share_/_s_/g;
-+	$componentname =~ s/_modules_/_ms_/g;
-+	$componentname =~ s/_uiconfig_zip_/_ucz_/g;
-+	$componentname =~ s/_soffice_cfg_/_sc_/g;
- 
- 	# All this is not necessary for files, which have the flag ASSIGNCOMPOMENT
- 	
 --- instsetoo_native/util/makefile.mk
 +++ instsetoo_native/util/makefile.mk
 @@ -222,7 +222,7 @@