ooo-build r13836 - in branches/ooo-build-3-0: . patches/dev300

[tml svn gnome org]

Author: tml
Date: Mon Sep  8 12:52:53 2008
New Revision: 13836
URL: http://svn.gnome.org/viewvc/ooo-build?rev=13836&view=rev

Log:
2008-09-08  Tor Lillqvist  <tml novell com>

	* patches/dev300/win32-mergemodule-pm.diff: Remove fuzz.



Modified:
   branches/ooo-build-3-0/ChangeLog
   branches/ooo-build-3-0/patches/dev300/win32-mergemodule-pm.diff

Modified: branches/ooo-build-3-0/patches/dev300/win32-mergemodule-pm.diff
==============================================================================
--- branches/ooo-build-3-0/patches/dev300/win32-mergemodule-pm.diff	(original)
+++ branches/ooo-build-3-0/patches/dev300/win32-mergemodule-pm.diff	Mon Sep  8 12:52:53 2008
@@ -1,7 +1,6 @@
 --- solenv/bin/modules/installer/windows/mergemodule.pm
 +++ solenv/bin/modules/installer/windows/mergemodule.pm
 @@ -1128,7 +1128,9 @@
- 						
  		# changing directory
  		my $from = cwd();
  		my $to = $mergemodulehash->{'workdir'};
@@ -11,6 +10,7 @@
 +		chdir($to) || die "Could not chdir to \"$to\"\n";
  
  		# Unpack the cab file, so that in can be included into the last office cabinet file.
+ 		# Not using cabarc.exe from cabsdk for unpacking cabinet files, but "expand.exe" that
 @@ -1138,7 +1138,10 @@
  		$infoline = "Unpacking cabinet file: $mergemodulehash->{'cabinetfile'}\n";
  		push( @installer::globals::logfileinfo, $infoline);