jl152 merge with DEV300_m80

17 files changed, 56 insertions, 27 deletions

diff --git a/setup_native/prj/d.lst b/setup_native/prj/d.lst
index 9d429454ebba..6aa6460d1823 100644
--- a/setup_native/prj/d.lst
+++ b/setup_native/prj/d.lst
@@ -1,4 +1,5 @@
 mkdir: %_DEST%\bin%_EXT%\osl
+mkdir: %_DEST%\bin%_EXT%\broffice
 ..\%__SRC%\bin\*.dll %_DEST%\bin%_EXT%\*.dll
 ..\%__SRC%\bin\*.exe %_DEST%\bin%_EXT%\*.exe
 ..\%__SRC%\class\*.jar %_DEST%\bin%_EXT%\*.jar
@@ -31,7 +32,15 @@ mkdir: %_DEST%\bin%_EXT%\osolsmf
 ..\source\linux\*.dat %_DEST%\bin%_EXT%\*.dat
 ..\source\mac\*.icns %_DEST%\bin%_EXT%\*.icns
 ..\source\mac\Info.plist.langpack %_DEST%\bin%_EXT%\Info.plist.langpack
+..\source\mac\ooo\osxdndinstall.png %_DEST%\bin%_EXT%\osl\osxdndinstall.png
+..\source\mac\ooo\osxdndinstall_nologo.png %_DEST%\bin%_EXT%\osl\osxdndinstall_nologo.png
+..\source\mac\ooo\DS_Store %_DEST%\bin%_EXT%\osl\DS_Store
+..\source\mac\ooo\DS_Store_Langpack %_DEST%\bin%_EXT%\osl\DS_Store_Langpack
+..\source\mac\broffice\osxdndinstall.png %_DEST%\bin%_EXT%\broffice\osxdndinstall.png
+..\source\mac\broffice\osxdndinstall_nologo.png %_DEST%\bin%_EXT%\broffice\osxdndinstall_nologo.png
+..\source\mac\broffice\DS_Store %_DEST%\bin%_EXT%\broffice\DS_Store
 ..\source\java\openofficeorg_setup.gif %_DEST%\bin%_EXT%\osl\Setup.gif
+..\source\java\brofficeorg_setup.gif %_DEST%\bin%_EXT%\broffice\Setup.gif
 ..\source\java\javaversion.dat %_DEST%\bin%_EXT%\javaversion.dat
 ..\source\java\javaversion2.dat %_DEST%\bin%_EXT%\javaversion2.dat
 ..\source\opensolaris\bundledextensions\installed %_DEST%\bin%_EXT%\osolsmf\installed
@@ -39,6 +48,7 @@ mkdir: %_DEST%\bin%_EXT%\osolsmf
 ..\source\opensolaris\bundledextensions\ooo_bundled_extensions.xml %_DEST%\bin%_EXT%\osolsmf\ooo_bundled_extensions.xml
 ..\source\opensolaris\bundledextensions\svc-ooo_bundled_extensions %_DEST%\bin%_EXT%\osolsmf\svc-ooo_bundled_extensions
 ..\source\packinfo\solariscopyrightfile %_DEST%\bin%_EXT%\solariscopyrightfile
+..\source\packinfo\linuxcopyrightfile %_DEST%\bin%_EXT%\linuxcopyrightfile
 ..\source\packinfo\*.txt %_DEST%\bin%_EXT%\*.txt
 ..\source\packinfo\*.pcp %_DEST%\bin%_EXT%\*.pcp
 ..\scripts\admin.pl %_DEST%\bin%_EXT%\admin.pl
diff --git a/setup_native/source/java/brofficeorg_setup.gif b/setup_native/source/java/brofficeorg_setup.gif
new file mode 100644
index 000000000000..570d8e462a27
--- /dev/null
+++ b/setup_native/source/java/brofficeorg_setup.gif
diff --git a/setup_native/source/java/javaversion.dat b/setup_native/source/java/javaversion.dat
index 461bd7d6579a..a629a4037269 100755
--- a/setup_native/source/java/javaversion.dat
+++ b/setup_native/source/java/javaversion.dat
@@ -26,30 +26,30 @@
 #*************************************************************************
 
 # GUI String in the installer ("Java Runtime Environment (${JAVAVERSION})")
-JAVAVERSION=Java 6 Update 19
-WINDOWSJAVAVERSION=Java 6 Update 19
+JAVAVERSION=Java 6 Update 20
+WINDOWSJAVAVERSION=Java 6 Update 20
 
 # Windows (scp2 and downloadtemplate.nsi)
-WINDOWSJAVAFILENAME=jre-6u19-windows-i586.exe
-WINDOWSJAVAREGISTRYENTRY=1.6.0_19
+WINDOWSJAVAFILENAME=jre-6u20-windows-i586.exe
+WINDOWSJAVAREGISTRYENTRY=1.6.0_20
 
 # Linux (scp2)
-LINUXJAVAFILENAME=jre-6u19-linux-i586.rpm
+LINUXJAVAFILENAME=jre-6u20-linux-i586.rpm
 # Linux (rpmUnit.xml, rpm -qp <filename> )
-LINUXJAVANAME=jre-1.6.0_19-fcs
+LINUXJAVANAME=jre-1.6.0_20-fcs
 
 # Linux-x64 (scp2)
-LINUXX64JAVAFILENAME=jre-6u19-linux-amd64.rpm
+LINUXX64JAVAFILENAME=jre-6u20-linux-amd64.rpm
 
 # Solaris Sparc (scp2)
-SOLSJAVARTPACKED=SUNWj6rt_1_6_0_19_sparc.tar.gz
-SOLSJAVACFGPACKED=SUNWj6cfg_1_6_0_19_sparc.tar.gz
-SOLSJAVAMANPACKED=SUNWj6man_1_6_0_19_sparc.tar.gz
+SOLSJAVARTPACKED=SUNWj6rt_1_6_0_20_sparc.tar.gz
+SOLSJAVACFGPACKED=SUNWj6cfg_1_6_0_20_sparc.tar.gz
+SOLSJAVAMANPACKED=SUNWj6man_1_6_0_20_sparc.tar.gz
 
 # Solaris x86 (scp2)
-SOLIJAVARTPACKED=SUNWj6rt_1_6_0_19_x86.tar.gz
-SOLIJAVACFGPACKED=SUNWj6cfg_1_6_0_19_x86.tar.gz
-SOLIJAVAMANPACKED=SUNWj6man_1_6_0_19_x86.tar.gz
+SOLIJAVARTPACKED=SUNWj6rt_1_6_0_20_x86.tar.gz
+SOLIJAVACFGPACKED=SUNWj6cfg_1_6_0_20_x86.tar.gz
+SOLIJAVAMANPACKED=SUNWj6man_1_6_0_20_x86.tar.gz
 
 # Solaris (pkgUnit.xml, needs only to be changed in major changes)
 SOLARISJAVART=SUNWj6rt
diff --git a/setup_native/source/java/javaversion2.dat b/setup_native/source/java/javaversion2.dat
index 461bd7d6579a..a629a4037269 100644
--- a/setup_native/source/java/javaversion2.dat
+++ b/setup_native/source/java/javaversion2.dat
@@ -26,30 +26,30 @@
 #*************************************************************************
 
 # GUI String in the installer ("Java Runtime Environment (${JAVAVERSION})")
-JAVAVERSION=Java 6 Update 19
-WINDOWSJAVAVERSION=Java 6 Update 19
+JAVAVERSION=Java 6 Update 20
+WINDOWSJAVAVERSION=Java 6 Update 20
 
 # Windows (scp2 and downloadtemplate.nsi)
-WINDOWSJAVAFILENAME=jre-6u19-windows-i586.exe
-WINDOWSJAVAREGISTRYENTRY=1.6.0_19
+WINDOWSJAVAFILENAME=jre-6u20-windows-i586.exe
+WINDOWSJAVAREGISTRYENTRY=1.6.0_20
 
 # Linux (scp2)
-LINUXJAVAFILENAME=jre-6u19-linux-i586.rpm
+LINUXJAVAFILENAME=jre-6u20-linux-i586.rpm
 # Linux (rpmUnit.xml, rpm -qp <filename> )
-LINUXJAVANAME=jre-1.6.0_19-fcs
+LINUXJAVANAME=jre-1.6.0_20-fcs
 
 # Linux-x64 (scp2)
-LINUXX64JAVAFILENAME=jre-6u19-linux-amd64.rpm
+LINUXX64JAVAFILENAME=jre-6u20-linux-amd64.rpm
 
 # Solaris Sparc (scp2)
-SOLSJAVARTPACKED=SUNWj6rt_1_6_0_19_sparc.tar.gz
-SOLSJAVACFGPACKED=SUNWj6cfg_1_6_0_19_sparc.tar.gz
-SOLSJAVAMANPACKED=SUNWj6man_1_6_0_19_sparc.tar.gz
+SOLSJAVARTPACKED=SUNWj6rt_1_6_0_20_sparc.tar.gz
+SOLSJAVACFGPACKED=SUNWj6cfg_1_6_0_20_sparc.tar.gz
+SOLSJAVAMANPACKED=SUNWj6man_1_6_0_20_sparc.tar.gz
 
 # Solaris x86 (scp2)
-SOLIJAVARTPACKED=SUNWj6rt_1_6_0_19_x86.tar.gz
-SOLIJAVACFGPACKED=SUNWj6cfg_1_6_0_19_x86.tar.gz
-SOLIJAVAMANPACKED=SUNWj6man_1_6_0_19_x86.tar.gz
+SOLIJAVARTPACKED=SUNWj6rt_1_6_0_20_x86.tar.gz
+SOLIJAVACFGPACKED=SUNWj6cfg_1_6_0_20_x86.tar.gz
+SOLIJAVAMANPACKED=SUNWj6man_1_6_0_20_x86.tar.gz
 
 # Solaris (pkgUnit.xml, needs only to be changed in major changes)
 SOLARISJAVART=SUNWj6rt
diff --git a/setup_native/source/mac/broffice/DS_Store b/setup_native/source/mac/broffice/DS_Store
new file mode 100644
index 000000000000..06aad72c93a0
--- /dev/null
+++ b/setup_native/source/mac/broffice/DS_Store
diff --git a/setup_native/source/mac/broffice/osxdndinstall.png b/setup_native/source/mac/broffice/osxdndinstall.png
new file mode 100644
index 000000000000..233d4bbc84b9
--- /dev/null
+++ b/setup_native/source/mac/broffice/osxdndinstall.png
diff --git a/setup_native/source/mac/broffice/osxdndinstall_nologo.png b/setup_native/source/mac/broffice/osxdndinstall_nologo.png
new file mode 100644
index 000000000000..8c5636ec05ca
--- /dev/null
+++ b/setup_native/source/mac/broffice/osxdndinstall_nologo.png
diff --git a/setup_native/source/mac/ooo/DS_Store b/setup_native/source/mac/ooo/DS_Store
new file mode 100644
index 000000000000..632e6aff95be
--- /dev/null
+++ b/setup_native/source/mac/ooo/DS_Store
diff --git a/setup_native/source/mac/ooo/DS_Store_Langpack b/setup_native/source/mac/ooo/DS_Store_Langpack
new file mode 100644
index 000000000000..1b53eba75b74
--- /dev/null
+++ b/setup_native/source/mac/ooo/DS_Store_Langpack
diff --git a/setup_native/source/mac/ooo/osxdndinstall.png b/setup_native/source/mac/ooo/osxdndinstall.png
new file mode 100644
index 000000000000..7eb5c76649bb
--- /dev/null
+++ b/setup_native/source/mac/ooo/osxdndinstall.png
diff --git a/setup_native/source/mac/ooo/osxdndinstall_nologo.png b/setup_native/source/mac/ooo/osxdndinstall_nologo.png
new file mode 100644
index 000000000000..7133e7387ac1
--- /dev/null
+++ b/setup_native/source/mac/ooo/osxdndinstall_nologo.png
diff --git a/setup_native/source/packinfo/linuxcopyrightfile b/setup_native/source/packinfo/linuxcopyrightfile
new file mode 100644
index 000000000000..6e2c0ef08e79
--- /dev/null
+++ b/setup_native/source/packinfo/linuxcopyrightfile
@@ -0,0 +1,2 @@
+Copyright 2000, 2010 Oracle and/or its affiliates. All rights reserved.
+Use is subject to license terms.
diff --git a/setup_native/source/packinfo/packinfo_office.txt b/setup_native/source/packinfo/packinfo_office.txt
index 202db8bf640a..f901a248f0b1 100755
--- a/setup_native/source/packinfo/packinfo_office.txt
+++ b/setup_native/source/packinfo/packinfo_office.txt
@@ -716,6 +716,22 @@ packageversion = "%PACKAGEVERSION"
 End
 
 Start
+module = "gid_Module_Root_Extension_Dictionary_Ku_Tr"
+script = "shellscripts_extensions.txt"
+solarispackagename = "%PACKAGEPREFIX%WITHOUTDOTUNIXPRODUCTNAME%BRANDPACKAGEVERSION-dict-ku-TR"
+solarisrequires = "%SOLSUREPACKAGEPREFIX-ure, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core02, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core03, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core04, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core05, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core06, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core07, %PACKAGEPREFIX%WITHOUTDOTUNIXPRODUCTNAME%BRANDPACKAGEVERSION"
+packagename = "%UNIXPRODUCTNAME%BRANDPACKAGEVERSION-dict-ku-TR"
+requires = "%UREPACKAGEPREFIX-ure,%BASISPACKAGEPREFIX%OOOBASEVERSION-core01,%BASISPACKAGEPREFIX%OOOBASEVERSION-core02,%BASISPACKAGEPREFIX%OOOBASEVERSION-core03,%BASISPACKAGEPREFIX%OOOBASEVERSION-core04,%BASISPACKAGEPREFIX%OOOBASEVERSION-core05,%BASISPACKAGEPREFIX%OOOBASEVERSION-core06,%BASISPACKAGEPREFIX%OOOBASEVERSION-core07,%UNIXPRODUCTNAME%BRANDPACKAGEVERSION"
+linuxpatchrequires = ""
+copyright = "1999-2009 by Sun Microsystems"
+solariscopyright = "solariscopyrightfile"
+vendor = "Sun Microsystems, Inc."
+description = "Ku-TR dictionary for %PRODUCTNAME %PRODUCTVERSION"
+destpath = "/opt"
+packageversion = "%PACKAGEVERSION"
+End
+
+Start
 module = "gid_Module_Root_Extension_Dictionary_Lt"
 solarispackagename = "%PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION-dict-lt"
 solarisrequires = "%SOLSUREPACKAGEPREFIX-ure, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core02, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core03, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core04, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core05, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core06, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core07, %PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION"
diff --git a/setup_native/source/packinfo/spellchecker_selection.txt b/setup_native/source/packinfo/spellchecker_selection.txt
index 526058086f67..8d5cb0fc83b8 100644
--- a/setup_native/source/packinfo/spellchecker_selection.txt
+++ b/setup_native/source/packinfo/spellchecker_selection.txt
@@ -25,6 +25,7 @@ hu = "hu,de-DE,en-US"
 it = "it,de-DE,en-US,fr"
 ja = "EMPTY,en-US"
 ko = "EMPTY,en-US"
+ku = "ku-TR,en-US"
 lt = "lt,en-US"
 nb = "no,en-US,fr,de-DE,es"
 ne = "ne,en-US"
diff --git a/setup_native/source/win32/msi-encodinglist.txt b/setup_native/source/win32/msi-encodinglist.txt
index 81258d61f38b..5185a9ea642e 100644
--- a/setup_native/source/win32/msi-encodinglist.txt
+++ b/setup_native/source/win32/msi-encodinglist.txt
@@ -42,7 +42,6 @@ gu    0  1095   # Gujarati
 gu-IN    0  1095   # Gujarati
 he    1255  1037
 hi       0  1081
-hi-IN    0  1081   # hindi
 hr    1250  1050   # Croatian
 hu    1250  1038
 hy       0  1067   # Armenian
@@ -93,6 +92,7 @@ pt    1252  2070
 pt-BR 1252  1046
 pt-PT 1252  2070
 ps       0  2171
+ca-XV   1252  32771  # Catalan Valencian
 rm       0  1047   # Raeto-Romance
 ro    1250  1048   # Romanian
 ru    1251  1049
diff --git a/setup_native/source/win32/nsis/brobanner.bmp b/setup_native/source/win32/nsis/brobanner.bmp
index 37f517176524..7ab14d2a6245 100644
--- a/setup_native/source/win32/nsis/brobanner.bmp
+++ b/setup_native/source/win32/nsis/brobanner.bmp
diff --git a/setup_native/source/win32/nsis/brobitmap.bmp b/setup_native/source/win32/nsis/brobitmap.bmp
index 0c5e11da76d5..f9e9e9b2d44b 100644
--- a/setup_native/source/win32/nsis/brobitmap.bmp
+++ b/setup_native/source/win32/nsis/brobitmap.bmp