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

[tml svn gnome org]

Author: tml
Date: Wed Mar 26 19:08:27 2008
New Revision: 12015
URL: http://svn.gnome.org/viewvc/ooo-build?rev=12015&view=rev

Log:
2008-03-26  Tor Lillqvist  <tml novell com>

	* patches/src680/novell-win32-msi-patchability.diff: Use just a
	single cab file like before. It might be important for patching. I
	don't think there is any inherent gain in using several cab files.



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	Wed Mar 26 19:08:27 2008
@@ -7078,14 +7078,19 @@
 dummy line to avoid confusing diff-mode
 --- solenv/bin/modules/installer/globals.pm
 +++ solenv/bin/modules/installer/globals.pm
-@@ -243,11 +243,11 @@
- 	$fix_number_of_cab_files = 0;
+@@ -243,14 +243,14 @@
+ 	$javamaxservices = 15;
+ 	
+ 	$one_cab_file = 0;
+-	$fix_number_of_cab_files = 0;
++	$fix_number_of_cab_files = 1;
  	$cab_file_per_component = 0;
  	$cabfilecompressionlevel = 2;
 -	$number_of_cabfiles = 4;	# only for $fix_number_of_cab_files = 1 
 +	$number_of_cabfiles = 1;	# only for $fix_number_of_cab_files = 1 
  	$include_cab_in_msi = 0;
- 	$use_packages_for_cabs = 1;
+-	$use_packages_for_cabs = 1;
++	$use_packages_for_cabs = 0;
  	$msidatabasename = "";
 -	$prepare_winpatch = 0;
 +	$prepare_winpatch = 1;