[ooo-build-commit] Branch 'ooo/master' - setup_native/source

[Jan Holesovsky]

 setup_native/source/java/javaversion2.dat |   26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

New commits:
commit 1038477a59944ccd20856d5728bbbd75942286dd
Author: Release Engineers <releng at openoffice.org>
Date:   Fri Aug 7 12:23:45 2009 +0000

    CWS-TOOLING: integrate CWS native261_DEV300
    2009-08-04 10:37:13 +0200 is  r274610 : #i103988# new jre6u15

diff --git a/setup_native/source/java/javaversion2.dat b/setup_native/source/java/javaversion2.dat
index 34e9257..e997838 100644
--- a/setup_native/source/java/javaversion2.dat
+++ b/setup_native/source/java/javaversion2.dat
@@ -30,30 +30,30 @@
 #*************************************************************************
 
 # GUI String in the installer ("Java Runtime Environment (${JAVAVERSION})")
-JAVAVERSION=Java 6 Update 14
-WINDOWSJAVAVERSION=Java 6 Update 14
+JAVAVERSION=Java 6 Update 15
+WINDOWSJAVAVERSION=Java 6 Update 15
 
 # Windows (scp2 and downloadtemplate.nsi)
-WINDOWSJAVAFILENAME=jre-6u14-windows-i586.exe
-WINDOWSJAVAREGISTRYENTRY=1.6.0_14
+WINDOWSJAVAFILENAME=jre-6u15-windows-i586.exe
+WINDOWSJAVAREGISTRYENTRY=1.6.0_15
 
 # Linux (scp2)
-LINUXJAVAFILENAME=jre-6u14-linux-i586.rpm
+LINUXJAVAFILENAME=jre-6u15-linux-i586.rpm
 # Linux (rpmUnit.xml, rpm -qp <filename> )
-LINUXJAVANAME=jre-1.6.0_14-fcs
+LINUXJAVANAME=jre-1.6.0_15-fcs
 
 # Linux-x64 (scp2)
-LINUXX64JAVAFILENAME=jre-6u14-linux-amd64.rpm
+LINUXX64JAVAFILENAME=jre-6u15-linux-amd64.rpm
 
 # Solaris Sparc (scp2)
-SOLSJAVARTPACKED=SUNWj6rt_1_6_0_14_sparc.tar.gz
-SOLSJAVACFGPACKED=SUNWj6cfg_1_6_0_14_sparc.tar.gz
-SOLSJAVAMANPACKED=SUNWj6man_1_6_0_14_sparc.tar.gz
+SOLSJAVARTPACKED=SUNWj6rt_1_6_0_15_sparc.tar.gz
+SOLSJAVACFGPACKED=SUNWj6cfg_1_6_0_15_sparc.tar.gz
+SOLSJAVAMANPACKED=SUNWj6man_1_6_0_15_sparc.tar.gz
 
 # Solaris x86 (scp2)
-SOLIJAVARTPACKED=SUNWj6rt_1_6_0_14_x86.tar.gz
-SOLIJAVACFGPACKED=SUNWj6cfg_1_6_0_14_x86.tar.gz
-SOLIJAVAMANPACKED=SUNWj6man_1_6_0_14_x86.tar.gz
+SOLIJAVARTPACKED=SUNWj6rt_1_6_0_15_x86.tar.gz
+SOLIJAVACFGPACKED=SUNWj6cfg_1_6_0_15_x86.tar.gz
+SOLIJAVAMANPACKED=SUNWj6man_1_6_0_15_x86.tar.gz
 
 # Solaris (pkgUnit.xml, needs only to be changed in major changes)
 SOLARISJAVART=SUNWj6rt