ooo-build r13834 - in branches/ooo-build-3-0: . patches/dev300

[tml svn gnome org]

Author: tml
Date: Mon Sep  8 12:41:18 2008
New Revision: 13834
URL: http://svn.gnome.org/viewvc/ooo-build?rev=13834&view=rev

Log:
2008-09-08  Tor Lillqvist  <tml novell com>

	* patches/dev300/win32-multi-lang-installer.diff
	* patches/dev300/novell-win32-msi-patchability.diff: Remove fuzz.



Modified:
   branches/ooo-build-3-0/ChangeLog
   branches/ooo-build-3-0/patches/dev300/novell-win32-installer-branding.diff
   branches/ooo-build-3-0/patches/dev300/win32-multi-lang-installer.diff

Modified: branches/ooo-build-3-0/patches/dev300/novell-win32-installer-branding.diff
==============================================================================
--- branches/ooo-build-3-0/patches/dev300/novell-win32-installer-branding.diff	(original)
+++ branches/ooo-build-3-0/patches/dev300/novell-win32-installer-branding.diff	Mon Sep  8 12:41:18 2008
@@ -48,8 +48,8 @@
 +			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.0.0
  			PATCHCODEFILE ooo_patchcodes.txt
@@ -61,8 +61,8 @@
 +			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.0.0
  			PATCHCODEFILE ooodev_patchcodes.txt
@@ -75,7 +75,7 @@
 +			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
@@ -101,4 +101,4 @@
 +            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

Modified: branches/ooo-build-3-0/patches/dev300/win32-multi-lang-installer.diff
==============================================================================
--- branches/ooo-build-3-0/patches/dev300/win32-multi-lang-installer.diff	(original)
+++ branches/ooo-build-3-0/patches/dev300/win32-multi-lang-installer.diff	Mon Sep  8 12:41:18 2008
@@ -517,6 +517,5 @@
 -	$(PERL) -w $(SOLARENV)$/bin$/gen_update_info.pl --buildid $(BUILD) --arch "$(RTL_ARCH)" --os "$(RTL_OS)" --lstfile $(PRJ)$/util$/openoffice.lst --product OpenOffice_Dev --languages $(subst,$(@:s/_/ /:1)_, $(@:b)) $(PRJ)$/util$/update.xml > $(MISC)/$(@:b)_$(RTL_OS)_$(RTL_ARCH)$(@:e).update.xml
 +	$(PERL) -w $(SOLARENV)$/bin$/gen_update_info.pl --buildid $(BUILD) --arch "$(RTL_ARCH)" --os "$(RTL_OS)" --lstfile $(PRJ)$/util$/openoffice.lst --product OpenOffice_Dev --languages $(subst,$(@:s/_/ /:1)_, $(@:b)) $(PRJ)$/util$/update.xml > $(MISC)/`date +%Y%m%d_%H%M`_$(RTL_OS)_$(RTL_ARCH)$(@:e).update.xml
  
- openofficedevarchive_% :
- 	$(PERL) -w $(SOLARENV)$/bin$/make_installer.pl -f $(PRJ)$/util$/openoffice.lst -l $(subst,$(@:s/_/ /:1)_, $(@:b)) -p OpenOffice_Dev -u $(OUT) -buildid $(BUILD) -msitemplate $(MSIOFFICETEMPLATEDIR) -msilanguage $(COMMONMISC)$/win_ulffiles -format archive $(VERBOSESWITCH)
-
+ .IF "$(PKGFORMAT)"!=""
+ $(foreach,i,$(alllangiso) ooolanguagepack_$i) : $$ {$(PKGFORMAT:^".")}