[ooo-build-commit] Branch 'ooo-build-3-2' - patches/dev300
Fridrich Strba
fridrich at kemper.freedesktop.org
Wed Jan 20 06:28:52 PST 2010
patches/dev300/go-oo-win32-installer-branding.diff | 51 ++++++++++-----------
patches/dev300/go-oo-win32-vrb-branding.diff | 4 -
2 files changed, 27 insertions(+), 28 deletions(-)
New commits:
commit 907e446c14325dbe5fb608bd1e109ae5c38e214d
Author: Fridrich Strba <fridrich.strba at bluewin.ch>
Date: Wed Jan 20 15:28:22 2010 +0100
Massaging to apply
* patches/dev300/go-oo-win32-installer-branding.diff:
* patches/dev300/go-oo-win32-vrb-branding.diff:
diff --git a/patches/dev300/go-oo-win32-installer-branding.diff b/patches/dev300/go-oo-win32-installer-branding.diff
index 68bd69a..9df8c35 100644
--- a/patches/dev300/go-oo-win32-installer-branding.diff
+++ b/patches/dev300/go-oo-win32-installer-branding.diff
@@ -11,27 +11,26 @@
en-US = "&Next >"
--- instsetoo_native/util/makefile.mk.old 2006-01-16 15:10:22.000000000 +0200
+++ instsetoo_native/util/makefile.mk 2006-01-17 12:58:26.000000000 +0200
-@@ -372,10 +372,17 @@
- $(RM) $(MSIURETEMPLATEDIR)$/Binary$/Image.bmp
- $(RM) $(MSISDKOOTEMPLATEDIR)$/Binary$/Image.bmp
- # $(RM) $(MSIURETEMPLATEDIR)$/Binary$/Image.bmp
-- $(COPY) $(PRJ)$/res$/nologoinstall.bmp $(MSIOFFICETEMPLATEDIR)$/Binary$/Image.bmp
-- $(COPY) $(PRJ)$/res$/nologoinstall.bmp $(MSILANGPACKTEMPLATEDIR)$/Binary$/Image.bmp
-- $(COPY) $(PRJ)$/res$/nologoinstall.bmp $(MSIURETEMPLATEDIR)$/Binary$/Image.bmp
-- $(COPY) $(PRJ)$/res$/nologoinstall.bmp $(MSISDKOOTEMPLATEDIR)$/Binary$/Image.bmp
--# $(COPY) $(PRJ)$/res$/nologoinstall.bmp $(MSIURETEMPLATEDIR)$/Binary$/Image.bmp
-+ $(COPY) $(PRJ)$/res$/nologoinstall_go-oo.bmp $(MSIOFFICETEMPLATEDIR)$/Binary$/Image.bmp
-+ $(COPY) $(PRJ)$/res$/nologoinstall_go-oo.bmp $(MSILANGPACKTEMPLATEDIR)$/Binary$/Image.bmp
-+ $(COPY) $(PRJ)$/res$/nologoinstall_go-oo.bmp $(MSISDKOOTEMPLATEDIR)$/Binary$/Image.bmp
-+ $(COPY) $(PRJ)$/res$/nologoinstall_go-oo.bmp $(MSIURETEMPLATEDIR)$/Binary$/Image.bmp
-+ $(RM) $(MSIOFFICETEMPLATEDIR)$/Binary$/Banner.bmp
-+ $(RM) $(MSILANGPACKTEMPLATEDIR)$/Binary$/Banner.bmp
-+ $(RM) $(MSISDKOOTEMPLATEDIR)$/Binary$/Banner.bmp
-+ $(RM) $(MSIURETEMPLATEDIR)$/Binary$/Banner.bmp
-+ $(COPY) $(PRJ)$/res$/banner_go-oo.bmp $(MSIOFFICETEMPLATEDIR)$/Binary$/Banner.bmp
-+ $(COPY) $(PRJ)$/res$/banner_go-oo.bmp $(MSILANGPACKTEMPLATEDIR)$/Binary$/Banner.bmp
-+ $(COPY) $(PRJ)$/res$/banner_go-oo.bmp $(MSISDKOOTEMPLATEDIR)$/Binary$/Banner.bmp
-+ $(COPY) $(PRJ)$/res$/banner_go-oo.bmp $(MSIURETEMPLATEDIR)$/Binary$/Banner.bmp
+@@ -372,9 +372,17 @@
+ $(RM) $(MSILANGPACKTEMPLATEDIR)$/Binary$/Image.bmp
+ $(RM) $(MSIURETEMPLATEDIR)$/Binary$/Image.bmp
+ $(RM) $(MSISDKOOTEMPLATEDIR)$/Binary$/Image.bmp
+- $(COPY) $(PRJ)$/res$/nologoinstall.bmp $(MSIOFFICETEMPLATEDIR)$/Binary$/Image.bmp
+- $(COPY) $(PRJ)$/res$/nologoinstall.bmp $(MSILANGPACKTEMPLATEDIR)$/Binary$/Image.bmp
+- $(COPY) $(PRJ)$/res$/nologoinstall.bmp $(MSIURETEMPLATEDIR)$/Binary$/Image.bmp
+- $(COPY) $(PRJ)$/res$/nologoinstall.bmp $(MSISDKOOTEMPLATEDIR)$/Binary$/Image.bmp
++ $(COPY) $(PRJ)$/res$/nologoinstall_go-oo.bmp $(MSIOFFICETEMPLATEDIR)$/Binary$/Image.bmp
++ $(COPY) $(PRJ)$/res$/nologoinstall_go-oo.bmp $(MSILANGPACKTEMPLATEDIR)$/Binary$/Image.bmp
++ $(COPY) $(PRJ)$/res$/nologoinstall_go-oo.bmp $(MSISDKOOTEMPLATEDIR)$/Binary$/Image.bmp
++ $(COPY) $(PRJ)$/res$/nologoinstall_go-oo.bmp $(MSIURETEMPLATEDIR)$/Binary$/Image.bmp
++ $(RM) $(MSIOFFICETEMPLATEDIR)$/Binary$/Banner.bmp
++ $(RM) $(MSILANGPACKTEMPLATEDIR)$/Binary$/Banner.bmp
++ $(RM) $(MSISDKOOTEMPLATEDIR)$/Binary$/Banner.bmp
++ $(RM) $(MSIURETEMPLATEDIR)$/Binary$/Banner.bmp
++ $(COPY) $(PRJ)$/res$/banner_go-oo.bmp $(MSIOFFICETEMPLATEDIR)$/Binary$/Banner.bmp
++ $(COPY) $(PRJ)$/res$/banner_go-oo.bmp $(MSILANGPACKTEMPLATEDIR)$/Binary$/Banner.bmp
++ $(COPY) $(PRJ)$/res$/banner_go-oo.bmp $(MSISDKOOTEMPLATEDIR)$/Binary$/Banner.bmp
++ $(COPY) $(PRJ)$/res$/banner_go-oo.bmp $(MSIURETEMPLATEDIR)$/Binary$/Banner.bmp
dummy line to avoid confusing diff-mode
@@ -46,7 +45,7 @@ dummy line to avoid confusing diff-mode
- DOWNLOADSETUPICO ooosetup.ico
+ DOWNLOADBANNER ooobanner_nld.bmp
+ DOWNLOADBITMAP ooobitmap_nld.bmp
-+ DOWNLOADSETUPICO ooosetup_nld.ico
++ DOWNLOADSETUPICO ooosetup.ico
RELATIVE_PATHES_IN_DDF 1
STARTCENTER_ADDFEATURE_URL http://extensions.services.openoffice.org/getmore?cid=920794
STARTCENTER_INFO_URL http://www.openoffice.org
@@ -59,7 +58,7 @@ dummy line to avoid confusing diff-mode
- DOWNLOADSETUPICO ooosetup.ico
+ DOWNLOADBANNER ooobanner_nld.bmp
+ DOWNLOADBITMAP ooobitmap_nld.bmp
-+ DOWNLOADSETUPICO ooosetup_nld.ico
++ DOWNLOADSETUPICO ooosetup.ico
RELATIVE_PATHES_IN_DDF 1
STARTCENTER_ADDFEATURE_URL http://extensions.services.openoffice.org/getmore?cid=920794
STARTCENTER_INFO_URL http://www.openoffice.org
@@ -72,7 +71,7 @@ dummy line to avoid confusing diff-mode
- DOWNLOADSETUPICO ooosetup.ico
+ DOWNLOADBANNER ooobanner_nld.bmp
+ DOWNLOADBITMAP ooobitmap_nld.bmp
-+ DOWNLOADSETUPICO ooosetup_nld.ico
++ DOWNLOADSETUPICO ooosetup.ico
LOCALUSERDIR $ORIGIN/..
RELATIVE_PATHES_IN_DDF 1
STARTCENTER_ADDFEATURE_URL http://extensions.services.openoffice.org/getmore?cid=920794
@@ -85,7 +84,7 @@ dummy line to avoid confusing diff-mode
- DOWNLOADSETUPICO ooosetup.ico
+ DOWNLOADBANNER ooobanner_nld.bmp
+ DOWNLOADBITMAP ooobitmap_nld.bmp
-+ DOWNLOADSETUPICO ooosetup_nld.ico
++ DOWNLOADSETUPICO ooosetup.ico
DONTUSESTARTMENUFOLDER 1
SERVICESPROJEKT 1
RELATIVE_PATHES_IN_DDF 1
@@ -98,7 +97,7 @@ dummy line to avoid confusing diff-mode
- DOWNLOADSETUPICO ooosetup.ico
+ DOWNLOADBANNER ooobanner_nld.bmp
+ DOWNLOADBITMAP ooobitmap_nld.bmp
-+ DOWNLOADSETUPICO ooosetup_nld.ico
++ DOWNLOADSETUPICO ooosetup.ico
DONTUSESTARTMENUFOLDER 1
RELATIVE_PATHES_IN_DDF 1
STARTCENTER_ADDFEATURE_URL http://extensions.services.openoffice.org/getmore?cid=920794
diff --git a/patches/dev300/go-oo-win32-vrb-branding.diff b/patches/dev300/go-oo-win32-vrb-branding.diff
index 025b731..e529344 100644
--- a/patches/dev300/go-oo-win32-vrb-branding.diff
+++ b/patches/dev300/go-oo-win32-vrb-branding.diff
@@ -24,7 +24,7 @@
block "040704E4"
{
// German StringTable
-- value "CompanyName", "Sun Microsystems, Inc.\0"
+- value "CompanyName", "OpenOffice.org\0"
+ value "CompanyName", "Go-oo\0"
value "FileVersion", PPS(VER_LEVEL) "\0"
value "OriginalFilename", PPS(ORG_NAME) "\0"
@@ -33,7 +33,7 @@
block "040904E4"
{
// International StringTable
-- value "CompanyName", "Sun Microsystems, Inc.\0"
+- value "CompanyName", "OpenOffice.org\0"
+ value "CompanyName", "Go-oo\0"
value "FileVersion", PPS(VER_LEVEL) "\0"
value "OriginalFilename", PPS(ORG_NAME) "\0"
More information about the ooo-build-commit
mailing list