[ooo-build-commit] .: patches/dev300

[Fridrich Strba]

 patches/dev300/go-oo-win32-registry-branding.diff |   12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

New commits:
commit 1c9324b52a33a3e39f258ac155a72ba50dd1681d
Author: Fridrich Å trba <fridrich.strba at bluewin.ch>
Date:   Tue Sep 7 12:15:01 2010 +0200

    Massage another patch to apply

diff --git a/patches/dev300/go-oo-win32-registry-branding.diff b/patches/dev300/go-oo-win32-registry-branding.diff
index 1abf470..1a13716 100644
--- a/patches/dev300/go-oo-win32-registry-branding.diff
+++ b/patches/dev300/go-oo-win32-registry-branding.diff
@@ -26,13 +26,13 @@
 dummy line to avoid confusing diff-mode
 --- solenv/bin/modules/installer/windows/registry.pm
 +++ solenv/bin/modules/installer/windows/registry.pm
-@@ -179,6 +179,9 @@
- 	
- 	$value =~ s/\\\"/\"/g;	# no more masquerading of '"'
- 	$value =~ s/\<progpath\>/\[OFFICEINSTALLLOCATION\]/;
+@@ -205,6 +205,9 @@
+     $value =~ s/\\\"/\"/g;	# no more masquerading of '"'
+     $value =~ s/\\\\\s*$/\\/g;	# making "\\" at end of value to "\"
+     $value =~ s/\<progpath\>/\[INSTALLLOCATION\]/;
 +    $value =~ s/\<vendor\>/$ENV{'OOO_VENDOR'}/;
 +    $value =~ s/\<ooo_packageversion\>/$ENV{'OOO_PACKAGEVERSION'}/;
 +    $value =~ s/\<buildversion\>/$ENV{'BUILD_VER_STRING'}/;
- 	$value =~ s/\[OFFICEINSTALLLOCATION\]\\/\[OFFICEINSTALLLOCATION\]/;	# removing "\" after "[OFFICEINSTALLLOCATION]"
+     $value =~ s/\[INSTALLLOCATION\]\\/\[INSTALLLOCATION\]/;	# removing "\" after "[INSTALLLOCATION]"
  
- 	if ( $value =~ /\%/ ) { $value = installer::worker::replace_variables_in_string($value, $allvariableshashref); }
+     if ( $value =~ /\%/ ) { $value = installer::worker::replace_variables_in_string($value, $allvariableshashref); }