[ooo-build-commit] Branch 'ooo-build-3-2' - patches/dev300

[Fridrich Strba]

 patches/dev300/go-oo-win32-installer-branding.diff |   55 +++------------------
 1 file changed, 8 insertions(+), 47 deletions(-)

New commits:
commit 302dd6b897ccc5c322f2d1bbd2225000d1a927b6
Author: Fridrich Strba <fridrich.strba at bluewin.ch>
Date:   Thu Jan 21 01:51:34 2010 +0100

    Massage to apply :)
    
    * patches/dev300/go-oo-win32-installer-branding.diff:

diff --git a/patches/dev300/go-oo-win32-installer-branding.diff b/patches/dev300/go-oo-win32-installer-branding.diff
index 76f0f53..29817b1 100644
--- a/patches/dev300/go-oo-win32-installer-branding.diff
+++ b/patches/dev300/go-oo-win32-installer-branding.diff
@@ -36,9 +36,9 @@
 dummy line to avoid confusing diff-mode
 --- instsetoo_native/util/openoffice.lst.old	2006-01-17 12:23:31.000000000 +0200
 +++ instsetoo_native/util/openoffice.lst	2006-01-17 14:24:08.000000000 +0200
-@@ -29,9 +29,9 @@
+@@ -85,9 +85,9 @@
  			USE_FILEVERSION 1
- 			LIBRARYVERSION 9.0.0
+ 			LIBRARYVERSION 9.2.0
  			PATCHCODEFILE ooo_patchcodes.txt
 -			DOWNLOADBANNER	ooobanner.bmp
 -			DOWNLOADBITMAP	ooobitmap.bmp
@@ -47,10 +47,10 @@ dummy line to avoid confusing diff-mode
 +			DOWNLOADBITMAP	ooobitmap_go-oo.bmp
 +			DOWNLOADSETUPICO	ooosetup_go-oo.ico
  			RELATIVE_PATHES_IN_DDF 1
-             STARTCENTER_ADDFEATURE_URL http://extensions.services.openoffice.org/getmore?cid=920794
-             STARTCENTER_INFO_URL http://www.openoffice.org
-@@ -76,9 +76,9 @@
- 			LIBRARYVERSION 9.0.0
+             STARTCENTER_ADDFEATURE_URL http://extensions.go-oo.org/getmore?cid=920794
+             STARTCENTER_INFO_URL http://www.go-oo.org
+@@ -149,9 +149,9 @@
+ 			LIBRARYVERSION 9.2.0
  			PATCHCODEFILE ooo_patchcodes.txt
  			JAVAPRODUCT 1
 -			DOWNLOADBANNER	ooobanner.bmp
@@ -60,47 +60,8 @@ dummy line to avoid confusing diff-mode
 +			DOWNLOADBITMAP	ooobitmap__go-oo.bmp
 +			DOWNLOADSETUPICO	ooosetup_go-oo.ico
  			RELATIVE_PATHES_IN_DDF 1
-             STARTCENTER_ADDFEATURE_URL http://extensions.services.openoffice.org/getmore?cid=920794
-             STARTCENTER_INFO_URL http://www.openoffice.org
-@@ -92,9 +92,9 @@
-             NOVERSIONINDIRNAME 0
-             NOSPACEINDIRECTORYNAME 1
-             CHANGETARGETDIR 1
--            DOWNLOADBANNER ooosdkbanner.bmp
--            DOWNLOADBITMAP ooosdkbitmap.bmp
--            DOWNLOADSETUPICO ooosetup.ico
-+            DOWNLOADBANNER ooobanner_go-oo.bmp
-+            DOWNLOADBITMAP ooobitmap_go-oo.bmp
-+            DOWNLOADSETUPICO ooosetup_go-oo.ico
-             DONTUSESTARTMENUFOLDER 1
-             RELATIVE_PATHES_IN_DDF 1
-             STARTCENTER_ADDFEATURE_URL http://extensions.services.openoffice.org/getmore?cid=920794
-@@ -122,9 +122,9 @@
- 			LIBRARYVERSION 9.0.0
- 			PATCHCODEFILE ooodev_patchcodes.txt
- 			CODEFILENAME codes_ooodev.txt
--			DOWNLOADBANNER	ooobanner.bmp
--			DOWNLOADBITMAP	ooobitmap.bmp
--			DOWNLOADSETUPICO	ooosetup.ico
-+			DOWNLOADBANNER	ooobanner_go-oo.bmp
-+			DOWNLOADBITMAP	ooobitmap_go-oo.bmp
-+			DOWNLOADSETUPICO	ooosetup_go-oo.ico
- 			LOCALUSERDIR $ORIGIN/..
- 			RELATIVE_PATHES_IN_DDF 1
- 			STARTCENTER_ADDFEATURE_URL http://extensions.services.openoffice.org/getmore?cid=920794
-@@ -150,9 +150,9 @@
-             NOVERSIONINDIRNAME 1
- 			PROGRAMFILESROOT 1
-                        GLOBALFILEGID gid_File_Dl_Cppu
--            DOWNLOADBANNER urebanner.bmp
--            DOWNLOADBITMAP urebitmap.bmp
--            DOWNLOADSETUPICO ooosetup.ico
-+            DOWNLOADBANNER ooobanner_go-oo.bmp
-+            DOWNLOADBITMAP ooobitmap_go-oo.bmp
-+            DOWNLOADSETUPICO ooosetup_go-oo.ico
-             DONTUSESTARTMENUFOLDER 1
-             SERVICESPROJEKT 1
-             RELATIVE_PATHES_IN_DDF 1
+             STARTCENTER_ADDFEATURE_URL http://extensions.go-oo.org/getmore?cid=920794
+             STARTCENTER_INFO_URL http://www.go-oo.org
 @@ -307,9 +307,9 @@
              NOVERSIONINDIRNAME 0
              NOSPACEINDIRECTORYNAME 1