ooo-build r14600 - in trunk: . distro-configs patches/dev300

[szalaik svn gnome org]

Author: szalaik
Date: Tue Nov 25 19:20:51 2008
New Revision: 14600
URL: http://svn.gnome.org/viewvc/ooo-build?rev=14600&view=rev

Log:
2008-11-25  Kalman Szalai - KAMI <kamihir freemail hu>

	* patches/dev300/apply
	* patches/dev300/apache-commons-build-fix-invalid-chars.diff: Fixing build breake
	in apache-common module when you use UTF-8 based locale in the build system
	* distro-configs/OxygenOfficeLinux.conf.in
	* distro-configs/OxygenOfficeWindows.conf.in: Build bits.



Added:
   trunk/patches/dev300/apache-commons-build-fix-invalid-chars.diff
Modified:
   trunk/ChangeLog
   trunk/distro-configs/OxygenOfficeLinux.conf.in
   trunk/distro-configs/OxygenOfficeWindows.conf.in
   trunk/patches/dev300/apply

Modified: trunk/distro-configs/OxygenOfficeLinux.conf.in
==============================================================================
--- trunk/distro-configs/OxygenOfficeLinux.conf.in	(original)
+++ trunk/distro-configs/OxygenOfficeLinux.conf.in	Tue Nov 25 19:20:51 2008
@@ -1,7 +1,7 @@
 --with-intro-bitmaps=\"$SRCDIR/openintro_ooop.bmp\"
 --with-about-bitmaps=\"$SRCDIR/openabout_ooop.bmp\"
 --with-vendor=\"OxygenOffice Professional Team\"
---with-build-version=\"OxygenOffice Professional 2.9.0 M22 (3.0 Betas) - OxygenOffice Build 1\"
+--with-build-version=\"OxygenOffice Professional 3.1.0 M035 - OxygenOffice Build 0\"
 --enable-binfilter
 --with-vba-package-format=builtin
 --enable-vba

Modified: trunk/distro-configs/OxygenOfficeWindows.conf.in
==============================================================================
--- trunk/distro-configs/OxygenOfficeWindows.conf.in	(original)
+++ trunk/distro-configs/OxygenOfficeWindows.conf.in	Tue Nov 25 19:20:51 2008
@@ -1,7 +1,7 @@
 --with-intro-bitmaps=\"$SRCDIR/openintro_ooop.bmp\"
 --with-about-bitmaps=\"$SRCDIR/openabout_ooop.bmp\"
 --with-vendor=\"OxygenOffice Professional Team\"
---with-build-version=\"OxygenOffice Professional 2.9.0 M22 (3.0 Betas) - OxygenOffice Build 1\"
+--with-build-version=\"OxygenOffice Professional 3.1.0 M035 - OxygenOffice Build 0\"
 --enable-binfilter
 --with-vba-package-format=builtin
 --enable-vba

Added: trunk/patches/dev300/apache-commons-build-fix-invalid-chars.diff
==============================================================================
--- (empty file)
+++ trunk/patches/dev300/apache-commons-build-fix-invalid-chars.diff	Tue Nov 25 19:20:51 2008
@@ -0,0 +1,12 @@
+--- apache-commons/java/httpclient/makefile.mk.old	2008-11-25 15:23:34.000000000 +0100
++++ apache-commons/java/httpclient/makefile.mk	2008-11-25 19:46:41.000000000 +0100
+@@ -59,6 +59,9 @@
+ COMMONS_LOGGING_JAR=..$/..$/..$/..$/$(INPATH)$/class$/commons-logging-1.1.1-SNAPSHOT.jar
+ COMMONS_CODEC_JAR=..$/..$/..$/..$/$/$(INPATH)$/class$/commons-codec-1.3.jar
+ 
++ANT_OPTS+="-Dfile.encoding=ISO-8859-1"
++.EXPORT : ANT_OPTS
++
+ .IF "$(JAVACISGCJ)"=="yes"
+ JAVA_HOME=
+ .EXPORT : JAVA_HOME

Modified: trunk/patches/dev300/apply
==============================================================================
--- trunk/patches/dev300/apply	(original)
+++ trunk/patches/dev300/apply	Tue Nov 25 19:20:51 2008
@@ -402,6 +402,8 @@
 presenterscreen-no-license.diff
 # extensions: fix & unbundle system java
 extensions-system-java.diff, hmth
+# Fixing build breake in apache-common module when you use UTF-8 based locale in the build system
+apache-commons-build-fix-invalid-chars.diff, kami
 
 [ FixesNotForUpstream < ooo300-m3 ]
 pdfimport-no-license-m2.diff