[ooo-build-commit] .: 2 commits - patches/dev300 src/Makefile.am src/nologoinstall_fsfhu.bmp src/ooobitmap_fsfhu.bmp src/openintro_fsfhu.bmp
Andras Timar
timar at kemper.freedesktop.org
Wed May 19 06:50:06 PDT 2010
patches/dev300/apply | 1
patches/dev300/fsfhu-splash.diff | 8 +--
patches/dev300/fsfhu-win32-installer-branding.diff | 46 +++++++++++++++++++++
src/Makefile.am | 2
src/nologoinstall_fsfhu.bmp |binary
src/ooobitmap_fsfhu.bmp |binary
src/openintro_fsfhu.bmp |binary
7 files changed, 53 insertions(+), 4 deletions(-)
New commits:
commit 53a001b167ca6395ff00b2fe0d8002f9a6032a44
Author: Andras Timar <timar at fsf.hu>
Date: Sun May 16 16:09:06 2010 +0200
Updated FSF.hu brand images
* patches/dev300/apply:
* patches/dev300/fsfhu-splash.diff:
* patches/dev300/fsfhu-win32-installer-branding.diff:
* src/Makefile.am:
* src/nologoinstall_fsfhu.bmp:
* src/ooobitmap_fsfhu.bmp:
* src/openintro_fsfhu.bmp:
diff --git a/patches/dev300/apply b/patches/dev300/apply
index 96368d9..4166b86 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -3775,6 +3775,7 @@ SectionOwner => timar
fsfhu-instset.diff
fsfhu-splash.diff
fsfhu-vendor-win32.diff
+fsfhu-win32-installer-branding.diff
# Make CaptionOrderNumberingFirst true for Hungarian
captionnumbering-hu.diff, i#110273, timar
diff --git a/patches/dev300/fsfhu-splash.diff b/patches/dev300/fsfhu-splash.diff
index f12d442..ff53f1e 100755
--- a/patches/dev300/fsfhu-splash.diff
+++ b/patches/dev300/fsfhu-splash.diff
@@ -8,10 +8,10 @@
- PROGRESSSIZE 320,7
- PROGRESSPOSITION 185,206
- PROGRESSFRAMECOLOR 207,208,211
-+ PROGRESSBARCOLOR 33,73,132
-+ PROGRESSSIZE 412,7
-+ PROGRESSPOSITION 14,265
-+ PROGRESSFRAMECOLOR 165,165,165
++ PROGRESSBARCOLOR 14,133,206
++ PROGRESSSIZE 280,7
++ PROGRESSPOSITION 60,200
++ PROGRESSFRAMECOLOR 207,208,212
NATIVEPROGRESS true
REGISTRYLAYERNAME Layers
SERVICEPACK 1
diff --git a/patches/dev300/fsfhu-win32-installer-branding.diff b/patches/dev300/fsfhu-win32-installer-branding.diff
new file mode 100644
index 0000000..795643c
--- /dev/null
+++ b/patches/dev300/fsfhu-win32-installer-branding.diff
@@ -0,0 +1,46 @@
+--- 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
+@@ -408,9 +408,9 @@
+ $(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_fsfhu.bmp $(MSIOFFICETEMPLATEDIR)$/Binary$/Image.bmp
++ $(COPY) $(PRJ)$/res$/nologoinstall_fsfhu.bmp $(MSILANGPACKTEMPLATEDIR)$/Binary$/Image.bmp
++ $(COPY) $(PRJ)$/res$/nologoinstall_fsfhu.bmp $(MSISDKOOTEMPLATEDIR)$/Binary$/Image.bmp
++ $(COPY) $(PRJ)$/res$/nologoinstall_fsfhu.bmp $(MSIURETEMPLATEDIR)$/Binary$/Image.bmp
+
+
+
+--- instsetoo_native/util/openoffice.lst.old 2010-05-13 07:59:38.161250000 +0200
++++ instsetoo_native/util/openoffice.lst 2010-05-16 14:27:06.231375000 +0200
+@@ -90,7 +90,7 @@
+ LIBRARYVERSION 9.2.1
+ PATCHCODEFILE ooo_patchcodes.txt
+ DOWNLOADBANNER ooobanner.bmp
+- DOWNLOADBITMAP ooobitmap.bmp
++ DOWNLOADBITMAP ooobitmap_fsfhu.bmp
+ DOWNLOADSETUPICO ooosetup.ico
+ RELATIVE_PATHES_IN_DDF 1
+ STARTCENTER_ADDFEATURE_URL http://extensions.go-oo.org/getmore?cid=920794
+@@ -156,7 +156,7 @@
+ PATCHCODEFILE ooo_patchcodes.txt
+ JAVAPRODUCT 1
+ DOWNLOADBANNER ooobanner.bmp
+- DOWNLOADBITMAP ooobitmap.bmp
++ DOWNLOADBITMAP ooobitmap_fsfhu.bmp
+ DOWNLOADSETUPICO ooosetup.ico
+ RELATIVE_PATHES_IN_DDF 1
+ STARTCENTER_ADDFEATURE_URL http://extensions.go-oo.org/getmore?cid=920794
+@@ -227,7 +227,7 @@
+ PATCHCODEFILE ooodev_patchcodes.txt
+ CODEFILENAME codes_ooodev.txt
+ DOWNLOADBANNER ooobanner.bmp
+- DOWNLOADBITMAP ooobitmap.bmp
++ DOWNLOADBITMAP ooobitmap_fsfhu.bmp
+ DOWNLOADSETUPICO ooosetup.ico
+ LOCALUSERDIR $ORIGIN/..
+ RELATIVE_PATHES_IN_DDF 1
diff --git a/src/Makefile.am b/src/Makefile.am
index 34b12d2..9a6d7b7 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -35,6 +35,8 @@ EXTRA_DIST=\
openintro_pld.bmp \
openabout_pld.bmp \
openintro_fsfhu.bmp \
+ nologoinstall_fsfhu.bmp \
+ ooobitmap_fsfhu.bmp \
patchability-extras.zip \
sg3.sdg sg3.sdv sg3.thm \
sofficerc-upstream \
diff --git a/src/nologoinstall_fsfhu.bmp b/src/nologoinstall_fsfhu.bmp
new file mode 100755
index 0000000..c0b6919
Binary files /dev/null and b/src/nologoinstall_fsfhu.bmp differ
diff --git a/src/ooobitmap_fsfhu.bmp b/src/ooobitmap_fsfhu.bmp
new file mode 100755
index 0000000..be706c9
Binary files /dev/null and b/src/ooobitmap_fsfhu.bmp differ
diff --git a/src/openintro_fsfhu.bmp b/src/openintro_fsfhu.bmp
index 34ef319..538e137 100644
Binary files a/src/openintro_fsfhu.bmp and b/src/openintro_fsfhu.bmp differ
commit 8052d5e0f2ece880b2dbdf54c610b72c6f14d22d
Author: Andras Timar <timar at fsf.hu>
Date: Fri May 14 18:35:32 2010 +0200
fixing progress bar on FSFhu splash screen
* patches/dev300/fsfhu-splash.diff:
diff --git a/patches/dev300/fsfhu-splash.diff b/patches/dev300/fsfhu-splash.diff
index 77bcfa4..f12d442 100755
--- a/patches/dev300/fsfhu-splash.diff
+++ b/patches/dev300/fsfhu-splash.diff
@@ -8,10 +8,10 @@
- PROGRESSSIZE 320,7
- PROGRESSPOSITION 185,206
- PROGRESSFRAMECOLOR 207,208,211
-+ PROGRESSBARCOLOR 33,73,132
-+ PROGRESSSIZE 412,7
-+ PROGRESSPOSITION 14,280
-+ PROGRESSFRAMECOLOR 165,165,165
++ PROGRESSBARCOLOR 33,73,132
++ PROGRESSSIZE 412,7
++ PROGRESSPOSITION 14,265
++ PROGRESSFRAMECOLOR 165,165,165
NATIVEPROGRESS true
REGISTRYLAYERNAME Layers
SERVICEPACK 1
More information about the ooo-build-commit
mailing list