[ooo-build-commit] Branch 'ooo-build-3-2' - 2 commits - bin/unpack configure.in distro-configs/GoOoLinux.conf.in distro-configs/GoOoMacOSX.conf.in distro-configs/GoOoWin32.conf.in patches/dev300
Fridrich Strba
fridrich at kemper.freedesktop.org
Wed Jan 20 16:24:37 PST 2010
bin/unpack | 4 ++--
configure.in | 5 +++--
distro-configs/GoOoLinux.conf.in | 2 +-
distro-configs/GoOoMacOSX.conf.in | 2 +-
distro-configs/GoOoWin32.conf.in | 2 +-
patches/dev300/go-oo-win32-installer-branding.diff | 17 +++++++++++++++--
patches/dev300/scp2_extensions.diff | 2 +-
7 files changed, 24 insertions(+), 10 deletions(-)
New commits:
commit 266ccdc56f25378ab704ab2ab84f6bd3a504fe29
Author: Fridrich Strba <fridrich.strba at bluewin.ch>
Date: Thu Jan 21 01:24:01 2010 +0100
More GoOo build branding fixes
* configure.in:
* distro-configs/GoOoLinux.conf.in:
* distro-configs/GoOoMacOSX.conf.in:
* distro-configs/GoOoWin32.conf.in:
* patches/dev300/go-oo-win32-installer-branding.diff:
diff --git a/configure.in b/configure.in
index b5fc409..398bae0 100644
--- a/configure.in
+++ b/configure.in
@@ -653,7 +653,7 @@ VENDORNAME=OpenOffice
case $DISTRO in
ArchLinux*) VENDORNAME="ArchLinux" ;;
Ark*) VENDORNAME="Ark" ;;
- CrossWin32*) VENDORNAME="Google Summer of Code 2009" ;;
+ CrossWin32*) VENDORNAME="Google Summer of Code 2009" ;;
Debian*|Ubuntu*) VENDORNAME="Debian" ;;
Dropline*) VENDORNAME="DroplineGNOME" ;;
Frugalware*) VENDORNAME="Frugalware" ;;
@@ -661,7 +661,8 @@ case $DISTRO in
Mandriva*) VENDORNAME="Mandriva" ;;
Pardus*) VENDORNAME="Pardus" ;;
rPath*|rpl*) VENDORNAME="rPath" ;;
- SUSE*|Novell*|NLD*|GoOo*) VENDORNAME="Novell" ;;
+ SUSE*|Novell*|NLD*) VENDORNAME="Novell" ;;
+ GoOo*) VENDORNAME="Go-oo Project" ;;
Slackware*) VENDORNAME="Slackware" ;;
PLD*) VENDORNAME="PLD" ;;
OxygenOffice*) VENDORNAME="OxygenOffice" ;;
diff --git a/distro-configs/GoOoLinux.conf.in b/distro-configs/GoOoLinux.conf.in
index 31dc50c..df06129 100644
--- a/distro-configs/GoOoLinux.conf.in
+++ b/distro-configs/GoOoLinux.conf.in
@@ -1,6 +1,6 @@
--with-intro-bitmaps=\"$TOOLSDIR/src/openintro_go-oo.bmp\"
--with-about-bitmaps=\"$TOOLSDIR/src/openabout_go-oo.bmp\"
---with-vendor=\"Novell, Inc.\"
+--with-vendor=\"Go-oo Project\"
--disable-dbus
--disable-kde4
--disable-access
diff --git a/distro-configs/GoOoMacOSX.conf.in b/distro-configs/GoOoMacOSX.conf.in
index 5893c58..82d1f24 100644
--- a/distro-configs/GoOoMacOSX.conf.in
+++ b/distro-configs/GoOoMacOSX.conf.in
@@ -1,6 +1,6 @@
--with-intro-bitmaps=\"$TOOLSDIR/src/openintro_go-oo.bmp\"
--with-about-bitmaps=\"$TOOLSDIR/src/openabout_go-oo.bmp\"
---with-vendor=\"Novell, Inc.\"
+--with-vendor=\"Go-oo Project\"
--enable-minimizer
--enable-presenter-console
--enable-pdfimport
diff --git a/distro-configs/GoOoWin32.conf.in b/distro-configs/GoOoWin32.conf.in
index b2e2ae3..be2feb9 100644
--- a/distro-configs/GoOoWin32.conf.in
+++ b/distro-configs/GoOoWin32.conf.in
@@ -1,6 +1,6 @@
--with-intro-bitmaps=\"$TOOLSDIR/src/openintro_go-oo.bmp\"
--with-about-bitmaps=\"$TOOLSDIR/src/openabout_go-oo.bmp\"
---with-vendor=\"Novell, Inc.\"
+--with-vendor=\"Go-oo Project\"
--disable-activex-component
--without-agfa-monotype-fonts
--disable-xrender-link
diff --git a/patches/dev300/go-oo-win32-installer-branding.diff b/patches/dev300/go-oo-win32-installer-branding.diff
index c05d0fa..76f0f53 100644
--- a/patches/dev300/go-oo-win32-installer-branding.diff
+++ b/patches/dev300/go-oo-win32-installer-branding.diff
@@ -62,6 +62,19 @@ dummy line to avoid confusing diff-mode
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
@@ -88,7 +101,7 @@ dummy line to avoid confusing diff-mode
DONTUSESTARTMENUFOLDER 1
SERVICESPROJEKT 1
RELATIVE_PATHES_IN_DDF 1
-@@ -92,9 +92,9 @@
+@@ -307,9 +307,9 @@
NOVERSIONINDIRNAME 0
NOSPACEINDIRECTORYNAME 1
CHANGETARGETDIR 1
@@ -100,4 +113,4 @@ dummy line to avoid confusing diff-mode
+ DOWNLOADSETUPICO ooosetup_go-oo.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
commit 754cfef16dbdf1823bfefebaa07043fc905e3ea8
Author: Fridrich Strba <fridrich.strba at bluewin.ch>
Date: Thu Jan 21 01:23:13 2010 +0100
Avoid version in Google Doc extension name
* bin/unpack:
* patches/dev300/scp2_extensions.diff:
diff --git a/bin/unpack b/bin/unpack
index ffe01ac..7cbe404 100755
--- a/bin/unpack
+++ b/bin/unpack
@@ -884,7 +884,7 @@ fi
if test "x$WATCH_WINDOW_EXTENSION" != "x"; then
check_file $SRCDIR/$WATCH_WINDOW_EXTENSION
- echo "Copying Google Docs extension into the tree"
+ echo "Copying Watch Window extension into the tree"
mkdir -p $OOBUILDDIR/extras/source/extensions/ || exit 1
$GNUCP $SRCDIR/$WATCH_WINDOW_EXTENSION -d $OOBUILDDIR/extras/source/extensions || exit 1
fi
@@ -893,7 +893,7 @@ if test "x$GOOGLE_DOCS_EXTENSION" != "x"; then
check_file $SRCDIR/$GOOGLE_DOCS_EXTENSION
echo "Copying Google Docs extension into the tree"
mkdir -p $OOBUILDDIR/extras/source/extensions/ || exit 1
- $GNUCP $SRCDIR/$GOOGLE_DOCS_EXTENSION -d $OOBUILDDIR/extras/source/extensions || exit 1
+ $GNUCP $SRCDIR/$GOOGLE_DOCS_EXTENSION -d $OOBUILDDIR/extras/source/extensions/gdocs.oxt || exit 1
fi
if test "x$NLPSOLVER_EXTENSION" != "x"; then
diff --git a/patches/dev300/scp2_extensions.diff b/patches/dev300/scp2_extensions.diff
index 4e426fa..99fb0ae 100644
--- a/patches/dev300/scp2_extensions.diff
+++ b/patches/dev300/scp2_extensions.diff
@@ -153,7 +153,7 @@
+ TXT_FILE_BODY;
+ Styles = (PACKED);
+ Dir = gid_Brand_Dir_Share_Extension_Install;
-+ Name = "gdocs_2.1.0_modified.oxt";
++ Name = "gdocs.oxt";
+End
+
+#endif
More information about the ooo-build-commit
mailing list