[ooo-build-commit] patches/dev300

[Tor Lillqvist]

 patches/dev300/novell-win32-installer-branding.diff |   18 +++++++++---------
 patches/dev300/win32-multi-lang-installer.diff      |    4 ++--
 2 files changed, 11 insertions(+), 11 deletions(-)

New commits:
commit 57c49c5e246efe20220714df1be4258c43dafddd
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Mon Jul 27 14:10:33 2009 +0300

    Remove fuzz.

diff --git a/patches/dev300/novell-win32-installer-branding.diff b/patches/dev300/novell-win32-installer-branding.diff
index 3153ced..bfb56a0 100644
--- a/patches/dev300/novell-win32-installer-branding.diff
+++ b/patches/dev300/novell-win32-installer-branding.diff
@@ -48,8 +48,8 @@ dummy line to avoid confusing diff-mode
 +			DOWNLOADBITMAP	ooobitmap_nld.bmp
 +			DOWNLOADSETUPICO	ooosetup_nld.ico
  			RELATIVE_PATHES_IN_DDF 1
-             STARTCENTER_ADDFEATURE_URL http://extensions.services.openoffice.org/getmore?cid=920794
-             STARTCENTER_INFO_URL http://www.openoffice.org
+             STARTCENTER_ADDFEATURE_URL http://extensions.go-oo.org/getmore?cid=920794
+             STARTCENTER_INFO_URL http://www.go-oo.org
 @@ -76,9 +76,9 @@
  			LIBRARYVERSION 9.1.1
  			PATCHCODEFILE ooo_patchcodes.txt
@@ -61,8 +61,8 @@ dummy line to avoid confusing diff-mode
 +			DOWNLOADBITMAP	ooobitmap_nld.bmp
 +			DOWNLOADSETUPICO	ooosetup_nld.ico
  			RELATIVE_PATHES_IN_DDF 1
-             STARTCENTER_ADDFEATURE_URL http://extensions.services.openoffice.org/getmore?cid=920794
-             STARTCENTER_INFO_URL http://www.openoffice.org
+             STARTCENTER_ADDFEATURE_URL http://extensions.go-oo.org/getmore?cid=920794
+             STARTCENTER_INFO_URL http://www.go-oo.org
 @@ -122,9 +122,9 @@
  			LIBRARYVERSION 9.1.1
  			PATCHCODEFILE ooodev_patchcodes.txt
@@ -75,11 +75,11 @@ dummy line to avoid confusing diff-mode
 +			DOWNLOADSETUPICO	ooosetup_nld.ico
  			LOCALUSERDIR $ORIGIN/..
  			RELATIVE_PATHES_IN_DDF 1
- 			STARTCENTER_ADDFEATURE_URL http://extensions.services.openoffice.org/getmore?cid=920794
+ 			STARTCENTER_ADDFEATURE_URL http://extensions.go-oo.org/getmore?cid=920794
 @@ -150,9 +150,9 @@
-             NOVERSIONINDIRNAME 1
- 			PROGRAMFILESROOT 1
-                        GLOBALFILEGID gid_File_Dl_Cppu
+             PROGRAMFILESROOT 1
+             PCPFILENAME ure.pcp
+             GLOBALFILEGID gid_File_Dl_Cppu
 -            DOWNLOADBANNER urebanner.bmp
 -            DOWNLOADBITMAP urebitmap.bmp
 -            DOWNLOADSETUPICO ooosetup.ico
@@ -101,4 +101,4 @@ dummy line to avoid confusing diff-mode
 +            DOWNLOADSETUPICO ooosetup_nld.ico
              DONTUSESTARTMENUFOLDER 1
              RELATIVE_PATHES_IN_DDF 1
-             STARTCENTER_ADDFEATURE_URL http://extensions.services.openoffice.org/getmore?cid=920794
+             STARTCENTER_ADDFEATURE_URL http://extensions.go-oo.org/getmore?cid=920794
diff --git a/patches/dev300/win32-multi-lang-installer.diff b/patches/dev300/win32-multi-lang-installer.diff
index 09cc8c8..50185e1 100644
--- a/patches/dev300/win32-multi-lang-installer.diff
+++ b/patches/dev300/win32-multi-lang-installer.diff
@@ -1,8 +1,8 @@
 --- ../../../2.0.2-pristine/build/OOO_2_0_2/scp2/source/ooo/file_library_ooo.scp	2006-06-02 13:06:38.003914500 +0000
 +++ scp2/source/ooo/file_library_ooo.scp	2006-05-31 16:15:01.893875000 +0000
 @@ -2168,3 +2168,12 @@
- 
- STD_UNO_LIB_FILE(gid_File_Lib_Unordf, unordf)
+ STD_UNO_LIB_FILE_PATCH( gid_File_Lib_For, for)
+ STD_LIB_FILE_PATCH( gid_File_Lib_Forui, forui)
  
 +
 +#ifdef WNT