diff options
| author | Jan Holesovsky <kendy@suse.cz> | 2010-12-20 01:15:58 +0100 |
|---|---|---|
| committer | Jan Holesovsky <kendy@suse.cz> | 2010-12-20 01:15:58 +0100 |
| commit | 3f57365e73d289b0dcda55e4bf7bc69af7afce53 (patch) | |
| tree | f4e334b619811bc2ff3fa77d5ff50e8721074d1f /setup_native | |
| parent | d161cc88707390fc9b6a24ab8463fb6d3eb88990 (diff) | |
| parent | 1863e3835a3c14ab06f39c2ee2078370f3d1c2f6 (diff) | |
Merge commit 'libreoffice-3.3.0.2'
Diffstat (limited to 'setup_native')
| -rw-r--r-- | setup_native/source/mac/broffice/osxdndinstall.png | bin | 18881 -> 32890 bytes | |||
| -rw-r--r-- | setup_native/source/mac/broffice/osxdndinstall_nologo.png | bin | 18881 -> 32890 bytes | |||
| -rw-r--r-- | setup_native/source/mac/ooo/osxdndinstall.png | bin | 20535 -> 34637 bytes | |||
| -rw-r--r-- | setup_native/source/mac/ooo/osxdndinstall_nologo.png | bin | 20535 -> 34637 bytes | |||
| -rw-r--r-- | setup_native/source/packinfo/packinfo_brand.txt | 4 | ||||
| -rw-r--r-- | setup_native/source/win32/nsis/brobitmap.bmp | bin | 153558 -> 52242 bytes | |||
| -rw-r--r-- | setup_native/source/win32/nsis/ooobitmap.bmp | bin | 52242 -> 52242 bytes | |||
| -rw-r--r-- | setup_native/source/win32/nsis/ooosdkbitmap.bmp | bin | 52242 -> 52242 bytes | |||
| -rw-r--r-- | setup_native/source/win32/nsis/ooosetup.ico | bin | 4286 -> 2238 bytes | |||
| -rwxr-xr-x | setup_native/source/win32/nsis/urebitmap.bmp | bin | 52242 -> 52242 bytes |
10 files changed, 2 insertions, 2 deletions
diff --git a/setup_native/source/mac/broffice/osxdndinstall.png b/setup_native/source/mac/broffice/osxdndinstall.png Binary files differindex 966f9f7bcffc..cab66ea99784 100644 --- a/setup_native/source/mac/broffice/osxdndinstall.png +++ 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 Binary files differindex 966f9f7bcffc..cab66ea99784 100644 --- a/setup_native/source/mac/broffice/osxdndinstall_nologo.png +++ b/setup_native/source/mac/broffice/osxdndinstall_nologo.png diff --git a/setup_native/source/mac/ooo/osxdndinstall.png b/setup_native/source/mac/ooo/osxdndinstall.png Binary files differindex f50008f1f810..2ce08fe52f6b 100644 --- a/setup_native/source/mac/ooo/osxdndinstall.png +++ 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 Binary files differindex f50008f1f810..2ce08fe52f6b 100644 --- a/setup_native/source/mac/ooo/osxdndinstall_nologo.png +++ b/setup_native/source/mac/ooo/osxdndinstall_nologo.png diff --git a/setup_native/source/packinfo/packinfo_brand.txt b/setup_native/source/packinfo/packinfo_brand.txt index 5c8e1e86e20b..47d57452cbd2 100644 --- a/setup_native/source/packinfo/packinfo_brand.txt +++ b/setup_native/source/packinfo/packinfo_brand.txt @@ -128,8 +128,8 @@ Start module = "gid_Module_Langpack_Brand" solarispackagename = "%WITHOUTDOTUNIXPACKAGENAME%BRANDPACKAGEVERSION-%LANGUAGESTRING" packagename = "%UNIXPACKAGENAME%BRANDPACKAGEVERSION-%LANGUAGESTRING" -requires = "%UNIXPACKAGENAME%BRANDPACKAGEVERSION,%BASISPACKAGEPREFIX%OOOBASEVERSION-%LANGUAGESTRING,%BASISPACKAGEPREFIX%OOOBASEVERSION-%LANGUAGESTRING-base,%BASISPACKAGEPREFIX%OOOBASEVERSION-%LANGUAGESTRING-calc,%BASISPACKAGEPREFIX%OOOBASEVERSION-%LANGUAGESTRING-draw,%BASISPACKAGEPREFIX%OOOBASEVERSION-%LANGUAGESTRING-help,%BASISPACKAGEPREFIX%OOOBASEVERSION-%LANGUAGESTRING-impress,%BASISPACKAGEPREFIX%OOOBASEVERSION-%LANGUAGESTRING-math,%BASISPACKAGEPREFIX%OOOBASEVERSION-%LANGUAGESTRING-res,%BASISPACKAGEPREFIX%OOOBASEVERSION-%LANGUAGESTRING-writer" -solarisrequires = "%WITHOUTDOTUNIXPACKAGENAME%BRANDPACKAGEVERSION,%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING (Name="Language module for %PRODUCTNAME %PRODUCTVERSION\, language %LANGUAGESTRING"),%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING-base (Name="Base language module for %PRODUCTNAME %PRODUCTVERSION\, language %LANGUAGESTRING"),%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING-calc (Name="Calc language module for %PRODUCTNAME %PRODUCTVERSION\, language %LANGUAGESTRING"),%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING-draw (Name="Draw language module for %PRODUCTNAME %PRODUCTVERSION\, language %LANGUAGESTRING"),%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING-help (Name="Help language module for %PRODUCTNAME %PRODUCTVERSION\, language %LANGUAGESTRING"),%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING-impress (Name="Impress language module for %PRODUCTNAME %PRODUCTVERSION\, language %LANGUAGESTRING"),%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING-math (Name="Math language module for %PRODUCTNAME %PRODUCTVERSION\, language %LANGUAGESTRING"),%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING-res (Name="Resource language module for %PRODUCTNAME %PRODUCTVERSION\, language %LANGUAGESTRING"),%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING-writer (Name="Writer language module for %PRODUCTNAME %PRODUCTVERSION\, language %LANGUAGESTRING")" +requires = "%UNIXPACKAGENAME%BRANDPACKAGEVERSION,%BASISPACKAGEPREFIX%OOOBASEVERSION-%LANGUAGESTRING,%BASISPACKAGEPREFIX%OOOBASEVERSION-%LANGUAGESTRING-base,%BASISPACKAGEPREFIX%OOOBASEVERSION-%LANGUAGESTRING-calc,%BASISPACKAGEPREFIX%OOOBASEVERSION-%LANGUAGESTRING-math,%BASISPACKAGEPREFIX%OOOBASEVERSION-%LANGUAGESTRING-res,%BASISPACKAGEPREFIX%OOOBASEVERSION-%LANGUAGESTRING-writer" +solarisrequires = "%WITHOUTDOTUNIXPACKAGENAME%BRANDPACKAGEVERSION,%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING (Name="Language module for %PRODUCTNAME %PRODUCTVERSION\, language %LANGUAGESTRING"),%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING-base (Name="Base language module for %PRODUCTNAME %PRODUCTVERSION\, language %LANGUAGESTRING"),%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING-calc (Name="Calc language module for %PRODUCTNAME %PRODUCTVERSION\, language %LANGUAGESTRING"),%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING-math (Name="Math language module for %PRODUCTNAME %PRODUCTVERSION\, language %LANGUAGESTRING"),%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING-res (Name="Resource language module for %PRODUCTNAME %PRODUCTVERSION\, language %LANGUAGESTRING"),%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING-writer (Name="Writer language module for %PRODUCTNAME %PRODUCTVERSION\, language %LANGUAGESTRING")" copyright = "1999-2009 by %PRODUCTNAME" solariscopyright = "solariscopyrightfile" vendor = "%PRODUCTNAME" diff --git a/setup_native/source/win32/nsis/brobitmap.bmp b/setup_native/source/win32/nsis/brobitmap.bmp Binary files differindex 680c643bff56..75dc163eb719 100644 --- a/setup_native/source/win32/nsis/brobitmap.bmp +++ b/setup_native/source/win32/nsis/brobitmap.bmp diff --git a/setup_native/source/win32/nsis/ooobitmap.bmp b/setup_native/source/win32/nsis/ooobitmap.bmp Binary files differindex 11acb28b1aad..25b5b11bed20 100644 --- a/setup_native/source/win32/nsis/ooobitmap.bmp +++ b/setup_native/source/win32/nsis/ooobitmap.bmp diff --git a/setup_native/source/win32/nsis/ooosdkbitmap.bmp b/setup_native/source/win32/nsis/ooosdkbitmap.bmp Binary files differindex 11acb28b1aad..25b5b11bed20 100644 --- a/setup_native/source/win32/nsis/ooosdkbitmap.bmp +++ b/setup_native/source/win32/nsis/ooosdkbitmap.bmp diff --git a/setup_native/source/win32/nsis/ooosetup.ico b/setup_native/source/win32/nsis/ooosetup.ico Binary files differindex bed4687fb0a2..2d43f2b4b2c6 100644 --- a/setup_native/source/win32/nsis/ooosetup.ico +++ b/setup_native/source/win32/nsis/ooosetup.ico diff --git a/setup_native/source/win32/nsis/urebitmap.bmp b/setup_native/source/win32/nsis/urebitmap.bmp Binary files differindex 11acb28b1aad..25b5b11bed20 100755 --- a/setup_native/source/win32/nsis/urebitmap.bmp +++ b/setup_native/source/win32/nsis/urebitmap.bmp |
