[Libreoffice-commits] .: Branch 'libreoffice-3-4' - patches/dev300

[Tor Lillqvist]

 patches/dev300/novell-win32-installer-branding.diff |   10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

New commits:
commit 95b46a5e0c577173e27992c3c970d29e0c454cba
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Mon Apr 4 14:56:11 2011 +0300

    Make novell-win32-installer-branding.diff apply again

diff --git a/patches/dev300/novell-win32-installer-branding.diff b/patches/dev300/novell-win32-installer-branding.diff
index 5e5cd19..046f9ef 100644
--- a/patches/dev300/novell-win32-installer-branding.diff
+++ b/patches/dev300/novell-win32-installer-branding.diff
@@ -42,7 +42,7 @@
 +++ instsetoo_native/util/openoffice.lst
 @@ -29,11 +29,11 @@
  			USE_FILEVERSION 1
- 			LIBRARYVERSION 9.3.0
+ 			LIBRARYVERSION 9.4.0
  			PATCHCODEFILE ooo_patchcodes.txt
 -			DOWNLOADBANNER	ooobanner.bmp
 -			DOWNLOADBITMAP	ooobitmap.bmp
@@ -56,7 +56,7 @@
              STARTCENTER_ADDFEATURE_URL http://extensions.libreoffice.org/
              STARTCENTER_INFO_URL http://www.libreoffice.org/
 @@ -76,9 +76,9 @@
- 			LIBRARYVERSION 9.3.0
+ 			LIBRARYVERSION 9.4.0
  			PATCHCODEFILE ooo_patchcodes.txt
  			JAVAPRODUCT 1
 -			DOWNLOADBANNER	ooobanner.bmp
@@ -69,7 +69,7 @@
              STARTCENTER_ADDFEATURE_URL http://extensions.libreoffice.org/
              STARTCENTER_INFO_URL http://www.libreoffice.org/
 @@ -122,9 +122,9 @@
- 			LIBRARYVERSION 9.3.0
+ 			LIBRARYVERSION 9.4.0
  			PATCHCODEFILE ooodev_patchcodes.txt
  			CODEFILENAME codes_ooodev.txt
 -			DOWNLOADBANNER	ooobanner.bmp
@@ -92,11 +92,11 @@
 +            DOWNLOADBITMAP ooobitmap_nld.bmp
 +            DOWNLOADSETUPICO ooosetup_nld.ico
              DONTUSESTARTMENUFOLDER 1
-             SERVICESPROJEKT 1
              RELATIVE_PATHES_IN_DDF 1
+             STARTCENTER_ADDFEATURE_URL http://extensions.libreoffice.org/
 @@ -92,9 +92,9 @@
-             NOVERSIONINDIRNAME 0
              NOSPACEINDIRECTORYNAME 1
+             NOSHORTDIRECTORYNAMES 1
              CHANGETARGETDIR 1
 -            DOWNLOADBANNER ooosdkbanner.bmp
 -            DOWNLOADBITMAP ooosdkbitmap.bmp