~ubuntu-branches/ubuntu/karmic/openoffice.org-l10n/karmic

1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
--- setup_native/source/java/javaversion.dat.orig	2008-03-23 11:21:38.656250000 +0100
+++ setup_native/source/java/javaversion.dat	2008-03-23 11:22:30.078125000 +0100
@@ -34,26 +34,26 @@
 #*************************************************************************
 
 # GUI String in the installer ("Java Runtime Environment (${JAVAVERSION})")
-JAVAVERSION=Java 6 Update 4
+JAVAVERSION=Java 6 Update 5
 
 # Windows (scp2 and downloadtemplate.nsi)
-WINDOWSJAVAFILENAME=jre-6u4-windows-i586-p.exe
-WINDOWSJAVAREGISTRYENTRY=1.6.0_04
+WINDOWSJAVAFILENAME=jre-6u5-windows-i586-p.exe
+WINDOWSJAVAREGISTRYENTRY=1.6.0_05
 
 # Linux (scp2)
-LINUXJAVAFILENAME=jre-6u4-linux-i586.rpm
+LINUXJAVAFILENAME=jre-6u5-linux-i586.rpm
 # Linux (rpmUnit.xml, rpm -qp <filename> )
-LINUXJAVANAME=jre-1.6.0_04-fcs
+LINUXJAVANAME=jre-1.6.0_05-fcs
 
 # Solaris Sparc (scp2)
-SOLSJAVARTPACKED=SUNWj6rt_1_6_0_04_sparc.tar.gz
-SOLSJAVACFGPACKED=SUNWj6cfg_1_6_0_04_sparc.tar.gz
-SOLSJAVAMANPACKED=SUNWj6man_1_6_0_04_sparc.tar.gz
+SOLSJAVARTPACKED=SUNWj6rt_1_6_0_05_sparc.tar.gz
+SOLSJAVACFGPACKED=SUNWj6cfg_1_6_0_05_sparc.tar.gz
+SOLSJAVAMANPACKED=SUNWj6man_1_6_0_05_sparc.tar.gz
 
 # Solaris x86 (scp2)
-SOLIJAVARTPACKED=SUNWj6rt_1_6_0_04_x86.tar.gz
-SOLIJAVACFGPACKED=SUNWj6cfg_1_6_0_04_x86.tar.gz
-SOLIJAVAMANPACKED=SUNWj6man_1_6_0_04_x86.tar.gz
+SOLIJAVARTPACKED=SUNWj6rt_1_6_0_05_x86.tar.gz
+SOLIJAVACFGPACKED=SUNWj6cfg_1_6_0_05_x86.tar.gz
+SOLIJAVAMANPACKED=SUNWj6man_1_6_0_05_x86.tar.gz
 
 # Solaris (pkgUnix.xml, needs only to be changed in major changes)
 SOLARISJAVART=SUNWj6rt