ooo-build r14144 - branches/debian-2-4-1/patches/src680

[rengelhard svn gnome org]

Author: rengelhard
Date: Mon Sep 29 22:02:01 2008
New Revision: 14144
URL: http://svn.gnome.org/viewvc/ooo-build?rev=14144&view=rev

Log:
fix applying

Modified:
   branches/debian-2-4-1/patches/src680/soffice-remove-webwizard.diff

Modified: branches/debian-2-4-1/patches/src680/soffice-remove-webwizard.diff
==============================================================================
--- branches/debian-2-4-1/patches/src680/soffice-remove-webwizard.diff	(original)
+++ branches/debian-2-4-1/patches/src680/soffice-remove-webwizard.diff	Mon Sep 29 22:02:01 2008
@@ -5,9 +5,9 @@
 diff -u -r1.28.48.1 soffice.sh
 --- desktop/scripts/soffice.sh	2 Jan 2008 14:47:34 -0000	1.28.48.1
 +++ desktop/scripts/soffice.sh	23 Sep 2008 10:47:17 -0000
-@@ -247,6 +247,18 @@
+@@ -364,6 +364,19 @@
+     sd_binary="oosplash.bin"
  fi
- export PATH
  
 +# Fix for bug #mdv41228 #i89207
 +# Remove this line:
@@ -21,6 +21,7 @@
 +if [[ -f $dialog_xlc && -f $script_xlc ]]; then
 +    sed -i "s/.*library:name=\"WebWizard\".*openoffice.*//" $dialog_xlc $script_xlc
 +fi
- 
++
  # execute soffice binary
  "$sd_prog/$sd_binary" "$@" &
+ trap 'kill -9 $!' TERM