ooo-build r13743 - in trunk: . patches/dev300

[pmladek svn gnome org]

Author: pmladek
Date: Mon Sep  1 14:48:58 2008
New Revision: 13743
URL: http://svn.gnome.org/viewvc/ooo-build?rev=13743&view=rev

Log:
2008-09-01  Petr Mladek  <pmladek suse cz>

	* patches/dev300/build-java-target.diff: set target 1.5 by default

	* patches/dev300/office-cfg-common-template-dir.diff: add
	  the version independent directory /usr/share/templates/ooo
	  to the list

	* patches/dev300/apply: bin the disabled link-symb-funct.diff; has
	  been obsolete since a long time



Modified:
   trunk/ChangeLog
   trunk/patches/dev300/apply
   trunk/patches/dev300/build-java-target.diff
   trunk/patches/dev300/office-cfg-common-template-dir.diff

Modified: trunk/patches/dev300/apply
==============================================================================
--- trunk/patches/dev300/apply	(original)
+++ trunk/patches/dev300/apply	Mon Sep  1 14:48:58 2008
@@ -952,9 +952,6 @@
 # Push fonts into the ps stream always
 pushfont-psstream.diff, i#84481, michael
 
-# accelerate run-time linking, somewhat experimental ...
-#link-symb-funct.diff, michael
-
 # search also /usr/share for icons
 # it is a temporary hack; we should do more clean FHS compliant installation
 # we need a good plan before, though ;-)
@@ -1165,6 +1162,7 @@
 
 [ BuildBits ]
 # allow separate helpcontent build
+# FIXME: is anybody using this feature?
 #FIXME src680: separate-helpcontent.diff, jholesov
 
 # bind all those function / named relocations locally

Modified: trunk/patches/dev300/build-java-target.diff
==============================================================================
--- trunk/patches/dev300/build-java-target.diff	(original)
+++ trunk/patches/dev300/build-java-target.diff	Mon Sep  1 14:48:58 2008
@@ -22,7 +22,7 @@
     JAVA_HOME=NO_JAVA_HOME ; export JAVA_HOME
  fi
  
-+_java_target_ver="1.4"
++_java_target_ver="1.5"
 +dnl ===================================================================
 +dnl Check for target java bytecode version
 +dnl ===================================================================

Modified: trunk/patches/dev300/office-cfg-common-template-dir.diff
==============================================================================
--- trunk/patches/dev300/office-cfg-common-template-dir.diff	(original)
+++ trunk/patches/dev300/office-cfg-common-template-dir.diff	Mon Sep  1 14:48:58 2008
@@ -5,7 +5,7 @@
  						<desc>Specifies the templates originate from these folders and sub-folders.</desc>
  					</info>
 -					<value oor:separator=":">$(insturl)/share/template/$(vlang):$(userurl)/template</value>
-+					<value oor:separator=";">file:///usr/share/templates/ooo2/common;file:///usr/share/templates/ooo2/$(vlang);$(insturl)/share/template/common;$(insturl)/share/template/$(vlang);$(userurl)/template</value>
++					<value oor:separator=";">file:///usr/share/templates/ooo/common;file:///usr/share/templates/ooo/$(vlang);file:///usr/share/templates/ooo2/common;file:///usr/share/templates/ooo2/$(vlang);$(insturl)/share/template/common;$(insturl)/share/template/$(vlang);$(userurl)/template</value>
  				</prop>
  				<prop oor:name="UIConfig" oor:type="oor:string-list">
  					<info>
@@ -14,7 +14,7 @@
  						<desc>Specifies the default directory where all provided templates are located in folders and sub-folders.</desc>
  					</info>
 -					<value oor:separator=":">$(insturl)/share/template/$(vlang):$(userurl)/template</value>
-+					<value oor:separator=";">file:///usr/share/templates/ooo2/common;file:///usr/share/templates/ooo2/$(vlang);$(insturl)/share/template/common;$(insturl)/share/template/$(vlang);$(userurl)/template</value>
++					<value oor:separator=";">file:///usr/share/templates/ooo/common;file:///usr/share/templates/ooo/$(vlang);file:///usr/share/templates/ooo2/common;file:///usr/share/templates/ooo2/$(vlang);$(insturl)/share/template/common;$(insturl)/share/template/$(vlang);$(userurl)/template</value>
  				</prop>
  				<prop oor:name="UIConfig" oor:type="oor:string-list">
  					<info>