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

[pmladek svn gnome org]

Author: pmladek
Date: Wed Aug 27 18:00:03 2008
New Revision: 13695
URL: http://svn.gnome.org/viewvc/ooo-build?rev=13695&view=rev

Log:
2008-08-27  Petr Mladek  <pmladek suse cz>

	* dev300/scp2-user-config-ooo3.diff: use ~/.ooo3 for the user
	  configuration; replaces scp2-user-config-ooo-2.0.diff
	* patches/dev300/scp2-user-config-ooo-2.0.diff: bin obsolete
	* patches/dev300/apply: update for the above changes
	
	* patches/dev300/apply: add Java14 section also for SUSE-10.2 and
	  SUSE-10.3



Added:
   trunk/patches/dev300/scp2-user-config-ooo3.diff
      - copied, changed from r13694, /trunk/patches/dev300/scp2-user-config-ooo-2.0.diff
Removed:
   trunk/patches/dev300/scp2-user-config-ooo-2.0.diff
Modified:
   trunk/ChangeLog
   trunk/patches/dev300/apply

Modified: trunk/patches/dev300/apply
==============================================================================
--- trunk/patches/dev300/apply	(original)
+++ trunk/patches/dev300/apply	Wed Aug 27 18:00:03 2008
@@ -58,8 +58,8 @@
 SUSE-9.3  : NovellBase
 SUSE-10.0 : NovellBase
 SUSE-10.1 : NovellBase, BerkeleyDB43, BrokenSystemNSS, Java14
-SUSE-10.2 : NovellBase, BerkeleyDB43, EMFPlus
-SUSE-10.3 : NovellBase, BerkeleyDB43, EMFPlus
+SUSE-10.2 : NovellBase, BerkeleyDB43, EMFPlus, Java14
+SUSE-10.3 : NovellBase, BerkeleyDB43, EMFPlus, Java14
 SUSE-11.0 : NovellBase, BerkeleyDB43, Gcc43, EMFPlus, CairoFonts
 SUSE      : NovellBase, BerkeleyDB43, Gcc43, EMFPlus, CairoFonts
 SUSE-reduced:NovellBase,BerkeleyDB43, ReducedDefaults
@@ -905,7 +905,7 @@
 SectionOwner => DropLine
 
 pushfont-psstream.diff, i#84481
-scp2-user-config-ooo-2.0.diff
+scp2-user-config-ooo3.diff
 
 
 [ MandrivaOnly ]
@@ -929,16 +929,16 @@
 
 SectionOwner => gghibo
 help-support-mdv.diff
-# change user config dir name from ~/.openoffice.org2.0 to ~/.ooo-2.0
-scp2-user-config-ooo-2.0.diff, pmladek
+# change user config dir name from ~/.openoffice.org3 to ~/.ooo3
+scp2-user-config-ooo3.diff, pmladek
 
 
 [ NovellOnlyUnix ]
 
 # Help Support page
 help-support.diff, michael
-# change user config dir name from ~/.openoffice.org1.9.milestone to ~/.ooo-2.0-pre
-scp2-user-config-ooo-2.0.diff, pmladek
+# change user config dir name from ~/.openoffice.org3 to ~/.ooo3
+scp2-user-config-ooo3.diff, pmladek
 # Push fonts into the ps stream always
 pushfont-psstream.diff, i#84481, michael
 
@@ -1383,8 +1383,8 @@
 ibm-j9vm.diff, hmth
 # system db check
 system-db-check.diff, i#65979, hmth
-# User ~/.ooo-2.0 as user dir
-scp2-user-config-ooo-2.0.diff, pmladek
+# User ~/.ooo3 as user dir
+scp2-user-config-ooo3.diff, pmladek
 # unused java code
 disable-parser-jaxp.diff
 # default inc/lib

Copied: trunk/patches/dev300/scp2-user-config-ooo3.diff (from r13694, /trunk/patches/dev300/scp2-user-config-ooo-2.0.diff)
==============================================================================
--- /trunk/patches/dev300/scp2-user-config-ooo-2.0.diff	(original)
+++ trunk/patches/dev300/scp2-user-config-ooo3.diff	Wed Aug 27 18:00:03 2008
@@ -5,7 +5,7 @@
      Value = "$SYSUSERCONFIG/%ONEWORDPRODUCTNAME/%USERDIRPRODUCTVERSION";
    #else
 -    Value = "$SYSUSERCONFIG/.%LCONEWORDPRODUCTNAME/%USERDIRPRODUCTVERSION";
-+    Value = "$SYSUSERCONFIG/.ooo-2.0";
++    Value = "$SYSUSERCONFIG/.ooo3";
    #endif
      StandaloneValue = "$ORIGIN/..";
  End